Thanks to visit codestin.com
Credit goes to github.com

Skip to content

PC invalidates previous work on new run [ci: last-only] #10867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: 2.13.x
Choose a base branch
from
+336 −278
Draft

PC invalidates previous work on new run [ci: last-only] #10867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ec695d
Refactor PC thread, pollForWork, name the project
som-snytt Sep 20, 2024
32e2fc5
Bump min run ID for staleness after getDocComment
som-snytt May 22, 2025
4bbd250
Use sequential parsing of sources in PC
som-snytt May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/compiler/scala/tools/nsc/Global.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,10 +1692,11 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
def compileLate(unit: CompilationUnit): Unit = {
addUnit(unit)

if (firstPhase ne null) { // we might get here during initialization, is a source is newer than the binary
if (firstPhase ne null) { // we might get here during initialization, if a source is newer than the binary
val maxId = math.max(globalPhase.id, typerPhase.id)
firstPhase.iterator takeWhile (_.id < maxId) foreach (ph =>
enteringPhase(ph)(ph.asInstanceOf[GlobalPhase] applyPhase unit))
firstPhase.iterator.takeWhile(_.id < maxId).foreach { ph =>
enteringPhase(ph)(ph.asInstanceOf[GlobalPhase].applyPhase(unit))
}
refreshProgress()
}
}
Expand Down
24 changes: 11 additions & 13 deletions src/interactive/scala/tools/nsc/interactive/CompilerControl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,16 @@ trait CompilerControl { self: Global =>
def askToDoFirst(source: SourceFile) =
postWorkItem(new AskToDoFirstItem(source))

/** If source is not yet loaded, loads it, and starts a new run, otherwise
* continues with current pass.
* Waits until source is fully type checked and returns body in response.
* @param source The source file that needs to be fully typed.
* @param keepLoaded Whether to keep that file in the PC if it was not loaded before. If
the file is already loaded, this flag is ignored.
* @param response The response, which is set to the fully attributed tree of `source`.
* If the unit corresponding to `source` has been removed in the meantime
* the a NoSuchUnitError is raised in the response.
/** If source is not yet loaded, loads it, and starts a new run, otherwise continues with current pass.
* Waits until source is fully type checked and returns body in response.
* @param source The source file that needs to be fully typed.
* @param keepLoaded Whether to keep that file in the PC if it was not loaded before. If
* the file is already loaded, this flag is ignored.
* @param response The response, which is set to the fully attributed tree of `source`.
* If the unit corresponding to `source` has been removed in the meantime
* the a NoSuchUnitError is raised in the response.
*/
def askLoadedTyped(source:SourceFile, keepLoaded: Boolean, response: Response[Tree]): Unit =
def askLoadedTyped(source: SourceFile, keepLoaded: Boolean, response: Response[Tree]): Unit =
postWorkItem(new AskLoadedTypedItem(source, keepLoaded, response))

final def askLoadedTyped(source: SourceFile, response: Response[Tree]): Unit =
Expand Down Expand Up @@ -260,15 +259,14 @@ trait CompilerControl { self: Global =>
if (self.onCompilerThread) {
try { r set op() }
catch { case exc: Throwable => r raise exc }
r
} else {
val ir = scheduler askDoQuickly op
ir onComplete {
case Left(result) => r set result
case Right(exc) => r raise exc
}
r
}
r
}

def onCompilerThread = Thread.currentThread == compileRunner
Expand Down Expand Up @@ -327,7 +325,7 @@ trait CompilerControl { self: Global =>

case class ReloadItem(sources: List[SourceFile], response: Response[Unit]) extends WorkItem {
def apply() = reload(sources, response)
override def toString = "reload "+sources
override def toString = s"reload $sources"

def raiseMissing() =
response raise new MissingResponse
Expand Down
1 change: 0 additions & 1 deletion src/interactive/scala/tools/nsc/interactive/ContextTrees.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,3 @@ trait ContextTrees { self: Global =>
}
}
}

Loading