[logging] Convert FlutterSdk class to using PluginLogger (flutter#8427)

I'm not sure if the `FlutterSdk` class actually gets asked to call
`flutter run`, `flutter attach`, or `flutter test`, but seems reasonable
to check in case.

Author: helin24

src/io/flutter/sdk/FlutterCommand.java

@@ -64,14 +64,38 @@ public class FlutterCommand {
   /**
    * Returns a displayable version of the command that will be run.
    */
-  public String getDisplayCommand() {
+  public @NotNull String getDisplayCommand() {
     final List<String> words = new ArrayList<>();
     words.add("flutter");
     words.addAll(type.subCommand);
     words.addAll(args);
     return String.join(" ", words);
   }
 
+  /**
+   * Returns a displayable version of the command, with potential file paths redacted if path logging is disabled.
+   */
+  public String getSanitizedDisplayCommand() {
+    if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
+      return getDisplayCommand();
+    }
+
+    final List<String> words = new ArrayList<>();
+    words.add("flutter");
+    words.addAll(type.subCommand);
+
+    final List<String> newArgs = new ArrayList<>(args);
+    // For run, attach, and test commands, the last argument is typically a file path.
+    // We redact it to avoid logging user-specific information.
+    if (!newArgs.isEmpty() && (type == Type.RUN || type == Type.ATTACH || type == Type.TEST)) {
+      final int lastIndex = newArgs.size() - 1;
+      newArgs.set(lastIndex, "<path>");
+    }
+
+    words.addAll(newArgs);
+    return String.join(" ", words);
+  }
+
   protected boolean isPubRelatedCommand() {
     return pubRelatedCommands.contains(type);
   }
@@ -286,10 +310,11 @@ enum Type {
     TEST("Flutter test", "test");
 
     final public String title;
-    final ImmutableList<String> subCommand;
+    final @NotNull ImmutableList<String> subCommand;
 
-    Type(String title, String... subCommand) {
+    Type(String title, @NotNull String... subCommand) {
       this.title = title;
+      assert subCommand != null;
       this.subCommand = ImmutableList.copyOf(subCommand);
     }
   }

src/io/flutter/sdk/FlutterSdk.java

@@ -32,6 +32,7 @@
 import io.flutter.FlutterBundle;
 import io.flutter.FlutterUtils;
 import io.flutter.dart.DartPlugin;
+import io.flutter.logging.PluginLogger;
 import io.flutter.module.FlutterProjectType;
 import io.flutter.pub.PubRoot;
 import io.flutter.run.FlutterDevice;
@@ -60,7 +61,7 @@ public class FlutterSdk {
 
   private static final @NotNull String DART_CORE_SUFFIX = DART_SDK_SUFFIX + "/lib/core";
 
-  private static final @NotNull Logger LOG = Logger.getInstance(FlutterSdk.class);
+  private static final @NotNull Logger LOG = PluginLogger.createLogger(FlutterSdk.class);
 
   private static final @NotNull Map<String, FlutterSdk> projectSdkCache = new HashMap<>();
 
@@ -443,7 +444,11 @@ public PubRoot createFiles(@NotNull VirtualFile baseDir, @Nullable Module module
       }
     }
     catch (InterruptedException e) {
-      FlutterUtils.warn(LOG, e);
+      if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
+        LOG.warn(e);
+      } else {
+        LOG.warn(e.toString());
+      }
       return null;
     }
 
@@ -694,22 +699,21 @@ public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType
       }
     });
 
-    LOG.info("Calling " + command.getDisplayCommand());
     final long start = System.currentTimeMillis();
     process.startNotify();
     if (process.waitFor(5000)) {
       final long duration = System.currentTimeMillis() - start;
-      LOG.info(command.getDisplayCommand() + ": " + duration + "ms");
+      LOG.info(command.getSanitizedDisplayCommand() + " (" + duration + "ms)");
       final Integer code = process.getExitCode();
       if (code != null && code == 0) {
         return stdout.toString();
       }
       else {
-        LOG.info("Exit code from " + command.getDisplayCommand() + ": " + code);
+        LOG.info("Exit code " + code + " from " + command.getSanitizedDisplayCommand());
       }
     }
     else {
-      LOG.info("Timeout when calling " + command.getDisplayCommand());
+      LOG.info("Timeout when calling " + command.getSanitizedDisplayCommand());
     }
     return null;
   }