diff --git a/src/io/flutter/vmService/DartVmServiceDebugProcess.java b/src/io/flutter/vmService/DartVmServiceDebugProcess.java index f89b279fa..5179a63db 100644 --- a/src/io/flutter/vmService/DartVmServiceDebugProcess.java +++ b/src/io/flutter/vmService/DartVmServiceDebugProcess.java @@ -35,6 +35,7 @@ import io.flutter.FlutterBundle; import io.flutter.FlutterUtils; import io.flutter.ObservatoryConnector; +import io.flutter.logging.PluginLogger; import io.flutter.run.FlutterLaunchMode; import io.flutter.utils.OpenApiUtils; import io.flutter.vmService.frame.DartVmServiceEvaluator; @@ -59,7 +60,7 @@ import java.util.concurrent.CompletableFuture; public abstract class DartVmServiceDebugProcess extends XDebugProcess { - private static final @NotNull Logger LOG = Logger.getInstance(DartVmServiceDebugProcess.class.getName()); + private static final @NotNull Logger LOG = PluginLogger.createLogger(DartVmServiceDebugProcess.class); @NotNull private final ExecutionResult myExecutionResult; @NotNull private final DartUrlResolver myDartUrlResolver; diff --git a/src/io/flutter/vmService/VmServiceWrapper.java b/src/io/flutter/vmService/VmServiceWrapper.java index c52ef26a3..2e9abbab8 100644 --- a/src/io/flutter/vmService/VmServiceWrapper.java +++ b/src/io/flutter/vmService/VmServiceWrapper.java @@ -24,8 +24,10 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl; import com.jetbrains.lang.dart.DartFileType; import io.flutter.bazel.WorkspaceCache; +import io.flutter.logging.PluginLogger; import io.flutter.sdk.FlutterSdk; import io.flutter.sdk.FlutterSdkVersion; +import io.flutter.settings.FlutterSettings; import io.flutter.utils.OpenApiUtils; import io.flutter.vmService.frame.DartAsyncMarkerFrame; import io.flutter.vmService.frame.DartVmServiceEvaluator; @@ -88,7 +90,7 @@ import java.util.regex.Pattern; public class VmServiceWrapper implements Disposable { - @NotNull private static final Logger LOG = Logger.getInstance(VmServiceWrapper.class.getName()); + @NotNull private static final Logger LOG = PluginLogger.createLogger(VmServiceWrapper.class); private static final long RESPONSE_WAIT_TIMEOUT = 3000; // millis @@ -560,7 +562,7 @@ public void addBreakpointWithVmService(@NotNull String isolateId, int line = position.getLine() + 1; String resolvedUri = getResolvedUri(position); - LOG.info("Computed resolvedUri: " + resolvedUri); + if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) LOG.info("Computed resolvedUri: " + resolvedUri); List resolvedUriList = List.of(percentEscapeUri(resolvedUri)); CanonicalBreakpoint canonicalBreakpoint = @@ -636,7 +638,7 @@ private String getResolvedUri(@NotNull XSourcePosition position) { WorkspaceCache.getInstance(session.getProject()).isBazel() ? position.getFile() : position.getFile().getCanonicalFile(); assert file != null; String url = file.getUrl(); - LOG.info("in getResolvedUri. url: " + url); + if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) LOG.info("in getResolvedUri. url: " + url); if (WorkspaceCache.getInstance(myDebugProcess.getSession().getProject()).isBazel()) { String root = WorkspaceCache.getInstance(myDebugProcess.getSession().getProject()).get().getRoot().getPath();