Merge pull request #4175 from cunei/wip-fix4148

Fix for #4148 (SessionSettingsSpec intermittently fails)
sbt · May 29, 2018 · 17f5bc1 · 17f5bc1
2 parents 7e8e18b + f2a7e1f
commit 17f5bc1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/main/src/main/scala/sbt/internal/parser/SbtParser.scala b/main/src/main/scala/sbt/internal/parser/SbtParser.scala
@@ -148,7 +148,9 @@ private[sbt] object SbtParser {
     reporter.reset()
     val wrapperFile = new BatchSourceFile(reporterId, code)
     val unit = new CompilationUnit(wrapperFile)
-    val parser = new syntaxAnalyzer.UnitParser(unit)
+    val parser = SbtParser.synchronized { // see https://github.com/sbt/sbt/issues/4148
+      new syntaxAnalyzer.UnitParser(unit)
+    }
     val parsedTrees = SbtParser.synchronized { // see https://github.com/scala/bug/issues/10605
       parser.templateStats()
     }