Cleanup/consolidate Dart Plugin pub API interactions. (#669)

flutter · Jan 27, 2017 · 1e89559 · 1e89559
1 parent 5d8d0a5
commit 1e89559
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/io/flutter/dart/DartPlugin.java b/src/io/flutter/dart/DartPlugin.java
@@ -11,6 +11,7 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Version;
+import com.jetbrains.lang.dart.ide.actions.DartPubActionBase;
 import com.jetbrains.lang.dart.sdk.DartSdk;
 import com.jetbrains.lang.dart.sdk.DartSdkGlobalLibUtil;
 import com.jetbrains.lang.dart.sdk.DartSdkUtil;
@@ -64,6 +65,20 @@ public static boolean isDartSdkHome(@Nullable String path) {
     return DartSdkUtil.isDartSdkHome(path);
   }
 
+  public static boolean isPubActionInProgress() {
+    return DartPubActionBase.isInProgress();
+  }
+
+  public static void setPubActionInProgress(boolean inProgress) {
+    // TODO: replace w/ DartPubActionBase.setIsInProgress() when DartPlugin lower-bound is upped to 163.10154.
+    try {
+      DartPubActionBase.class.getMethod("setIsInProgress", boolean.class).invoke(null, inProgress);
+    }
+    catch (Throwable th) {
+      // ignore and move on
+    }
+  }
+
   /**
    * @return the minimum required version of the Dart Plugin
    */

diff --git a/src/io/flutter/inspections/FlutterDependencyInspection.java b/src/io/flutter/inspections/FlutterDependencyInspection.java
@@ -18,14 +18,14 @@
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.lang.dart.ide.actions.DartPubActionBase;
 import com.jetbrains.lang.dart.psi.DartFile;
 import gnu.trove.THashSet;
 import io.flutter.FlutterBundle;
 import io.flutter.FlutterConstants;
 import io.flutter.FlutterMessages;
 import io.flutter.FlutterUtils;
 import io.flutter.actions.FlutterSdkAction;
+import io.flutter.dart.DartPlugin;
 import io.flutter.sdk.FlutterSdk;
 import io.flutter.utils.FlutterModuleUtils;
 import org.jetbrains.annotations.NotNull;
@@ -43,8 +43,7 @@ public ProblemDescriptor[] checkFile(@NotNull final PsiFile psiFile, @NotNull fi
 
     if (!(psiFile instanceof DartFile)) return null;
 
-
-    if (DartPubActionBase.isInProgress()) return null;
+    if (DartPlugin.isPubActionInProgress()) return null;
 
     final VirtualFile file = FlutterUtils.getRealVirtualFile(psiFile);
     if (file == null || !file.isInLocalFileSystem()) return null;

diff --git a/src/io/flutter/sdk/FlutterSdk.java b/src/io/flutter/sdk/FlutterSdk.java
@@ -27,7 +27,6 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.content.MessageView;
 import com.intellij.util.ArrayUtil;
-import com.jetbrains.lang.dart.ide.actions.DartPubActionBase;
 import com.jetbrains.lang.dart.sdk.DartSdk;
 import io.flutter.FlutterBundle;
 import io.flutter.FlutterMessages;
@@ -105,23 +104,13 @@ private static void printExitMessage(@Nullable Project project, @Nullable Module
     });
   }
 
-  private static void setPubInProgress(boolean inProgress) {
-    try {
-      DartPubActionBase.class.getMethod("setIsInProgress", boolean.class).invoke(null, inProgress);
-    }
-    catch (Throwable th) {
-      // ignore and move on
-    }
-  }
-
   private static void start(@NotNull OSProcessHandler handler) {
-    // TODO: replace w/ DartPubActionBase.setIsInProgress() when DartPlugin lower-bound is upped to 163.10154.
-    setPubInProgress(true);
+    DartPlugin.setPubActionInProgress(true);
     try {
       handler.startNotify();
     }
     finally {
-      setPubInProgress(false);
+      DartPlugin.setPubActionInProgress(false);
     }
   }