From 052902cd39a13e684b8d25f740a63d98f877d44e Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Thu, 11 Sep 2025 18:27:38 -0700 Subject: [PATCH 1/3] Change ProjectWatch to use PluginLogger --- src/io/flutter/project/ProjectWatch.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/io/flutter/project/ProjectWatch.java b/src/io/flutter/project/ProjectWatch.java index ef2fd771ad..36c520d563 100644 --- a/src/io/flutter/project/ProjectWatch.java +++ b/src/io/flutter/project/ProjectWatch.java @@ -13,6 +13,8 @@ import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.util.messages.MessageBusConnection; import io.flutter.FlutterUtils; +import io.flutter.logging.PluginLogger; +import io.flutter.settings.FlutterSettings; import org.jetbrains.annotations.NotNull; import java.io.Closeable; @@ -83,10 +85,14 @@ private void fireEvent() { callback.run(); } catch (Exception e) { - FlutterUtils.warn(LOG, "Uncaught exception in ProjectWatch callback", e); + if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) { + LOG.warn("Uncaught exception in ProjectWatch callback", e); + } else { + LOG.warn("Uncaught exception in ProjectWatch callback: " + e.getMessage()); + } close(); // avoid further errors } } - private static final @NotNull Logger LOG = Logger.getInstance(ProjectWatch.class); + private static final @NotNull Logger LOG = PluginLogger.createLogger(ProjectWatch.class); } From bec88c7ebcb5a6003eafda0d445239b58b5798a5 Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Fri, 12 Sep 2025 13:02:45 -0700 Subject: [PATCH 2/3] Use util logging method --- src/io/flutter/project/ProjectWatch.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/io/flutter/project/ProjectWatch.java b/src/io/flutter/project/ProjectWatch.java index 36c520d563..7a24153b00 100644 --- a/src/io/flutter/project/ProjectWatch.java +++ b/src/io/flutter/project/ProjectWatch.java @@ -85,11 +85,7 @@ private void fireEvent() { callback.run(); } catch (Exception e) { - if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) { - LOG.warn("Uncaught exception in ProjectWatch callback", e); - } else { - LOG.warn("Uncaught exception in ProjectWatch callback: " + e.getMessage()); - } + FlutterUtils.warn(LOG,"Uncaught exception in ProjectWatch callback", e, true); close(); // avoid further errors } } From 857201622386a585dcede909f9aff8d92c2cfbab Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Fri, 12 Sep 2025 13:03:11 -0700 Subject: [PATCH 3/3] Remove unused import --- src/io/flutter/project/ProjectWatch.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/io/flutter/project/ProjectWatch.java b/src/io/flutter/project/ProjectWatch.java index 7a24153b00..e9f6ad451b 100644 --- a/src/io/flutter/project/ProjectWatch.java +++ b/src/io/flutter/project/ProjectWatch.java @@ -14,7 +14,6 @@ import com.intellij.util.messages.MessageBusConnection; import io.flutter.FlutterUtils; import io.flutter.logging.PluginLogger; -import io.flutter.settings.FlutterSettings; import org.jetbrains.annotations.NotNull; import java.io.Closeable;