diff --git a/idea/src/org/jetbrains/jet/plugin/framework/KotlinFrameworkDetector.java b/idea/src/org/jetbrains/jet/plugin/framework/KotlinFrameworkDetector.java index 057337d5e6c..ab27121644b 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/KotlinFrameworkDetector.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/KotlinFrameworkDetector.java @@ -27,6 +27,7 @@ import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.ProjectRootModificationTracker; import com.intellij.openapi.roots.libraries.Library; +import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; @@ -123,11 +124,11 @@ public class KotlinFrameworkDetector { @Nullable private static Library getJSStandardLibrary(final Module module) { - final Ref jsLibrary = Ref.create(); - - ApplicationManager.getApplication().runReadAction(new Runnable() { + return ApplicationManager.getApplication().runReadAction(new Computable() { @Override - public void run() { + public Library compute() { + final Ref jsLibrary = Ref.create(); + ModuleRootManager.getInstance(module).orderEntries().librariesOnly().forEachLibrary(new Processor() { @Override public boolean process(Library library) { @@ -139,9 +140,9 @@ public class KotlinFrameworkDetector { return true; } }); + + return jsLibrary.get(); } }); - - return jsLibrary.get(); } }