Updating my branch

.aiconfig

@@ -0,0 +1,21 @@
+# Gemini Code Assist Configuration
+version: 1.0
+project:
+  context:
+    instruction_files:
+      - .gemini/styleguide.md
+
+  generation_rules:
+    - "Strictly adhere to the IntelliJ Platform Threading Model: No I/O on the EDT."
+    - "All generated AnAction classes must be stateless."
+    - "Apply [MUST-FIX], [CONCERN], and [NIT] severity logic to any code suggestions that violate plugin SDK best practices or style guidelines."
+    - "Use io.flutter.logging.PluginLogger for all logging; avoid System.out."
+    - "Always include the standard Chromium Authors copyright header in new files."
+    - "Adhere to the Zero-Formatting Policy: Do not comment on indentation, spacing, or brace placement."
+    # Ensure local agents read styleguide files automatically.
+    - "At the start of the session, read and adhere to the guidelines in all files listed in project.context.instruction_files."
+
+  languages:
+    - java
+    - kotlin
+    - dart 

.gemini/styleguide.md

@@ -13,6 +13,8 @@ enforce standard modern Java/Kotlin coding conventions, but strictly police the
     - `[NIT]`: Idiomatic improvements or minor naming suggestions.
 - **Focus:** Prioritize logic, performance on the UI thread, and architectural consistency.
 - **No Empty Praise:** Do not leave "Looks good" or "Nice change" comments. If there are no issues, leave no comments.
+- **Copyright Headers:** Ensure all new files have a proper copyright header (e.g., `Copyright 2026 The Chromium Authors`). Flag any missing
+  headers as `[MUST-FIX]`.
 
 ## 2. IntelliJ Platform Best Practices
 
@@ -30,8 +32,10 @@ enforce standard modern Java/Kotlin coding conventions, but strictly police the
       as recommended by the modern SDK.
 - **Backward Compatibility:** Avoid using `@ApiStatus.Internal` or `@ApiStatus.ScheduledForRemoval` APIs unless strictly necessary.
 - **Logging:**
-    - Reject any use of `System.out.println` or `System.err.println` for logging in `src/` code (integration tests may use them for milestone logging).
-    - Enforce the use of the IntelliJ SDK's built-in logger (`com.intellij.openapi.diagnostic.Logger`) or our own (`io.flutter.logging.PluginLogger`).
+    - Reject any use of `System.out.println` or `System.err.println` for logging in `src/` code (integration tests may use them for
+      milestone logging).
+    - Enforce the use of the IntelliJ SDK's built-in logger (`com.intellij.openapi.diagnostic.Logger`) or our own (
+      `io.flutter.logging.PluginLogger`).
 - **Actions:**
     - Classes extending `AnAction` must be completely stateless. Flag any `AnAction` class that defines mutable instance variables (fields),
       as the platform instantiates a single instance of the action for the lifetime of the IDE.

AUTHORS

@@ -26,3 +26,4 @@ Mohamed El Sayed <devblooming@tutanota.com>
 Edwin Ludik <edwin.ludik@gmail.com>
 Japnit Singh <truejswalia@gmail.com>
 Dmitry Kandalov <dmitry.kandalov@gmail.com>
+Kazuya Chikamatsu <kazu.chika.shima@gmail.com>

CHANGELOG.md

@@ -4,13 +4,22 @@
 
 ### Changed
 
-- Updated gradle plugin version to re-enable running `./gradlew verifyPlugin` locally. (#8847)
-
 ### Removed
 
 ### Fixed
 
-- Silent failure when opening Flutter projects without `.idea` directory in IntelliJ IDEA, by removing `FlutterProjectOpenProcessor` and migrating configuration logic to `FlutterInitializer`. (#8845)
+## 91.0.0
+
+### Changed
+
+- Gradle plugin version to re-enable running `./gradlew verifyPlugin` locally. (#8847)
+
+### Fixed
+
+- Gutter buttons not running tests with non-ASCII characters in their names. (#8838)
+- Freeze from JX Browser close. (#8864)
+- Crash in split debugger mode in IntelliJ 2025.3+. (#8878)
+- Passing additional arguments from the Flutter test template. (#8836)
 
 ## 90.0.0
 

gradle.properties

@@ -5,7 +5,7 @@
 #
 
 ideaVersion=2025.2.3.9
-dartPluginVersion= 503.0.0
+dartPluginVersion= 504.0.0
 # Also update the versions for verify checks in tool/github.sh.
 sinceBuild=251
 untilBuild=261.*

resources/META-INF/plugin.xml

@@ -335,6 +335,8 @@
     <!-- See https://github.com/flutter/flutter-intellij/issues/8029 -->
     <projectService serviceImplementation="io.flutter.view.InspectorView" overrides="false"/>
 
+    <projectOpenProcessor id="flutter" implementation="io.flutter.project.FlutterProjectOpenProcessor" order="first"/>
+
     <editorNotificationProvider implementation="io.flutter.editor.FlutterPubspecNotificationProvider"/>
     <editorNotificationProvider implementation="io.flutter.inspections.SdkConfigurationNotificationProvider"/>
     <editorNotificationProvider implementation="io.flutter.editor.NativeEditorNotificationProvider"/>

src/io/flutter/FlutterInitializer.java

@@ -67,6 +67,8 @@
  * Runs actions after the project has started up and the index is up to date.
  *
  * @see ProjectOpenActivity for actions that run earlier.
+ * @see io.flutter.project.FlutterProjectOpenProcessor for additional actions that
+ * may run when a project is being imported.
  */
 public class FlutterInitializer extends FlutterProjectActivity {
   private boolean toolWindowsInitialized = false;
@@ -97,18 +99,6 @@ public void executeProjectStartup(@NotNull Project project) {
     // Start a DevTools server
     DevToolsService.getInstance(project);
 
-    // Ensure Flutter project configuration is applied for projects that may have been
-    // opened without a .idea directory. Previously this was handled by FlutterProjectOpenProcessor,
-    // but that processor silently failed when no delegate processor could open the project.
-    // Instead, we let the platform open the project normally and apply our configuration here.
-    // See https://github.com/flutter/flutter-intellij/issues/8661 (Android Studio equivalent)
-    for (Module module : FlutterModuleUtils.getModules(project)) {
-      if (FlutterModuleUtils.declaresFlutter(module) && !FlutterModuleUtils.isFlutterModule(module)) {
-        log().info("Fixing Flutter module configuration for " + module.getName());
-        FlutterModuleUtils.setFlutterModuleAndReload(module, project);
-      }
-    }
-
     // If the project declares a Flutter dependency, do some extra initialization.
     boolean hasFlutterModule = false;
 

src/io/flutter/actions/DeviceSelectorAction.java

@@ -6,7 +6,6 @@
 package io.flutter.actions;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.ide.ActivityTracker;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
@@ -46,6 +45,7 @@
 import io.flutter.run.FlutterDevice;
 import io.flutter.run.daemon.DeviceService;
 import io.flutter.sdk.AndroidEmulatorManager;
+import io.flutter.utils.AsyncUtils;
 import io.flutter.utils.FlutterModuleUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -381,14 +381,19 @@ public void projectClosing(@NotNull Project project) {
       update(project, presentation);
     }
 
+    updateComponent(project, presentation);
+  }
+
+  private void updateComponent(@NotNull Project project, @NotNull Presentation presentation) {
     final DeviceService deviceService = DeviceService.getInstance(project);
     final FlutterDevice selectedDevice = deviceService.getSelectedDevice();
     final Collection<FlutterDevice> devices = deviceService.getConnectedDevices();
 
     final String text;
-    Icon icon = DEFAULT_DEVICE_ICON;
+    Icon icon;
 
     if (devices.isEmpty()) {
+      icon = DEFAULT_DEVICE_ICON;
       final boolean isLoading = deviceService.getStatus() == DeviceService.State.LOADING;
       if (isLoading) {
         text = FlutterBundle.message("devicelist.loading");
@@ -398,6 +403,7 @@ public void projectClosing(@NotNull Project project) {
       }
     }
     else if (selectedDevice == null) {
+      icon = DEFAULT_DEVICE_ICON;
       text = FlutterBundle.message("devicelist.noDeviceSelected");
     }
     else {
@@ -412,25 +418,27 @@ else if (selectedDevice == null) {
     // Update the custom component if it exists
     final JButton customComponent = presentation.getClientProperty(CUSTOM_COMPONENT_KEY);
     if (customComponent != null) {
-      final @Nullable JBLabel iconLabel = (JBLabel)customComponent.getClientProperty(ICON_LABEL_KEY);
-      final @Nullable JBLabel textLabel = (JBLabel)customComponent.getClientProperty(TEXT_LABEL_KEY);
+      AsyncUtils.invokeLater(() -> {
+        final @Nullable JBLabel iconLabel = (JBLabel)customComponent.getClientProperty(ICON_LABEL_KEY);
+        final @Nullable JBLabel textLabel = (JBLabel)customComponent.getClientProperty(TEXT_LABEL_KEY);
 
-      if (iconLabel != null) {
-        iconLabel.setIcon(icon);
-      }
-      if (textLabel != null) {
-        textLabel.setText(text);
-        // Update the foreground color to adapt to theme changes.
-        textLabel.setForeground(getToolbarForegroundColor());
-        customComponent.invalidate();
-        Container parent = customComponent.getParent();
-        while (parent != null) {
-          parent.invalidate();
-          parent = parent.getParent();
+        if (iconLabel != null) {
+          iconLabel.setIcon(icon);
         }
-        customComponent.revalidate();
-        customComponent.repaint();
-      }
+        if (textLabel != null) {
+          textLabel.setText(text);
+          // Update the foreground color to adapt to theme changes.
+          textLabel.setForeground(getToolbarForegroundColor());
+          customComponent.invalidate();
+          Container parent = customComponent.getParent();
+          while (parent != null) {
+            parent.invalidate();
+            parent = parent.getParent();
+          }
+          customComponent.revalidate();
+          customComponent.repaint();
+        }
+      });
     }
   }
 
@@ -447,6 +455,7 @@ private void update(@NotNull Project project, @NotNull Presentation presentation
     }
     updateActions(project, presentation);
     updateVisibility(project, presentation);
+    updateComponent(project, presentation);
   }
 
   private static void updateVisibility(final Project project, final @NotNull Presentation presentation) {
@@ -531,11 +540,6 @@ private void updateActions(@NotNull Project project, @NotNull Presentation prese
     // Atomically replace the action list
     LOG.debug("[" + projectName + "] Replacing device selector actions");
     this.actions = newActions;
-
-    var tracker = ActivityTracker.getInstance();
-    if (tracker != null) {
-      tracker.inc();
-    }
   }
 
   private static class SelectDeviceAction extends AnAction {

src/io/flutter/jxbrowser/EmbeddedBrowserEngine.java

@@ -5,10 +5,11 @@
  */
 package io.flutter.jxbrowser;
 
-import com.intellij.openapi.application.ApplicationListener;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.SystemInfo;
+import io.flutter.utils.OpenApiUtils;
 import com.teamdev.jxbrowser.engine.Engine;
 import com.teamdev.jxbrowser.engine.EngineOptions;
 import com.teamdev.jxbrowser.engine.PasswordStore;
@@ -22,7 +23,7 @@
 import static com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED;
 import static com.teamdev.jxbrowser.engine.RenderingMode.OFF_SCREEN;
 
-public class EmbeddedBrowserEngine {
+public class EmbeddedBrowserEngine implements Disposable {
   private static final @NotNull Logger LOG = PluginLogger.createLogger(EmbeddedBrowserEngine.class);
   private final Engine engine;
 
@@ -60,22 +61,22 @@ public EmbeddedBrowserEngine() {
     }
     engine = temp;
 
-    ApplicationManager.getApplication().addApplicationListener(new ApplicationListener() {
-      @Override
-      public boolean canExitApplication() {
-        try {
-          if (engine != null && !engine.isClosed()) {
-            engine.close();
-          }
+  }
+
+  @Override
+  public void dispose() {
+    OpenApiUtils.safeExecuteOnPooledThread(() -> {
+      try {
+        if (engine != null && !engine.isClosed()) {
+          engine.close();
         }
-        catch (Exception ex) {
-          if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
-            LOG.info(ex);
-          } else {
-            LOG.info("Exception when closing JX Browser engine: " + ex.getMessage());
-          }
+      }
+      catch (Exception ex) {
+        if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
+          LOG.info(ex);
+        } else {
+          LOG.info("Exception when closing JX Browser engine: " + ex.getMessage());
         }
-        return true;
       }
     });
   }

src/io/flutter/jxbrowser/EmbeddedJxBrowser.java

@@ -28,6 +28,7 @@
 import io.flutter.settings.FlutterSettings;
 import io.flutter.utils.AsyncUtils;
 import io.flutter.utils.JxBrowserUtils;
+import io.flutter.utils.OpenApiUtils;
 import io.flutter.utils.ZoomLevelSelector;
 import io.flutter.view.EmbeddedBrowser;
 import io.flutter.view.EmbeddedTab;
@@ -98,7 +99,18 @@ public void loadUrl(String url) {
 
   @Override
   public void close() {
-    this.browser.close();
+    OpenApiUtils.safeExecuteOnPooledThread(() -> {
+      try {
+        this.browser.close();
+      }
+      catch (Exception ex) {
+        if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
+          LOG.info(ex);
+        } else {
+          LOG.info("Exception when closing JX Browser instance: " + ex.getMessage());
+        }
+      }
+    });
   }
 
   @Override