Fix possible race condition in AddMethodProposal

Creating a refactoring needs to be done on the compiler thread.
scala-ide · Oct 4, 2014 · 8049fa6 · 8049fa6
1 parent a39b058
commit 8049fa6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/org.scala-ide.sdt.core/src/org/scalaide/core/internal/quickfix/AddMethodProposal.scala b/org.scala-ide.sdt.core/src/org/scalaide/core/internal/quickfix/AddMethodProposal.scala
@@ -17,6 +17,7 @@ import tools.nsc.interactive.Global
 import scala.tools.refactoring.common.TextChange
 import org.scalaide.core.quickassist.BasicCompletionProposal
 import org.scalaide.ui.ScalaImages
+import org.scalaide.core.compiler.IScalaPresentationCompiler.Implicits._
 
 abstract class AddValOrDefProposal extends BasicCompletionProposal(
     relevance = 90,
@@ -36,7 +37,10 @@ abstract class AddValOrDefProposal extends BasicCompletionProposal(
       theDocument <- EditorUtils.findOrOpen(scalaSourceFile.workspaceFile)
     } {
       val scu = scalaSourceFile.getCompilationUnit.asInstanceOf[ScalaCompilationUnit]
-      val changes = scu.withSourceFile(addRefactoring) getOrElse Nil
+
+      val changes = scu.withSourceFile { (sf, compiler) =>
+        compiler.asyncExec(addRefactoring(sf, compiler)).getOrElse(Nil)()
+      } getOrElse Nil
 
       for (change <- changes) {
         val edit = new ReplaceEdit(change.from, change.to - change.from, change.text)