Log a message without exception for no file paths

src/io/flutter/FlutterUtils.java

@@ -111,27 +111,19 @@ 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) {
+  public static void info(@NotNull Logger logger, @NotNull String message, @NotNull Exception e, boolean sanitizePaths) {
     if (sanitizePaths && FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
-      logger.info(e);
+      logger.info(message, e);
     } else {
-      logger.info(e.toString());
+      logger.info(message);
     }
   }
 
-  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) {
+  public static void warn(@NotNull Logger logger, @NotNull String message, @NotNull Exception e, boolean sanitizePaths) {
     if (sanitizePaths && FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
-      logger.warn(e);
+      logger.warn(message, e);
     } else {
-      logger.warn(e.toString());
+      logger.warn(message);
     }
   }
 

src/io/flutter/editor/FlutterColors.java

@@ -53,7 +53,7 @@ public boolean isPrimary() {
       colors.load(FlutterUtils.class.getResourceAsStream("/flutter/colors/material.properties"));
     }
     catch (IOException e) {
-      FlutterUtils.warn(LOG, e);
+      FlutterUtils.warn(LOG, "Failed to load colors", e, true);
     }
 
     colorToName = new HashMap<>();

src/io/flutter/editor/FlutterCupertinoColors.java

@@ -31,7 +31,7 @@ public class FlutterCupertinoColors {
       colors.load(FlutterUtils.class.getResourceAsStream("/flutter/colors/cupertino.properties"));
     }
     catch (IOException e) {
-      FlutterUtils.warn(LOG, e);
+      FlutterUtils.warn(LOG, "Failed to load Cupertino colors", e, true);
     }
 
     colorToName = new HashMap<>();

src/io/flutter/editor/FlutterCupertinoIcons.java

@@ -27,7 +27,7 @@ public class FlutterCupertinoIcons {
       icons.load(FlutterCupertinoIcons.class.getResourceAsStream("/flutter/icons/cupertino.properties"));
     }
     catch (IOException e) {
-      FlutterUtils.warn(LOG, e);
+      FlutterUtils.warn(LOG, "Failed to load cupertino icons", e, true);
     }
   }
 

src/io/flutter/editor/FlutterMaterialIcons.java

@@ -27,7 +27,7 @@ public class FlutterMaterialIcons {
       icons.load(FlutterMaterialIcons.class.getResourceAsStream("/flutter/icons/material.properties"));
     }
     catch (IOException e) {
-      FlutterUtils.warn(LOG, e);
+      FlutterUtils.warn(LOG, "Failed to load material icons", e, true);
     }
   }
 

src/io/flutter/module/FlutterModuleBuilder.java

@@ -223,7 +223,7 @@ public static void addAndroidModuleFromFile(@NotNull Project project,
       }
     }
     catch (ModuleWithNameAlreadyExists | IOException e) {
-      FlutterUtils.warn(LOG, e);
+      FlutterUtils.warn(LOG, "Failed to add Android module", e, true);
     }
   }
 

src/io/flutter/run/FlutterDebugProcess.java

@@ -141,7 +141,7 @@ private static void suppressDebugViews(@Nullable RunnerLayoutUi ui) {
           }
         }
         catch (ProcessCanceledException e) {
-          FlutterUtils.warn(LOG, e);
+          FlutterUtils.warn(LOG, "Failed to suppress debug views", e, true);
           throw e;
         }
       }

src/io/flutter/run/LaunchState.java

@@ -181,7 +181,7 @@ protected RunContentDescriptor launch(@NotNull ExecutionEnvironment env) throws
       }
     }
     catch (IllegalAccessException | InvocationTargetException | NoSuchFieldException | NoSuchMethodException e) {
-      FlutterUtils.info(LOG, e, true);
+      FlutterUtils.info(LOG, "Error setting display name", e, true);
     }
 
     return descriptor;
@@ -402,7 +402,7 @@ protected RunContentDescriptor doExecute(@NotNull RunProfileState state, @NotNul
                   app.shutdownAsync().get();
                 }
                 catch (InterruptedException | java.util.concurrent.ExecutionException e) {
-                  FlutterUtils.warn(LOG, e, true);
+                  FlutterUtils.warn(LOG, "Error while shutting down app", e, true);
                 }
                 return launchState.launch(env);
               }

src/io/flutter/run/SdkFields.java

@@ -233,7 +233,7 @@ public GeneralCommandLine createFlutterSdkRunCommand(
       args = ArrayUtil.append(args, "--devtools-server-address=http://" + instance.host() + ":" + instance.port());
     }
     catch (Exception e) {
-      FlutterUtils.warn(LOG, e, true);
+      FlutterUtils.warn(LOG, "Error while starting DevTools", e, true);
     }
     command = flutterSdk.flutterRun(root, main.getFile(), device, runMode, flutterLaunchMode, project, args);
     final GeneralCommandLine commandLine = command.createGeneralCommandLine(project);

src/io/flutter/run/SdkRunConfig.java

@@ -103,7 +103,7 @@ public static class RecursiveDeleter extends SimpleFileVisitor<Path> {
           Files.delete(file);
         }
         catch (IOException e) {
-          FlutterUtils.warn(LOG, e);
+          FlutterUtils.warn(LOG, "Unable to delete file: " + name, e, true);
           // TODO(jacobr): consider aborting.
         }
       }
@@ -117,7 +117,7 @@ public static class RecursiveDeleter extends SimpleFileVisitor<Path> {
 
     @Override
     public @NotNull FileVisitResult visitFileFailed(@NotNull Path file, @NotNull IOException exc) {
-      FlutterUtils.warn(LOG, exc);
+      FlutterUtils.warn(LOG, "Unable to visit file", exc, true);
       return CONTINUE;
     }
   }
@@ -187,7 +187,7 @@ public LaunchState getState(@NotNull Executor executor, @NotNull ExecutionEnviro
           Files.writeString(cachedParametersPath, json);
         }
         catch (IOException e) {
-          FlutterUtils.warn(LOG, e);
+          FlutterUtils.warn(LOG, "Unable to delete dill or write params", e, true);
         }
       }
 

src/io/flutter/run/daemon/DeviceDaemon.java

@@ -275,7 +275,7 @@ else if (attempts == DeviceDaemon.RESTART_ATTEMPTS_BEFORE_WARNING + 4) {
           }
           catch (java.util.concurrent.ExecutionException e) {
             // This is not a user facing crash - we log (and no devices will be discovered).
-            FlutterUtils.warn(LOG, e, true);
+            FlutterUtils.warn(LOG, "Error while starting device daemon", e, true);
           }
         }
       }

src/io/flutter/sdk/FlutterSdk.java

@@ -444,7 +444,7 @@ public PubRoot createFiles(@NotNull VirtualFile baseDir, @Nullable Module module
       }
     }
     catch (InterruptedException e) {
-      FlutterUtils.warn(LOG, e, true);
+      FlutterUtils.warn(LOG, "Interruption while waiting for createFiles", e, true);
       return null;
     }
 

src/io/flutter/utils/IconPreviewGenerator.java

@@ -94,7 +94,7 @@ public void batchConvert(@NotNull String outPath, @NotNull String path, @NotNull
         }
       }
       catch (IOException ex) {
-        FlutterUtils.warn(LOG, ex);
+        FlutterUtils.warn(LOG, "Unable to batch convert icons", ex, true);
       }
       return null;
     });
@@ -114,7 +114,7 @@ private Icon runInGraphicsContext(TripleFunction<BufferedImage, Graphics2D, Font
       result = callback.fun(image, graphics, frc);
     }
     catch (IOException | FontFormatException ex) {
-      FlutterUtils.warn(LOG, ex);
+      FlutterUtils.warn(LOG, "Unable to generate icon", ex, true);
     }
     finally {
       if (graphics != null) graphics.dispose();