Merge pull request #5 from lucidsoftware/fix-home-directory-deletion-bug

Fix the home directory deletion bug

Author: jadenPete

base/src/com/google/idea/blaze/base/sync/projectstructure/ModuleEditorImpl.java

@@ -122,8 +122,10 @@ public void commitWithGc(BlazeContext context) {
           continue;
         }
         moduleModel.disposeModule(module);
-        File imlFile = new File(module.getModuleFilePath());
-        removeImlFile(imlFile);
+        VirtualFile imlFile = module.getModuleFile();
+        if (imlFile != null) {
+          removeImlFile(imlFile);
+        }
       }
     }
 
@@ -141,29 +143,38 @@ private File getImlDirectory(BlazeImportSettings importSettings) {
     return new File(BlazeDataStorage.getProjectDataDir(importSettings), "modules");
   }
 
+  private static void removeImlFile(final VirtualFile imlFile) {
+    if (imlFile.isDirectory()) {
+      return;
+    }
+
+    ApplicationManager.getApplication()
+      .runWriteAction(
+          new Runnable() {
+            @Override
+            public void run() {
+              try {
+                imlFile.delete(this);
+              } catch (IOException e) {
+                logger.warn(
+                    String.format(
+                        "Could not delete file: %s, will try to continue anyway.",
+                        imlFile.getPath()),
+                    e);
+              }
+            }
+          });
+  }
+
+
   // Delete using the virtual file to ensure that IntelliJ properly updates its index.
   // Otherwise, it is possible for IntelliJ to read the
   // old IML file from its index and behave unpredictably
   // (like failing to save the new IML files to disk).
   private static void removeImlFile(final File imlFile) {
     final VirtualFile imlVirtualFile = VfsUtil.findFileByIoFile(imlFile, true);
     if (imlVirtualFile != null && imlVirtualFile.exists()) {
-      ApplicationManager.getApplication()
-          .runWriteAction(
-              new Runnable() {
-                @Override
-                public void run() {
-                  try {
-                    imlVirtualFile.delete(this);
-                  } catch (IOException e) {
-                    logger.warn(
-                        String.format(
-                            "Could not delete file: %s, will try to continue anyway.",
-                            imlVirtualFile.getPath()),
-                        e);
-                  }
-                }
-              });
+      removeImlFile(imlVirtualFile);
     }
   }
 }