luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Alt scala parser sync workaround" 

Although in theory the fix in #3776 should be preferable to
synchronize templateStats() manually, it turns out that we
still get errors in some tests. So, reverting to a
synchronized section while we investigate.

This reverts commit ee90917cc4.
This commit is contained in:
Antonio Cunei 2017-12-08 19:21:14 +01:00
parent 30fd81edf6
commit 5c72c3b487
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/scala/sbt/internal/parser/SbtParser.scala
View File

@ -116,9 +116,7 @@ private[sbt] object SbtParser {
scalacGlobalInitReporter = Some(new ConsoleReporter(settings)) scalacGlobalInitReporter = Some(new ConsoleReporter(settings))
// Mix Positions, otherwise global ignores -Yrangepos // Mix Positions, otherwise global ignores -Yrangepos
val global = new Global(settings, globalReporter) with Positions { val global = new Global(settings, globalReporter) with Positions
override protected def synchronizeNames = true // https://github.com/scala/bug/issues/10605
}
val run = new global.Run val run = new global.Run
// Add required dummy unit for initialization... // Add required dummy unit for initialization...
val initFile = new BatchSourceFile("<wrapper-init>", "") val initFile = new BatchSourceFile("<wrapper-init>", "")
@ -151,7 +149,9 @@ private[sbt] object SbtParser {
val wrapperFile = new BatchSourceFile(reporterId, code) val wrapperFile = new BatchSourceFile(reporterId, code)
val unit = new CompilationUnit(wrapperFile) val unit = new CompilationUnit(wrapperFile)
val parser = new syntaxAnalyzer.UnitParser(unit) val parser = new syntaxAnalyzer.UnitParser(unit)
val parsedTrees = parser.templateStats() val parsedTrees = SbtParser.synchronized { // see https://github.com/scala/bug/issues/10605
parser.templateStats()
}
parser.accept(scala.tools.nsc.ast.parser.Tokens.EOF) parser.accept(scala.tools.nsc.ast.parser.Tokens.EOF)
globalReporter.throwParserErrorsIfAny(reporter, filePath) globalReporter.throwParserErrorsIfAny(reporter, filePath)
parsedTrees -> reporterId parsedTrees -> reporterId