Revert "[CQ] remove dead Icon creation, outline service code" (#8229)

This reverts commit a82aa73.

This previous commit may have borked devtools toolwindows; reverting for
now to investigate...

Sorry for the noise!


---

- [x] I’ve reviewed the contributor guide and applied the relevant
portions to this PR.

<details>
  <summary>Contribution guidelines:</summary><br>

- See our [contributor
guide]([https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview)
for general expectations for PRs.
- Larger or significant changes should be discussed in an issue before
creating a PR.
- Dart contributions to our repos should follow the [Dart style
guide](https://dart.dev/guides/language/effective-dart) and use `dart
format`.
- Java and Kotlin contributions should strive to follow Java and Kotlin
best practices
([discussion](#8098)).
</details>

Author: pq

flutter-idea/src/icons/FlutterIcons.java

@@ -9,27 +9,53 @@ private static Icon load(String path) {
     return IconLoader.getIcon(path, FlutterIcons.class);
   }
 
+  public static final Icon FlutterDefault = load("/icons/expui/flutter.svg");
   public static final Icon DevToolsDeepLinks = load("/icons/expui/deepLinks.svg");
   public static final Icon DevTools = load("/icons/expui/devTools.svg");
   public static final Icon DevToolsExtensions = load("/icons/expui/extensions.svg");
   public static final Icon DevToolsInspector = load("icons/expui/inspector.svg");
   public static final Icon PropertyEditor = load("/icons/expui/propertyEditor.svg");
+
+  public static final Icon Flutter_13_2x = load("/icons/[email protected]");
+  public static final Icon Flutter_64 = load("/icons/flutter_64.png");
+  public static final Icon Flutter_64_2x = load("/icons/[email protected]");
   public static final Icon Flutter = load("/icons/flutter.png");
   public static final Icon Flutter_2x = load("/icons/[email protected]");
+  public static final Icon Flutter_inspect = load("/icons/flutter_inspect.png");
   public static final Icon Flutter_test = load("/icons/flutter_test.png");
+  public static final Icon Flutter_badge = load("/icons/flutter_badge.png");
+
   public static final Icon Phone = load("/icons/phone.png");
+  public static final Icon Feedback = load("/icons/feedback.png");
   public static final Icon RefreshItems = load("/icons/refresh_items.png");
 
   public static final Icon Dart_16 = load("/icons/dart_16.svg");
 
   public static final Icon HotReload = load("/icons/hot-reload.png");
   public static final Icon HotRestart = load("/icons/hot-restart.png");
+
+  public static final Icon HotReloadRun = load("/icons/reload_run.png");
+  public static final Icon HotReloadDebug = load("/icons/reload_debug.png");
+
+  public static final Icon DebugBanner = load("/icons/debugBanner.png");
+  public static final Icon DebugPaint = load("/icons/debugPaint.png");
+  public static final Icon RepaintRainbow = load("/icons/repaintRainbow.png");
+
   public static final Icon BazelRun = load("/icons/bazel_run.png");
 
   public static final Icon CustomClass = load("/icons/custom/class.png");
   public static final Icon CustomClassAbstract = load("/icons/custom/class_abstract.png");
+  public static final Icon CustomFields = load("/icons/custom/fields.png");
+  public static final Icon CustomInterface = load("/icons/custom/interface.png");
   public static final Icon CustomMethod = load("/icons/custom/method.png");
   public static final Icon CustomMethodAbstract = load("/icons/custom/method_abstract.png");
+  public static final Icon CustomProperty = load("/icons/custom/property.png");
   public static final Icon CustomInfo = load("/icons/custom/info.png");
+
+  public static final Icon AndroidStudioNewProject = load("/icons/template_new_project.png");
+  public static final Icon AndroidStudioNewPackage = load("/icons/template_new_package.png");
+  public static final Icon AndroidStudioNewPlugin = load("/icons/template_new_plugin.png");
+  public static final Icon AndroidStudioNewModule = load("/icons/template_new_module.png");
+
   public static final Icon AttachDebugger = load("/icons/attachDebugger.png");
 }

flutter-idea/src/io/flutter/ProjectOpenActivity.java

@@ -115,11 +115,17 @@ private static void excludeAndroidFrameworkDetector(@NotNull Project project) {
   }
 
   private static class PackagesOutOfDateNotification extends Notification {
+    @NotNull private final Project myProject;
+    @NotNull private final PubRoot myRoot;
+
     public PackagesOutOfDateNotification(@NotNull Project project, @NotNull PubRoot root) {
       super("Flutter Packages", "The pubspec.yaml file has been modified since " +
                                 "the last time 'flutter pub get' was run.", NotificationType.INFORMATION);
       setIcon(FlutterIcons.Flutter);
 
+      myProject = project;
+      myRoot = root;
+
       //noinspection DialogTitleCapitalization
       addAction(new AnAction("Run 'flutter pub get'") {
         @Override

flutter-idea/src/io/flutter/dart/FlutterRequestUtilities.java

@@ -28,6 +28,7 @@ public class FlutterRequestUtilities {
   private static final String OFFSET = "offset";
   private static final String SUBSCRIPTIONS = "subscriptions";
 
+  private static final String METHOD_FLUTTER_GET_CHANGE_ADD_FOR_DESIGN_TIME_CONSTRUCTOR = "flutter.getChangeAddForDesignTimeConstructor";
   private static final String METHOD_FLUTTER_SET_SUBSCRIPTIONS = "flutter.setSubscriptions";
   private static final String METHOD_FLUTTER_GET_WIDGET_DESCRIPTION = "flutter.getWidgetDescription";
   private static final String METHOD_FLUTTER_SET_WIDGET_PROPERTY_VALUE = "flutter.setWidgetPropertyValue";

flutter-idea/src/io/flutter/editor/ColorPickerProvider.java

@@ -5,13 +5,16 @@
  */
 package io.flutter.editor;
 
+import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.ui.popup.Balloon;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 
 public interface ColorPickerProvider {
+  ExtensionPointName<ColorPickerProvider> EP_NAME = ExtensionPointName.create("io.flutter.colorPickerProvider");
+
   interface ColorListener {
     void colorChanged(@Nullable Color var1, Object var2);
   }

flutter-idea/src/io/flutter/editor/FlutterIconRenderer.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+package io.flutter.editor;
+
+import com.intellij.openapi.editor.markup.GutterIconRenderer;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import java.util.Objects;
+
+public class FlutterIconRenderer extends GutterIconRenderer implements DumbAware {
+  private final Icon myIcon;
+  private final String myId;
+
+  public FlutterIconRenderer(Icon icon, PsiElement element) {
+    myIcon = icon;
+    myId = element.getText();
+  }
+
+  public String getTooltipText() {
+    return myId;
+  }
+
+  @NotNull
+  @Override
+  public Icon getIcon() {
+    return myIcon;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    final FlutterIconRenderer renderer = (FlutterIconRenderer)o;
+    return Objects.equals(myId, renderer.myId);
+  }
+
+  @Override
+  public int hashCode() {
+    return myId.hashCode();
+  }
+}

flutter-idea/src/io/flutter/logging/DiagnosticsNode.java

@@ -9,6 +9,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.text.StringUtil;
 import io.flutter.run.daemon.FlutterApp;
 import io.flutter.utils.CustomIconMaker;
@@ -44,6 +45,8 @@
  * also available via the getValue() method.
  */
 public class DiagnosticsNode {
+  private static final @NotNull Logger LOG = Logger.getInstance(DiagnosticsNode.class);
+
   private static final CustomIconMaker iconMaker = new CustomIconMaker();
 
   private DiagnosticsNode parent;
@@ -138,7 +141,18 @@ public boolean getShowSeparator() {
   public String getDescription() {
     return getStringMember("description");
   }
-  
+
+  /**
+   * Returns a transformed rect that describes the bounding box for an element
+   * <p>
+   */
+  public TransformedRect getTransformToRoot() {
+    if (!json.has("transformToRoot")) {
+      return null;
+    }
+    return new TransformedRect(json.getAsJsonObject("transformToRoot"));
+  }
+
   /**
    * Priority level of the diagnostic used to control which diagnostics should
    * be shown and filtered.

flutter-idea/src/io/flutter/logging/TransformedRect.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+package io.flutter.logging;
+
+import com.google.gson.JsonObject;
+
+import java.awt.geom.Rectangle2D;
+
+public class TransformedRect {
+  final JsonObject json;
+
+  public TransformedRect(JsonObject json) {
+    this.json = json;
+  }
+
+  public Rectangle2D getRectangle() {
+    return new Rectangle2D.Double(
+      json.getAsJsonPrimitive("left").getAsDouble(),
+      json.getAsJsonPrimitive("top").getAsDouble(),
+      json.getAsJsonPrimitive("width").getAsDouble(),
+      json.getAsJsonPrimitive("height").getAsDouble()
+    );
+  }
+}

flutter-idea/src/io/flutter/pub/PubRoot.java

@@ -31,6 +31,7 @@
  * That is, a directory containing (at a minimum) a pubspec.yaml file.
  */
 public class PubRoot {
+  public static final String ANALYSIS_OPTIONS_YAML = "analysis_options.yaml";
   public static final String DOT_DART_TOOL = ".dart_tool";
   public static final String DOT_PACKAGES = ".packages";
   public static final String PUBSPEC_YAML = "pubspec.yaml";
@@ -446,7 +447,7 @@ public Module getModule(@NotNull Project project) {
     }
     return ProjectRootManager.getInstance(project).getFileIndex().getModuleForFile(pubspec);
   }
-
+  
   @Override
   public String toString() {
     return "PubRoot(" + root.getName() + ")";

flutter-idea/src/io/flutter/run/FlutterReloadManager.java

@@ -6,6 +6,9 @@
 package io.flutter.run;
 
 import com.google.common.collect.ImmutableMap;
+import com.intellij.codeInsight.hint.HintManager;
+import com.intellij.codeInsight.hint.HintManagerImpl;
+import com.intellij.codeInsight.hint.HintUtil;
 import com.intellij.concurrency.JobScheduler;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
@@ -42,6 +45,7 @@
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.ui.LightweightHint;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
 import com.jetbrains.lang.dart.ide.errorTreeView.DartProblemsView;
@@ -64,11 +68,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Handle the mechanics of performing a hot reload on file save.
@@ -491,4 +497,22 @@ private boolean hasErrorsInFile(@NotNull Document document) {
     });
     return firstError != null;
   }
+
+  private LightweightHint showEditorHint(@NotNull Editor editor, String message, boolean isError) {
+    final AtomicReference<LightweightHint> ref = new AtomicReference<>();
+
+    OpenApiUtils.safeInvokeAndWait(() -> {
+      final JComponent component = isError
+                                   ? HintUtil.createErrorLabel(message)
+                                   : HintUtil.createInformationLabel(message);
+      final LightweightHint hint = new LightweightHint(component);
+      ref.set(hint);
+      HintManagerImpl.getInstanceImpl().showEditorHint(
+        hint, editor, HintManager.UNDER,
+        HintManager.HIDE_BY_ANY_KEY | HintManager.HIDE_BY_TEXT_CHANGE | HintManager.HIDE_BY_SCROLLING | HintManager.HIDE_BY_OTHER_HINT,
+        isError ? 0 : 3000, false);
+    });
+
+    return ref.get();
+  }
 }

flutter-idea/src/io/flutter/settings/FlutterSettings.java

@@ -22,6 +22,7 @@ public class FlutterSettings {
   private static final String verboseLoggingKey = "io.flutter.verboseLogging";
   private static final String formatCodeOnSaveKey = "io.flutter.formatCodeOnSave";
   private static final String organizeImportsOnSaveKey = "io.flutter.organizeImportsOnSave";
+  private static final String showOnlyWidgetsKey = "io.flutter.showOnlyWidgets";
   private static final String syncAndroidLibrariesKey = "io.flutter.syncAndroidLibraries";
   private static final String showStructuredErrorsKey = "io.flutter.showStructuredErrors";
   private static final String includeAllStackTracesKey = "io.flutter.includeAllStackTraces";

flutter-idea/src/io/flutter/utils/ColorIconMaker.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2017 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+package io.flutter.utils;
+
+import com.intellij.ui.JBColor;
+import com.intellij.util.ui.GraphicsUtil;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ColorIconMaker {
+  private final Map<Color, Icon> iconCache = new HashMap<>();
+  private static final int iconMargin = 3;
+
+  public Icon getCustomIcon(Color color) {
+    if (!iconCache.containsKey(color)) {
+      final Icon icon = new Icon() {
+        public void paintIcon(Component c, Graphics g, int x, int y) {
+          final Graphics2D g2 = (Graphics2D)g.create();
+
+          try {
+            GraphicsUtil.setupAAPainting(g2);
+            // draw a black and gray grid to use as the background to disambiguate
+            // opaque colors from translucent colors.
+            g2.setColor(JBColor.white);
+            g2.fillRect(x + iconMargin, y + iconMargin, getIconWidth() - iconMargin * 2, getIconHeight() - iconMargin * 2);
+            g2.setColor(JBColor.gray);
+            g2.fillRect(x + iconMargin, y + iconMargin, getIconWidth() / 2 - iconMargin, getIconHeight() / 2 - iconMargin);
+            g2.fillRect(x + getIconWidth() / 2, y + getIconHeight() / 2, getIconWidth() / 2 - iconMargin, getIconHeight() / 2 - iconMargin);
+            g2.setColor(color);
+            g2.fillRect(x + iconMargin, y + iconMargin, getIconWidth() - iconMargin * 2, getIconHeight() - iconMargin * 2);
+            g2.setColor(JBColor.black);
+            g2.drawRect(x + iconMargin, y + iconMargin, getIconWidth() - iconMargin * 2, getIconHeight() - iconMargin * 2);
+          }
+          finally {
+            g2.dispose();
+          }
+        }
+
+        public int getIconWidth() {
+          return 22; // TODO(jacob): customize the icon height based on the font size.
+        }
+
+        public int getIconHeight() {
+          return 22; // TODO(jacob): customize the icon height based on the font size.
+        }
+      };
+
+      iconCache.put(color, icon);
+    }
+
+    return iconCache.get(color);
+  }
+}

flutter-idea/src/io/flutter/utils/CustomIconMaker.java

@@ -28,6 +28,10 @@ public CustomIconMaker() {
 
   }
 
+  public Icon getCustomIcon(String fromText) {
+    return getCustomIcon(fromText, IconKind.kClass, false);
+  }
+
   public Icon getCustomIcon(String fromText, IconKind kind) {
     return getCustomIcon(fromText, kind, false);
   }
@@ -42,7 +46,7 @@ public Icon getCustomIcon(String fromText, IconKind kind, boolean isAbstract) {
 
     if (!iconCache.containsKey(mapKey)) {
       final Icon baseIcon = isAbstract ? kind.abstractIcon : kind.icon;
-
+      
       final Icon icon = LayeredIcon.layeredIcon(() -> new Icon[]{baseIcon, new Icon() {
         public void paintIcon(Component c, Graphics g, int x, int y) {
           final Graphics2D g2 = (Graphics2D)g.create();
@@ -100,9 +104,24 @@ public Icon fromWidgetName(String name) {
     return getCustomIcon(name, isPrivate ? CustomIconMaker.IconKind.kMethod : CustomIconMaker.IconKind.kClass);
   }
 
+  public Icon fromInfo(String name) {
+    if (name == null) {
+      return null;
+    }
+
+    if (name.isEmpty()) {
+      return null;
+    }
+
+    return getCustomIcon(name, CustomIconMaker.IconKind.kInfo);
+  }
+
   public enum IconKind {
     kClass("class", FlutterIcons.CustomClass, FlutterIcons.CustomClassAbstract),
+    kField("fields", FlutterIcons.CustomFields),
+    kInterface("interface", FlutterIcons.CustomInterface),
     kMethod("method", FlutterIcons.CustomMethod, FlutterIcons.CustomMethodAbstract),
+    kProperty("property", FlutterIcons.CustomProperty),
     kInfo("info", FlutterIcons.CustomInfo);
 
     public final String name;