Remove unused code, mostly from the utils directory (flutter#7704)

Author: jwren

flutter-idea/src/io/flutter/FlutterUtils.java

@@ -95,21 +95,6 @@ public long getModificationStamp() {
   private FlutterUtils() {
   }
 
-  /**
-   * This method exists for compatibility with older IntelliJ API versions.
-   * <p>
-   * `Application.invokeAndWait(Runnable)` doesn't exist pre 2016.3.
-   */
-  public static void invokeAndWait(@NotNull Runnable runnable) throws ProcessCanceledException {
-    ApplicationManager.getApplication().invokeAndWait(
-      runnable,
-      ModalityState.defaultModalityState());
-  }
-
-  public static boolean isFlutteryFile(@NotNull VirtualFile file) {
-    return isDartFile(file) || PubRoot.isPubspec(file);
-  }
-
   public static boolean couldContainWidgets(@Nullable Project project, @Nullable VirtualFile file) {
     // Skip nulls, temp file used to show things like files downloaded from the VM, non-local files
     return file != null &&
@@ -155,14 +140,6 @@ public static void warn(@NotNull Logger logger, @NotNull String message, @NotNul
     logger.warn(message, t);
   }
 
-  private static int getBaselineVersion() {
-    final ApplicationInfo appInfo = ApplicationInfo.getInstance();
-    if (appInfo != null) {
-      return appInfo.getBuild().getBaselineVersion();
-    }
-    return -1;
-  }
-
   public static void disableGradleProjectMigrationNotification(@NotNull Project project) {
     final String showMigrateToGradlePopup = "show.migrate.to.gradle.popup";
     final PropertiesComponent properties = PropertiesComponent.getInstance(project);
@@ -172,10 +149,6 @@ public static void disableGradleProjectMigrationNotification(@NotNull Project pr
     }
   }
 
-  public static boolean exists(@Nullable VirtualFile file) {
-    return file != null && file.exists();
-  }
-
   /**
    * Test if the given element is contained in a module with a pub root that declares a flutter dependency.
    */
@@ -356,41 +329,13 @@ public static boolean isXcodeWorkspaceFileName(@NotNull String name) {
     return name.endsWith(".xcworkspace");
   }
 
-  /**
-   * Checks whether the given commandline executes cleanly.
-   *
-   * @param cmd the command
-   * @return true if the command runs cleanly
-   */
-  public static boolean runsCleanly(@NotNull GeneralCommandLine cmd) {
-    try {
-      return ExecUtil.execAndGetOutput(cmd).getExitCode() == 0;
-    }
-    catch (ExecutionException e) {
-      return false;
-    }
-  }
-
   @NotNull
   public static PluginId getPluginId() {
     final PluginId pluginId = PluginId.findId("io.flutter", "");
     assert pluginId != null;
     return pluginId;
   }
 
-  /**
-   * Given some plugin id, this method returns the {@link IdeaPluginDescriptor}, or null if the plugin is not installed.
-   */
-  @Nullable
-  public static IdeaPluginDescriptor getPluginDescriptor(@NotNull String pluginId) {
-    for (IdeaPluginDescriptor descriptor : PluginManagerCore.getPlugins()) {
-      if (descriptor.getPluginId().getIdString().equals(pluginId)) {
-        return descriptor;
-      }
-    }
-    return null;
-  }
-
   /**
    * Returns a structured object with information about the Flutter properties of the given
    * pubspec file.
@@ -493,36 +438,6 @@ protected void addImplicitResolvers() {
     }
   }
 
-  public static boolean isAndroidxProject(@NotNull Project project) {
-    @SystemIndependent final String basePath = project.getBasePath();
-    assert basePath != null;
-    final VirtualFile projectDir = LocalFileSystem.getInstance().findFileByPath(basePath);
-    assert projectDir != null;
-    VirtualFile androidDir = getFlutterManagedAndroidDir(projectDir);
-    if (androidDir == null) {
-      androidDir = getAndroidProjectDir(projectDir);
-      if (androidDir == null) {
-        return false;
-      }
-    }
-    final VirtualFile propFile = androidDir.findChild("gradle.properties");
-    if (propFile == null) {
-      return false;
-    }
-    final Properties properties = new Properties();
-    try {
-      properties.load(new InputStreamReader(propFile.getInputStream(), Charsets.UTF_8));
-    }
-    catch (IOException ex) {
-      return false;
-    }
-    final String value = properties.getProperty("android.useAndroidX");
-    if (value != null) {
-      return Boolean.parseBoolean(value);
-    }
-    return false;
-  }
-
   @Nullable
   private static VirtualFile getAndroidProjectDir(VirtualFile dir) {
     return (dir.findChild("app") == null) ? null : dir;

flutter-idea/src/io/flutter/dart/DartPlugin.java

@@ -6,22 +6,16 @@
 package io.flutter.dart;
 
 import com.intellij.execution.configurations.ConfigurationType;
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
-import com.intellij.ide.plugins.PluginManagerCore;
-import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Version;
 import com.jetbrains.lang.dart.analyzer.DartAnalysisServerService;
 import com.jetbrains.lang.dart.ide.actions.DartPubActionBase;
 import com.jetbrains.lang.dart.sdk.DartSdk;
 import com.jetbrains.lang.dart.sdk.DartSdkLibUtil;
-import com.jetbrains.lang.dart.sdk.DartSdkUpdateOption;
-import com.jetbrains.lang.dart.sdk.DartSdkUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
 import java.util.Objects;
 
 /**
@@ -38,8 +32,6 @@ public class DartPlugin {
   @NotNull
   private static final DartPlugin INSTANCE = new DartPlugin();
 
-  private Version myVersion;
-
   @NotNull
   public static DartPlugin getInstance() {
     return INSTANCE;
@@ -62,14 +54,6 @@ public static void ensureDartSdkConfigured(@NotNull Project project, @NotNull St
     DartSdkLibUtil.ensureDartSdkConfigured(project, sdkHomePath);
   }
 
-  public static void disableDartSdk(@NotNull Collection<Module> modules) {
-    DartSdkLibUtil.disableDartSdk(modules);
-  }
-
-  public static boolean isDartSdkHome(@Nullable String path) {
-    return DartSdkUtil.isDartSdkHome(path);
-  }
-
   public static boolean isPubActionInProgress() {
     return DartPubActionBase.isInProgress();
   }
@@ -86,26 +70,6 @@ public static boolean isDartTestConfiguration(@NotNull ConfigurationType type) {
     return type.getId().equals("DartTestRunConfigurationType");
   }
 
-  public static DartSdkUpdateOption doCheckForUpdates() {
-    return DartSdkUpdateOption.getDartSdkUpdateOption();
-  }
-
-  public static void setCheckForUpdates(@NotNull DartSdkUpdateOption sdkUpdateOption) {
-    DartSdkUpdateOption.setDartSdkUpdateOption(sdkUpdateOption);
-  }
-
-  /**
-   * Return the {@link Version} of the currently installed Dart Plugin.
-   */
-  public Version getVersion() {
-    if (myVersion == null) {
-      final IdeaPluginDescriptor descriptor = PluginManagerCore.getPlugin(PluginId.getId("Dart"));
-      assert (descriptor != null);
-      myVersion = Objects.requireNonNull(Version.parseVersion(Objects.requireNonNull(descriptor.getVersion())));
-    }
-    return myVersion;
-  }
-
   /**
    * Return the {@link DartAnalysisServerService} instance for the passed {@link Project}.
    */

flutter-idea/src/io/flutter/dart/DartPsiUtil.java

@@ -78,7 +78,6 @@ public static PsiElement getNamedArgumentExpression(@NotNull DartArguments argum
       assert namedArgument != null;
       final DartExpression nameExpression = namedArgument.getParameterReferenceExpression();
       assert nameExpression != null;
-      final PsiElement childId = nameExpression.getFirstChild();
       final PsiElement child = nameExpression.getFirstChild();
       if (name.equals(child != null ? child.getText() : "")) {
         return namedArgument.getExpression();

flutter-idea/src/io/flutter/editor/ActiveEditorsOutlineService.java

@@ -123,7 +123,6 @@ private void updateActiveEditors() {
 
     // Remove obsolete outline listeners.
     final List<String> obsoletePaths = new ArrayList<>();
-    FlutterDartAnalysisServer analysisServer = getAnalysisServer();
 
     synchronized (outlineListeners) {
       for (final String path : outlineListeners.keySet()) {

flutter-idea/src/io/flutter/utils/FileUtils.java

@@ -55,19 +55,6 @@ public boolean deleteFile(String path) {
     }
     return true;
   }
-
-  public void loadClass(ClassLoader classLoader, String path) throws Exception {
-    final UrlClassLoader urlClassLoader = (UrlClassLoader) classLoader;
-
-    final File file = new File(path);
-    if (!file.exists()) {
-      throw new Exception("File does not exist: " + file.getAbsolutePath());
-    }
-
-    final URL url = file.toURI().toURL();
-    urlClassLoader.addURL(url);
-  }
-
   /**
    * Loads a list of file paths with a class loader.
    *

flutter-idea/src/io/flutter/utils/HtmlBuilder.java

@@ -161,36 +161,6 @@ private void drawGlyph(String codepoint, Graphics2D graphics, FontRenderContext
     graphics.drawString(codepoint, x0, y0);
   }
 
-  @Nullable
-  public static VirtualFile findAssetMapFor(@NotNull DartComponent dartClass) {
-    final ASTNode node = dartClass.getNode();
-    if (DartTokenTypes.CLASS_DEFINITION != node.getElementType()) {
-      return null;
-    }
-    final DartFile psiElement = (DartFile)node.getPsi().getParent();
-    final VirtualFile file = psiElement.getVirtualFile();
-    VirtualFile map = findAssetMapIn(file.getParent());
-    if (map != null) {
-      return map;
-    }
-    final PsiElement identifier = dartClass.getNameIdentifier();
-    if (identifier == null) {
-      return null;
-    }
-    final String className = AstBufferUtil.getTextSkippingWhitespaceComments(identifier.getNode());
-    final URL resource = IconPreviewGenerator.class.getResource("/iconAssetMaps/" + className + "/asset_map.yaml");
-    if (resource == null) {
-      return null;
-    }
-    try {
-      final URI uri = resource.toURI();
-      return LocalFileSystem.getInstance().findFileByNioFile(Paths.get(uri));
-    }
-    catch (URISyntaxException e) {
-      return null;
-    }
-  }
-
   @Nullable
   public static VirtualFile findAssetMapIn(@NotNull VirtualFile dartClass) {
     VirtualFile dir = dartClass.getParent();

flutter-idea/src/io/flutter/utils/IconPreviewGenerator.java

@@ -39,19 +39,6 @@ public static int getIntMember(@NotNull JsonObject json, @NotNull String memberN
     return value instanceof JsonNull ? -1 : value.getAsInt();
   }
 
-  @NotNull
-  public static List<String> getValues(@NotNull JsonObject json, @NotNull String member) {
-    if (!json.has(member)) {
-      return Collections.emptyList();
-    }
-
-    final JsonArray rawValues = json.getAsJsonArray(member);
-    final ArrayList<String> values = new ArrayList<>(rawValues.size());
-    rawValues.forEach(element -> values.add(element.getAsString()));
-
-    return values;
-  }
-
   // JsonObject.keySet() is defined in 2.8.6 but not 2.7.
   // The 2020.3 version of Android Studio includes both, and 2.7 is first on the class path.
   public static Set<String> getKeySet(JsonObject obj) {
@@ -63,10 +50,6 @@ public static Set<String> getKeySet(JsonObject obj) {
     return strings;
   }
 
-  public static boolean hasJsonData(@Nullable String data) {
-    return StringUtils.isNotEmpty(data) && !Objects.equals(data, "null");
-  }
-
   /**
    * Parses the specified JSON string into a JsonElement.
    */