Skip to content

Commit 44e0418

Browse files
authored
[CQ] remove dead Icon creation, outline service code (#8226)
🧹 ✨ Some more dead code cleanup, removing: * Inspector-orphaned icons, bounding box and custom icon support * now dead fake active editor outline service and opportunistically a handful of * unused fields and methods --- - [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>
1 parent be3b047 commit 44e0418

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+9
-567
lines changed

flutter-idea/src/icons/FlutterIcons.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,27 @@ private static Icon load(String path) {
99
return IconLoader.getIcon(path, FlutterIcons.class);
1010
}
1111

12-
public static final Icon FlutterDefault = load("/icons/expui/flutter.svg");
1312
public static final Icon DevToolsDeepLinks = load("/icons/expui/deepLinks.svg");
1413
public static final Icon DevTools = load("/icons/expui/devTools.svg");
1514
public static final Icon DevToolsExtensions = load("/icons/expui/extensions.svg");
1615
public static final Icon DevToolsInspector = load("icons/expui/inspector.svg");
1716
public static final Icon PropertyEditor = load("/icons/expui/propertyEditor.svg");
18-
19-
public static final Icon Flutter_13_2x = load("/icons/[email protected]");
20-
public static final Icon Flutter_64 = load("/icons/flutter_64.png");
21-
public static final Icon Flutter_64_2x = load("/icons/[email protected]");
2217
public static final Icon Flutter = load("/icons/flutter.png");
2318
public static final Icon Flutter_2x = load("/icons/[email protected]");
24-
public static final Icon Flutter_inspect = load("/icons/flutter_inspect.png");
2519
public static final Icon Flutter_test = load("/icons/flutter_test.png");
26-
public static final Icon Flutter_badge = load("/icons/flutter_badge.png");
27-
2820
public static final Icon Phone = load("/icons/phone.png");
29-
public static final Icon Feedback = load("/icons/feedback.png");
3021
public static final Icon RefreshItems = load("/icons/refresh_items.png");
3122

3223
public static final Icon Dart_16 = load("/icons/dart_16.svg");
3324

3425
public static final Icon HotReload = load("/icons/hot-reload.png");
3526
public static final Icon HotRestart = load("/icons/hot-restart.png");
36-
37-
public static final Icon HotReloadRun = load("/icons/reload_run.png");
38-
public static final Icon HotReloadDebug = load("/icons/reload_debug.png");
39-
40-
public static final Icon DebugBanner = load("/icons/debugBanner.png");
41-
public static final Icon DebugPaint = load("/icons/debugPaint.png");
42-
public static final Icon RepaintRainbow = load("/icons/repaintRainbow.png");
43-
4427
public static final Icon BazelRun = load("/icons/bazel_run.png");
4528

4629
public static final Icon CustomClass = load("/icons/custom/class.png");
4730
public static final Icon CustomClassAbstract = load("/icons/custom/class_abstract.png");
48-
public static final Icon CustomFields = load("/icons/custom/fields.png");
49-
public static final Icon CustomInterface = load("/icons/custom/interface.png");
5031
public static final Icon CustomMethod = load("/icons/custom/method.png");
5132
public static final Icon CustomMethodAbstract = load("/icons/custom/method_abstract.png");
52-
public static final Icon CustomProperty = load("/icons/custom/property.png");
5333
public static final Icon CustomInfo = load("/icons/custom/info.png");
54-
55-
public static final Icon AndroidStudioNewProject = load("/icons/template_new_project.png");
56-
public static final Icon AndroidStudioNewPackage = load("/icons/template_new_package.png");
57-
public static final Icon AndroidStudioNewPlugin = load("/icons/template_new_plugin.png");
58-
public static final Icon AndroidStudioNewModule = load("/icons/template_new_module.png");
59-
6034
public static final Icon AttachDebugger = load("/icons/attachDebugger.png");
6135
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,11 @@ private static void excludeAndroidFrameworkDetector(@NotNull Project project) {
115115
}
116116

117117
private static class PackagesOutOfDateNotification extends Notification {
118-
@NotNull private final Project myProject;
119-
@NotNull private final PubRoot myRoot;
120-
121118
public PackagesOutOfDateNotification(@NotNull Project project, @NotNull PubRoot root) {
122119
super("Flutter Packages", "The pubspec.yaml file has been modified since " +
123120
"the last time 'flutter pub get' was run.", NotificationType.INFORMATION);
124121
setIcon(FlutterIcons.Flutter);
125122

126-
myProject = project;
127-
myRoot = root;
128-
129123
//noinspection DialogTitleCapitalization
130124
addAction(new AnAction("Run 'flutter pub get'") {
131125
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class FlutterRequestUtilities {
2828
private static final String OFFSET = "offset";
2929
private static final String SUBSCRIPTIONS = "subscriptions";
3030

31-
private static final String METHOD_FLUTTER_GET_CHANGE_ADD_FOR_DESIGN_TIME_CONSTRUCTOR = "flutter.getChangeAddForDesignTimeConstructor";
3231
private static final String METHOD_FLUTTER_SET_SUBSCRIPTIONS = "flutter.setSubscriptions";
3332
private static final String METHOD_FLUTTER_GET_WIDGET_DESCRIPTION = "flutter.getWidgetDescription";
3433
private static final String METHOD_FLUTTER_SET_WIDGET_PROPERTY_VALUE = "flutter.setWidgetPropertyValue";

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
*/
66
package io.flutter.editor;
77

8-
import com.intellij.openapi.extensions.ExtensionPointName;
98
import com.intellij.openapi.ui.popup.Balloon;
109
import org.jetbrains.annotations.Nullable;
1110

1211
import javax.swing.*;
1312
import java.awt.*;
1413

1514
public interface ColorPickerProvider {
16-
ExtensionPointName<ColorPickerProvider> EP_NAME = ExtensionPointName.create("io.flutter.colorPickerProvider");
17-
1815
interface ColorListener {
1916
void colorChanged(@Nullable Color var1, Object var2);
2017
}

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

Lines changed: 0 additions & 48 deletions
This file was deleted.

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.google.gson.JsonElement;
1010
import com.google.gson.JsonNull;
1111
import com.google.gson.JsonObject;
12-
import com.intellij.openapi.diagnostic.Logger;
1312
import com.intellij.openapi.util.text.StringUtil;
1413
import io.flutter.run.daemon.FlutterApp;
1514
import io.flutter.utils.CustomIconMaker;
@@ -45,8 +44,6 @@
4544
* also available via the getValue() method.
4645
*/
4746
public class DiagnosticsNode {
48-
private static final @NotNull Logger LOG = Logger.getInstance(DiagnosticsNode.class);
49-
5047
private static final CustomIconMaker iconMaker = new CustomIconMaker();
5148

5249
private DiagnosticsNode parent;
@@ -141,18 +138,7 @@ public boolean getShowSeparator() {
141138
public String getDescription() {
142139
return getStringMember("description");
143140
}
144-
145-
/**
146-
* Returns a transformed rect that describes the bounding box for an element
147-
* <p>
148-
*/
149-
public TransformedRect getTransformToRoot() {
150-
if (!json.has("transformToRoot")) {
151-
return null;
152-
}
153-
return new TransformedRect(json.getAsJsonObject("transformToRoot"));
154-
}
155-
141+
156142
/**
157143
* Priority level of the diagnostic used to control which diagnostics should
158144
* be shown and filtered.

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
* That is, a directory containing (at a minimum) a pubspec.yaml file.
3232
*/
3333
public class PubRoot {
34-
public static final String ANALYSIS_OPTIONS_YAML = "analysis_options.yaml";
3534
public static final String DOT_DART_TOOL = ".dart_tool";
3635
public static final String DOT_PACKAGES = ".packages";
3736
public static final String PUBSPEC_YAML = "pubspec.yaml";
@@ -447,7 +446,7 @@ public Module getModule(@NotNull Project project) {
447446
}
448447
return ProjectRootManager.getInstance(project).getFileIndex().getModuleForFile(pubspec);
449448
}
450-
449+
451450
@Override
452451
public String toString() {
453452
return "PubRoot(" + root.getName() + ")";

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
package io.flutter.run;
77

88
import com.google.common.collect.ImmutableMap;
9-
import com.intellij.codeInsight.hint.HintManager;
10-
import com.intellij.codeInsight.hint.HintManagerImpl;
11-
import com.intellij.codeInsight.hint.HintUtil;
129
import com.intellij.concurrency.JobScheduler;
1310
import com.intellij.execution.ExecutionException;
1411
import com.intellij.execution.configurations.GeneralCommandLine;
@@ -45,7 +42,6 @@
4542
import com.intellij.psi.PsiErrorElement;
4643
import com.intellij.psi.PsiFile;
4744
import com.intellij.psi.util.PsiTreeUtil;
48-
import com.intellij.ui.LightweightHint;
4945
import com.intellij.util.messages.MessageBusConnection;
5046
import com.intellij.util.ui.UIUtil;
5147
import com.jetbrains.lang.dart.ide.errorTreeView.DartProblemsView;
@@ -68,13 +64,11 @@
6864
import org.jetbrains.annotations.NotNull;
6965
import org.jetbrains.annotations.Nullable;
7066

71-
import javax.swing.*;
7267
import java.nio.charset.StandardCharsets;
7368
import java.util.HashMap;
7469
import java.util.List;
7570
import java.util.Map;
7671
import java.util.concurrent.TimeUnit;
77-
import java.util.concurrent.atomic.AtomicReference;
7872

7973
/**
8074
* Handle the mechanics of performing a hot reload on file save.
@@ -497,22 +491,4 @@ private boolean hasErrorsInFile(@NotNull Document document) {
497491
});
498492
return firstError != null;
499493
}
500-
501-
private LightweightHint showEditorHint(@NotNull Editor editor, String message, boolean isError) {
502-
final AtomicReference<LightweightHint> ref = new AtomicReference<>();
503-
504-
OpenApiUtils.safeInvokeAndWait(() -> {
505-
final JComponent component = isError
506-
? HintUtil.createErrorLabel(message)
507-
: HintUtil.createInformationLabel(message);
508-
final LightweightHint hint = new LightweightHint(component);
509-
ref.set(hint);
510-
HintManagerImpl.getInstanceImpl().showEditorHint(
511-
hint, editor, HintManager.UNDER,
512-
HintManager.HIDE_BY_ANY_KEY | HintManager.HIDE_BY_TEXT_CHANGE | HintManager.HIDE_BY_SCROLLING | HintManager.HIDE_BY_OTHER_HINT,
513-
isError ? 0 : 3000, false);
514-
});
515-
516-
return ref.get();
517-
}
518494
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class FlutterSettings {
2222
private static final String verboseLoggingKey = "io.flutter.verboseLogging";
2323
private static final String formatCodeOnSaveKey = "io.flutter.formatCodeOnSave";
2424
private static final String organizeImportsOnSaveKey = "io.flutter.organizeImportsOnSave";
25-
private static final String showOnlyWidgetsKey = "io.flutter.showOnlyWidgets";
2625
private static final String syncAndroidLibrariesKey = "io.flutter.syncAndroidLibraries";
2726
private static final String showStructuredErrorsKey = "io.flutter.showStructuredErrors";
2827
private static final String includeAllStackTracesKey = "io.flutter.includeAllStackTraces";

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ public CustomIconMaker() {
2828

2929
}
3030

31-
public Icon getCustomIcon(String fromText) {
32-
return getCustomIcon(fromText, IconKind.kClass, false);
33-
}
34-
3531
public Icon getCustomIcon(String fromText, IconKind kind) {
3632
return getCustomIcon(fromText, kind, false);
3733
}
@@ -46,7 +42,7 @@ public Icon getCustomIcon(String fromText, IconKind kind, boolean isAbstract) {
4642

4743
if (!iconCache.containsKey(mapKey)) {
4844
final Icon baseIcon = isAbstract ? kind.abstractIcon : kind.icon;
49-
45+
5046
final Icon icon = LayeredIcon.layeredIcon(() -> new Icon[]{baseIcon, new Icon() {
5147
public void paintIcon(Component c, Graphics g, int x, int y) {
5248
final Graphics2D g2 = (Graphics2D)g.create();
@@ -104,24 +100,9 @@ public Icon fromWidgetName(String name) {
104100
return getCustomIcon(name, isPrivate ? CustomIconMaker.IconKind.kMethod : CustomIconMaker.IconKind.kClass);
105101
}
106102

107-
public Icon fromInfo(String name) {
108-
if (name == null) {
109-
return null;
110-
}
111-
112-
if (name.isEmpty()) {
113-
return null;
114-
}
115-
116-
return getCustomIcon(name, CustomIconMaker.IconKind.kInfo);
117-
}
118-
119103
public enum IconKind {
120104
kClass("class", FlutterIcons.CustomClass, FlutterIcons.CustomClassAbstract),
121-
kField("fields", FlutterIcons.CustomFields),
122-
kInterface("interface", FlutterIcons.CustomInterface),
123105
kMethod("method", FlutterIcons.CustomMethod, FlutterIcons.CustomMethodAbstract),
124-
kProperty("property", FlutterIcons.CustomProperty),
125106
kInfo("info", FlutterIcons.CustomInfo);
126107

127108
public final String name;

0 commit comments

Comments
 (0)