Add FlutterUtils methods to handle path erasing

Author: helin24

src/io/flutter/FlutterUtils.java

@@ -111,10 +111,36 @@ public static boolean isAndroidStudio() {
     }
   }
 
+  public static void info(@NotNull Logger logger, @NotNull Exception e) {
+    info(logger, e, false);
+  }
+
+  public static void info(@NotNull Logger logger, @NotNull Exception e, boolean sanitizePaths) {
+    if (sanitizePaths && FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
+      logger.info(e);
+    } else {
+      logger.info(e.toString());
+    }
+  }
+
+  public static void warn(@NotNull Logger logger, @NotNull Exception e) {
+    warn(logger, e, false);
+  }
+
+  public static void warn(@NotNull Logger logger, @NotNull Exception e, boolean sanitizePaths) {
+    if (sanitizePaths && FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
+      logger.warn(e);
+    } else {
+      logger.warn(e.toString());
+    }
+  }
+
   /**
    * Write a warning message to the IntelliJ log.
    * <p>
    * This is separate from LOG.warn() to allow us to decorate the behavior.
+   *
+   * This method is deprecated (as we are not decorating this behavior anywhere).
    */
   public static void warn(@NotNull Logger logger, @NotNull Throwable t) {
     logger.warn(t);
@@ -124,6 +150,8 @@ public static void warn(@NotNull Logger logger, @NotNull Throwable t) {
    * Write a warning message to the IntelliJ log.
    * <p>
    * This is separate from LOG.warn() to allow us to decorate the behavior.
+   *
+   * This method is deprecated (as we are not decorating this behavior anywhere).
    */
   public static void warn(@NotNull Logger logger, @NotNull String message) {
     logger.warn(message);
@@ -133,6 +161,8 @@ public static void warn(@NotNull Logger logger, @NotNull String message) {
    * Write a warning message to the IntelliJ log.
    * <p>
    * This is separate from LOG.warn() to allow us to decorate the behavior.
+   *
+   * This method is deprecated (as we are not decorating this behavior anywhere).
    */
   public static void warn(@NotNull Logger logger, @NotNull String message, @NotNull Throwable t) {
     logger.warn(message, t);

src/io/flutter/run/LaunchState.java

@@ -51,7 +51,6 @@
 import io.flutter.run.daemon.DaemonConsoleView;
 import io.flutter.run.daemon.DeviceService;
 import io.flutter.run.daemon.FlutterApp;
-import io.flutter.settings.FlutterSettings;
 import io.flutter.toolwindow.ToolWindowBadgeUpdater;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -173,7 +172,7 @@ protected RunContentDescriptor launch(@NotNull ExecutionEnvironment env) throws
 
     try {
       // There is no public way to set display name so we resort to reflection.
-      final Field f = descriptor.getClass().getDeclaredField("myDisplayNameView");
+      final Field f = descriptor.getClass().getDeclaredField("myDisplayNameView_INVALID");
       f.setAccessible(true);
       Object viewInstance = f.get(descriptor);
       if (viewInstance != null) {
@@ -182,11 +181,7 @@ protected RunContentDescriptor launch(@NotNull ExecutionEnvironment env) throws
       }
     }
     catch (IllegalAccessException | InvocationTargetException | NoSuchFieldException | NoSuchMethodException e) {
-      if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
-        LOG.info(e);
-      } else {
-        LOG.info(e.toString());
-      }
+      FlutterUtils.info(LOG, e, true);
     }
 
     return descriptor;
@@ -407,11 +402,7 @@ protected RunContentDescriptor doExecute(@NotNull RunProfileState state, @NotNul
                   app.shutdownAsync().get();
                 }
                 catch (InterruptedException | java.util.concurrent.ExecutionException e) {
-                  if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
-                    LOG.warn(e);
-                  } else {
-                    LOG.warn(e.toString());
-                  }
+                  FlutterUtils.warn(LOG, e, true);
                 }
                 return launchState.launch(env);
               }

src/io/flutter/run/SdkFields.java

@@ -19,6 +19,7 @@
 import com.jetbrains.lang.dart.sdk.DartConfigurable;
 import com.jetbrains.lang.dart.sdk.DartSdk;
 import io.flutter.FlutterBundle;
+import io.flutter.FlutterUtils;
 import io.flutter.dart.DartPlugin;
 import io.flutter.logging.PluginLogger;
 import io.flutter.pub.PubRoot;
@@ -232,11 +233,7 @@ public GeneralCommandLine createFlutterSdkRunCommand(
       args = ArrayUtil.append(args, "--devtools-server-address=http://" + instance.host() + ":" + instance.port());
     }
     catch (Exception e) {
-      if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
-        LOG.info(e);
-      } else {
-        LOG.info(e.toString());
-      }
+      FlutterUtils.warn(LOG, e, true);
     }
     command = flutterSdk.flutterRun(root, main.getFile(), device, runMode, flutterLaunchMode, project, args);
     final GeneralCommandLine commandLine = command.createGeneralCommandLine(project);