Merge pull request #904 from sschaef/t1002388-race-condition

Prevent race condition in CallByNameParamAtCreationPresenter
scala-ide · Feb 26, 2015 · bf151ce · bf151ce
2 parents 74a8d1b + 141cd0a
commit bf151ce
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...laide/ui/internal/editor/decorators/bynameparams/CallByNameParamAtCreationPresenter.scala b/...laide/ui/internal/editor/decorators/bynameparams/CallByNameParamAtCreationPresenter.scala
@@ -60,13 +60,16 @@ object CallByNameParamAtCreationPresenter extends HasLogger {
          * This should cover partially applied functions referencing by-name-params (see #1002381).
          */
         def referencesByNameParam(param: compiler.Symbol) = {
+          import org.scalaide.core.compiler.IScalaPresentationCompiler.Implicits.RichResponse
           if (!param.hasRawInfo) {
             false
           } else {
-            param.rawInfo.typeSymbol match {
-              case cs: compiler.ClassSymbol => cs.name == compiler.tpnme.BYNAME_PARAM_CLASS_NAME
-              case _ => false
-            }
+            compiler.asyncExec {
+              param.rawInfo.typeSymbol match {
+                case cs: compiler.ClassSymbol => cs.name == compiler.tpnme.BYNAME_PARAM_CLASS_NAME
+                case _ => false
+              }
+            }.getOrElse(false)()
           }
         }