Merge branch 'master' into verifier_removeUnneededFreeArgs

pq · web-flow · commit 2bdfdf169b37 · 2025-07-23T09:03:12.000-07:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -166,17 +166,17 @@ intellijPlatform {
     cliPath = file("./third_party/lib/verifier-cli-1.388-all.jar")
     failureLevel = listOf(
       // TODO(team) Ideally all of the following FailureLevels should be enabled:
-      // TODO(team) Create a tracking issue for each of the following validations
-//      VerifyPluginTask.FailureLevel.COMPATIBILITY_WARNINGS,
+      // https://github.com/flutter/flutter-intellij/issues/8361
+      VerifyPluginTask.FailureLevel.COMPATIBILITY_WARNINGS,
       VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS,
 //      VerifyPluginTask.FailureLevel.DEPRECATED_API_USAGES, // https://github.com/flutter/flutter-intellij/issues/7718
 //      VerifyPluginTask.FailureLevel.SCHEDULED_FOR_REMOVAL_API_USAGES,
-//      VerifyPluginTask.FailureLevel.EXPERIMENTAL_API_USAGES,
+      VerifyPluginTask.FailureLevel.EXPERIMENTAL_API_USAGES,
 //      VerifyPluginTask.FailureLevel.INTERNAL_API_USAGES,
 //      VerifyPluginTask.FailureLevel.OVERRIDE_ONLY_API_USAGES,
       VerifyPluginTask.FailureLevel.NON_EXTENDABLE_API_USAGES,
       VerifyPluginTask.FailureLevel.PLUGIN_STRUCTURE_WARNINGS,
-//      VerifyPluginTask.FailureLevel.MISSING_DEPENDENCIES,
+      VerifyPluginTask.FailureLevel.MISSING_DEPENDENCIES,
       VerifyPluginTask.FailureLevel.INVALID_PLUGIN,
 //      VerifyPluginTask.FailureLevel.NOT_DYNAMIC,
     )
diff --git a/src/io/flutter/actions/DeviceSelectorAction.java b/src/io/flutter/actions/DeviceSelectorAction.java
@@ -45,9 +45,8 @@ public class DeviceSelectorAction extends ComboBoxAction implements DumbAware {
     return ActionUpdateThread.BGT;
   }
 
-  @NotNull
   @Override
-  protected DefaultActionGroup createPopupActionGroup(JComponent button) {
+  protected @NotNull DefaultActionGroup createPopupActionGroup(@NotNull JComponent button, @NotNull DataContext dataContext) {
     final DefaultActionGroup group = new DefaultActionGroup();
     group.addAll(actions);
     return group;
diff --git a/src/io/flutter/actions/OpenAndroidModule.java b/src/io/flutter/actions/OpenAndroidModule.java
@@ -21,7 +21,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 
-import java.awt.event.InputEvent;
+import java.awt.event.ActionEvent;
 import java.nio.file.Path;
 
 import static com.android.tools.idea.gradle.project.ProjectImportUtil.findGradleTarget;
@@ -42,8 +42,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
     }
     final int modifiers = e.getModifiers();
     // From ReopenProjectAction.
-    final boolean forceOpenInNewFrame = BitUtil.isSet(modifiers, InputEvent.CTRL_MASK)
-                                        || BitUtil.isSet(modifiers, InputEvent.SHIFT_MASK)
+    final boolean forceOpenInNewFrame = BitUtil.isSet(modifiers, ActionEvent.CTRL_MASK)
+                                        || BitUtil.isSet(modifiers, ActionEvent.SHIFT_MASK)
                                         || e.getPlace() == ActionPlaces.WELCOME_SCREEN;
 
     VirtualFile sourceFile = e.getData(CommonDataKeys.VIRTUAL_FILE);
diff --git a/src/io/flutter/run/LaunchState.java b/src/io/flutter/run/LaunchState.java
@@ -168,34 +168,20 @@ protected RunContentDescriptor launch(@NotNull ExecutionEnvironment env) throws
     // The descriptor shows the run configuration name (e.g., `main.dart`) by default;
     // adding the device name will help users identify the instance when trying to operate a specific one.
     final String nameWithDeviceName = descriptor.getDisplayName() + " (" + device.deviceName() + ")";
-    boolean displayNameUpdated = false;
+
     try {
-      // Find "myDisplayNameView" for 2024+ builds.
-      // https://github.com/JetBrains/intellij-community/blob/idea/241.14494.240/platform/execution/src/com/intellij/execution/ui/RunContentDescriptor.java#L33
+      // There is no public way to set display name so we resort to reflection.
       final Field f = descriptor.getClass().getDeclaredField("myDisplayNameView");
       f.setAccessible(true);
       Object viewInstance = f.get(descriptor);
       if (viewInstance != null) {
         final Method setValueMethod = viewInstance.getClass().getMethod("setValue", Object.class);
         setValueMethod.invoke(viewInstance, nameWithDeviceName);
-        displayNameUpdated = true;
       }
     }
     catch (IllegalAccessException | InvocationTargetException | NoSuchFieldException | NoSuchMethodException e) {
       LOG.info(e);
     }
-    if (!displayNameUpdated) {
-      try {
-        // Find "myDisplayName" for 2023 builds.
-        // https://github.com/JetBrains/intellij-community/blob/idea/231.8109.175/platform/execution/src/com/intellij/execution/ui/RunContentDescriptor.java#L30
-        final Field f = descriptor.getClass().getDeclaredField("myDisplayName");
-        f.setAccessible(true);
-        f.set(descriptor, nameWithDeviceName);
-      }
-      catch (IllegalAccessException | NoSuchFieldException e) {
-        LOG.info(e);
-      }
-    }
 
     return descriptor;
   }
diff --git a/src/io/flutter/run/bazelTest/FlutterBazelTestConfigurationEditorForm.java b/src/io/flutter/run/bazelTest/FlutterBazelTestConfigurationEditorForm.java
@@ -12,7 +12,7 @@
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.ui.ListCellRendererWrapper;
+import com.intellij.ui.SimpleListCellRenderer;
 import com.jetbrains.lang.dart.ide.runner.server.ui.DartCommandLineConfigurationEditorForm;
 import io.flutter.run.bazelTest.BazelTestFields.Scope;
 import io.flutter.settings.FlutterSettings;
@@ -62,7 +62,7 @@ public FlutterBazelTestConfigurationEditorForm(final Project project) {
       updateFields(next);
       render(next);
     });
-    scope.setRenderer(new ListCellRendererWrapper<>() {
+    scope.setRenderer(new SimpleListCellRenderer<>() {
       @Override
       public void customize(final JList list,
                             final Scope value,
diff --git a/src/io/flutter/run/test/TestForm.java b/src/io/flutter/run/test/TestForm.java
@@ -9,7 +9,7 @@
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
-import com.intellij.ui.ListCellRendererWrapper;
+import com.intellij.ui.SimpleListCellRenderer;
 import io.flutter.run.test.TestFields.Scope;
 import org.jetbrains.annotations.NotNull;
 
@@ -51,7 +51,7 @@ public class TestForm extends SettingsEditor<TestConfig> {
       updateFields(next);
       render(next);
     });
-    scope.setRenderer(new ListCellRendererWrapper<>() {
+    scope.setRenderer(new SimpleListCellRenderer<>() {
       @Override
       public void customize(final JList list,
                             final Scope value,
diff --git a/src/io/flutter/sdk/FlutterSdkUtil.java b/src/io/flutter/sdk/FlutterSdkUtil.java
@@ -78,9 +78,9 @@ private static void updateKnownPaths(@SuppressWarnings("SameParameterValue") @No
     final PropertiesComponent props = PropertiesComponent.getInstance();
 
     // Add the existing known paths.
-    final String[] oldPaths = props.getValues(propertyKey);
+    final List<String> oldPaths = props.getList(propertyKey);
     if (oldPaths != null) {
-      allPaths.addAll(Arrays.asList(oldPaths));
+      allPaths.addAll(oldPaths);
     }
 
     // Store the values back.
@@ -131,9 +131,9 @@ public static String[] getKnownFlutterSdkPaths() {
     }
 
     // use the list of paths they've entered in the past
-    final String[] knownPaths = PropertiesComponent.getInstance().getValues(FLUTTER_SDK_KNOWN_PATHS);
+    final List<String> knownPaths = PropertiesComponent.getInstance().getList(FLUTTER_SDK_KNOWN_PATHS);
     if (knownPaths != null) {
-      paths.addAll(Arrays.asList(knownPaths));
+      paths.addAll(knownPaths);
     }
 
     // search the user's path
diff --git a/src/io/flutter/toolwindow/ToolWindowBadgeUpdater.java b/src/io/flutter/toolwindow/ToolWindowBadgeUpdater.java
@@ -10,47 +10,81 @@
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
-import com.intellij.ui.BadgeIcon;
 import io.flutter.run.common.RunMode;
 import io.flutter.run.daemon.FlutterApp;
 
-import java.awt.Color;
-import java.awt.Paint;
+import javax.swing.*;
+import java.awt.*;
 import java.util.Objects;
-import javax.swing.Icon;
 
 public class ToolWindowBadgeUpdater {
-  public static final Paint BADGE_PAINT = Color.decode("#5ca963");
+  public static final Color BADGE_PAINT = Color.decode("#5ca963");
 
   /**
    * Updates the tool window icons for RUN or DEBUG mode with a green badge.
    *
-   * @param app The FlutterApp instance running in a given mode.
+   * @param app     The FlutterApp instance running in a given mode.
    * @param project The current IntelliJ project context.
    */
   public static void updateBadgedIcon(FlutterApp app, Project project) {
     final ToolWindowManager manager = ToolWindowManager.getInstance(Objects.requireNonNull(project));
     final ToolWindow runToolWindow = manager.getToolWindow(ToolWindowId.RUN);
     final ToolWindow debugToolWindow = manager.getToolWindow(ToolWindowId.DEBUG);
 
-    if(Objects.requireNonNull(app).getMode() == RunMode.RUN) {
+    if (Objects.requireNonNull(app).getMode() == RunMode.RUN) {
       if (runToolWindow != null) {
         manager.invokeLater(() -> {
           Icon baseIcon = AllIcons.Toolwindows.ToolWindowRun;
           BadgeIcon iconWithBadge = new BadgeIcon(baseIcon, BADGE_PAINT);
-
           runToolWindow.setIcon(iconWithBadge);
         });
       }
     }
-    else if(app.getMode() == RunMode.DEBUG) {
+    else if (app.getMode() == RunMode.DEBUG) {
       manager.invokeLater(() -> {
         Icon baseIcon = AllIcons.Toolwindows.ToolWindowDebugger;
         BadgeIcon iconWithBadge = new BadgeIcon(baseIcon, BADGE_PAINT);
-
         Objects.requireNonNull(debugToolWindow).setIcon(iconWithBadge);
       });
     }
+  }
+
+  private static class BadgeIcon implements Icon {
+    private final Icon baseIcon;
+    private final Color overlayColor;
+    private static final float alpha = 1.0F;
+
+    public BadgeIcon(Icon baseIcon, Color overlayColor) {
+      this.baseIcon = baseIcon;
+      this.overlayColor = overlayColor;
+    }
+
+    @Override
+    public void paintIcon(Component c, Graphics g, int x, int y) {
+      baseIcon.paintIcon(c, g, x, y);
+
+      Graphics2D g2d = (Graphics2D)g.create();
+      try {
+        g2d.translate(x, y);
+
+        g2d.setComposite(AlphaComposite.SrcOver.derive(alpha));
+
+        g2d.setColor(overlayColor);
+        g2d.fillRect(0, 0, getIconWidth(), getIconHeight());
+      }
+      finally {
+        g2d.dispose();
+      }
+    }
+
+    @Override
+    public int getIconWidth() {
+      return baseIcon.getIconWidth();
+    }
 
+    @Override
+    public int getIconHeight() {
+      return baseIcon.getIconHeight();
+    }
   }
 }
diff --git a/src/io/flutter/utils/GradleUtils.java b/src/io/flutter/utils/GradleUtils.java
@@ -213,29 +213,7 @@ private static GradleSettingsFile parseSettings(Project project) {
 
   @SuppressWarnings("rawtypes")
   private static BuildModelContext makeBuildModelContext(Project project) {
-    // return BuildModelContext.create(project);
-    Method method = ReflectionUtil.getDeclaredMethod(BuildModelContext.class, "create", Project.class);
-    if (method != null) {
-      try {
-        return (BuildModelContext)method.invoke(null, project);
-      }
-      catch (IllegalAccessException | InvocationTargetException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    // If we get here we're using the 4.1 API.
-    // return BuildModelContext.create(project, new AndroidLocationProvider());
-    Class locationProviderClass = AndroidLocationProvider.class.getInterfaces()[0];
-    // Class.forName("com.android.tools.idea.gradle.dsl.model.BuildModelContext.ResolvedConfigurationFileLocationProvider");
-    // does not work in the debugger. That's why we get it from the interfaces of AndroidLocationProvider.
-    method = ReflectionUtil.getDeclaredMethod(BuildModelContext.class, "create", Project.class, locationProviderClass);
-    assert method != null;
-    try {
-      return (BuildModelContext)method.invoke(null, project, new AndroidLocationProvider());
-    }
-    catch (IllegalAccessException | InvocationTargetException e) {
-      throw new RuntimeException(e);
-    }
+    return BuildModelContext.create(project, new AndroidLocationProvider());
   }
 
   // The project is an Android project that contains a Flutter module.
diff --git a/src/io/flutter/vmService/VmServiceWrapper.java b/src/io/flutter/vmService/VmServiceWrapper.java
@@ -600,7 +600,7 @@ private void checkDone() {
 
         @Override
         public void onError(RPCError error) {
-          LOG.error(error);
+          LOG.error(error.toString());
           LOG.error(error.getMessage());
           LOG.error(error.getRequest());
           LOG.error(error.getDetails());
diff --git a/src/io/flutter/vmService/frame/DartVmServiceValue.java b/src/io/flutter/vmService/frame/DartVmServiceValue.java
@@ -30,11 +30,12 @@
 // See https://youtrack.jetbrains.com/issue/WEB-17629.
 
 public class DartVmServiceValue extends XNamedValue {
-
-  private static final LayeredIcon FINAL_FIELD_ICON = new LayeredIcon(AllIcons.Nodes.Field, AllIcons.Nodes.FinalMark);
-  private static final LayeredIcon STATIC_FIELD_ICON = new LayeredIcon(AllIcons.Nodes.Field, AllIcons.Nodes.StaticMark);
+  private static final LayeredIcon FINAL_FIELD_ICON =
+    new LayeredIcon().layeredIcon(() -> new Icon[]{AllIcons.Nodes.Field, AllIcons.Nodes.FinalMark});
+  private static final LayeredIcon STATIC_FIELD_ICON =
+    new LayeredIcon().layeredIcon(() -> new Icon[]{AllIcons.Nodes.Field, AllIcons.Nodes.StaticMark});
   private static final LayeredIcon STATIC_FINAL_FIELD_ICON =
-    new LayeredIcon(AllIcons.Nodes.Field, AllIcons.Nodes.StaticMark, AllIcons.Nodes.FinalMark);
+    new LayeredIcon().layeredIcon(() -> new Icon[]{AllIcons.Nodes.Field, AllIcons.Nodes.StaticMark, AllIcons.Nodes.FinalMark});
   private static final String JSON_STRING_TEMPLATE =
     "'{'\"type\":\"@Instance\",\"class\":'{'\"type\":\"@Class\",\"fixedId\":\"true\",\"id\":\"classes/91\"," +
     "\"name\":\"_OneByteString\"'}',\"kind\":\"String\",\"length\":\"{0}\",\"valueAsString\":\"{1}\"'}'";
diff --git a/testSrc/unit/io/flutter/utils/RefreshableTest.java b/testSrc/unit/io/flutter/utils/RefreshableTest.java
@@ -6,6 +6,7 @@
 package io.flutter.utils;
 
 import com.google.common.collect.ImmutableList;
+import org.hamcrest.MatcherAssert;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
@@ -362,7 +363,7 @@ private synchronized List<String> getLogEntries() {
   }
 
   private void checkLog(String... expectedEntries) {
-    assertThat("logEntries entries are different", getLogEntries(), is(ImmutableList.copyOf(expectedEntries)));
+    MatcherAssert.assertThat("logEntries entries are different", getLogEntries(), is(ImmutableList.copyOf(expectedEntries)));
     logEntries.clear();
   }
 }
diff --git a/tool/triage/README.md b/tool/triage/README.md
@@ -1,10 +1,10 @@
-
 # Triage Reporting Utilities
 
-To get generate a report on untriaged issues, run:
+To generate a report on untriaged issues, run:
 
 ```
-dart bin/triage.dart
+dart bin/triage.dart <optional auth token>
 ```
 
-(Optionally pass an auth token as an argument.)
+The optional auth token allows running this job many
+times. [Instructions to generate](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token)

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@ private static void updateKnownPaths(@SuppressWarnings("SameParameterValue") @No`
`78`	`78`	`final PropertiesComponent props = PropertiesComponent.getInstance();`
`79`	`79`
`80`	`80`	`// Add the existing known paths.`
`81`		`- final String[] oldPaths = props.getValues(propertyKey);`
	`81`	`+ final List<String> oldPaths = props.getList(propertyKey);`
`82`	`82`	`if (oldPaths != null) {`
`83`		`- allPaths.addAll(Arrays.asList(oldPaths));`
	`83`	`+ allPaths.addAll(oldPaths);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// Store the values back.`
`@@ -131,9 +131,9 @@ public static String[] getKnownFlutterSdkPaths() {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`// use the list of paths they've entered in the past`
`134`		`- final String[] knownPaths = PropertiesComponent.getInstance().getValues(FLUTTER_SDK_KNOWN_PATHS);`
	`134`	`+ final List<String> knownPaths = PropertiesComponent.getInstance().getList(FLUTTER_SDK_KNOWN_PATHS);`
`135`	`135`	`if (knownPaths != null) {`
`136`		`- paths.addAll(Arrays.asList(knownPaths));`
	`136`	`+ paths.addAll(knownPaths);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`// search the user's path`