From 40148551372b16c20e832e5b8e5ae0e43db44d65 Mon Sep 17 00:00:00 2001
From: pTalanov <Pavel.Talanov@jetbrains.com>
Date: Fri, 1 Jun 2012 21:44:07 +0400
Subject: [PATCH] Try to avoid race condition in "configure Js module" action

---
 ...gureKotlinLibraryNotificationProvider.java | 21 ++++++++++++-------
 .../jet/plugin/quickfix/JsModuleSetUp.java    |  8 +++----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
index 29455cafe69..0b873b1259c 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
@@ -92,10 +92,11 @@ public class ConfigureKotlinLibraryNotificationProvider implements EditorNotific
             if (JavaPsiFacade.getInstance(myProject).findClass("jet.JetObject", scope) == null) {
                 return createNotificationPanel(module);
             }
-
-        } catch (ProcessCanceledException e) {
+        }
+        catch (ProcessCanceledException e) {
             // Ignore
-        } catch (IndexNotReadyException e) {
+        }
+        catch (IndexNotReadyException e) {
             // Ignore
         }
 
@@ -116,7 +117,8 @@ public class ConfigureKotlinLibraryNotificationProvider implements EditorNotific
 
         File runtimePath = PathUtil.getDefaultRuntimePath();
         if (runtimePath == null) {
-            Messages.showErrorDialog(myProject, "kotlin-runtime.jar is not found. Make sure plugin is properly installed.", "No Runtime Found");
+            Messages.showErrorDialog(myProject, "kotlin-runtime.jar is not found. Make sure plugin is properly installed.",
+                                     "No Runtime Found");
             return null;
         }
 
@@ -131,7 +133,8 @@ public class ConfigureKotlinLibraryNotificationProvider implements EditorNotific
             if (jarVfs != null) {
                 jarVfs.refresh(false, false);
             }
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             Messages.showErrorDialog(myProject, "Error copying jar: " + e.getLocalizedMessage(), "Error Copying File");
             return null;
         }
@@ -175,8 +178,12 @@ public class ConfigureKotlinLibraryNotificationProvider implements EditorNotific
     }
 
     private void setUpJSModule(@NotNull Module module) {
-        JsModuleSetUp.doSetUpModule(module.getProject());
-        updateNotifications();
+        JsModuleSetUp.doSetUpModule(module.getProject(), new Runnable() {
+            @Override
+            public void run() {
+                updateNotifications();
+            }
+        });
     }
 
     private void setUpKotlinRuntime(@NotNull final Module module) {
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java
index 2066971c487..b0516494c0c 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java
@@ -45,7 +45,7 @@ public final class JsModuleSetUp {
     private JsModuleSetUp() {
     }
 
-    public static void doSetUpModule(@Nullable Project project) {
+    public static void doSetUpModule(@Nullable Project project, @NotNull Runnable continuation) {
         if (project == null) {
             notifyFailure("Internal error: Project not found.");
             return;
@@ -67,7 +67,7 @@ public final class JsModuleSetUp {
 
         createIndicationFile(file);
 
-        refreshRootDir(project);
+        refreshRootDir(project, continuation);
     }
 
     private static boolean copyJsLibFiles(@NotNull File rootDir) {
@@ -81,8 +81,8 @@ public final class JsModuleSetUp {
         return doCopyJsLibFiles(Arrays.asList(jsLibJarPath, jsLibJsPath), rootDir);
     }
 
-    private static void refreshRootDir(@NotNull Project project) {
-        getContentRoot(project).refresh(false, true);
+    private static void refreshRootDir(@NotNull Project project, @NotNull Runnable continuation) {
+        getContentRoot(project).refresh(true, true, continuation);
     }
 
     private static void createIndicationFile(@NotNull File file) {