Fix various performance and cleanup issues (#6944)

jwren · web-flow · commit 2f11f2431644 · 2023-10-19T16:45:18.000-07:00
Java syntax changes include: - inclusion of @NotNull - making downcasts explict - use of amend instead of the string `+` operator
diff --git a/flutter-idea/src/io/flutter/actions/FlutterAppAction.java b/flutter-idea/src/io/flutter/actions/FlutterAppAction.java
@@ -47,7 +47,7 @@ public FlutterAppAction(@NotNull FlutterApp app,
   }
 
   @Override
-  public ActionUpdateThread getActionUpdateThread() {
+  public @NotNull ActionUpdateThread getActionUpdateThread() {
     return ActionUpdateThread.BGT;
   }
 
diff --git a/flutter-idea/src/io/flutter/analytics/FlutterAnalysisServerListener.java b/flutter-idea/src/io/flutter/analytics/FlutterAnalysisServerListener.java
@@ -277,7 +277,7 @@ private HashMap<String, Integer> getTotalAnalysisErrorCounts() {
       // errorCountsArray[*]
       for (int i = 0; i < ERROR_TYPES.length; i++) {
         final int j = i;
-        errorCountsArray[j] += errors.stream().filter(e -> {
+        errorCountsArray[j] += (int) errors.stream().filter(e -> {
           assert e != null;
           return Objects.equals(e.getType(), ERROR_TYPES[j]);
         }).count();
diff --git a/flutter-idea/src/io/flutter/console/FlutterConsoleFilter.java b/flutter-idea/src/io/flutter/console/FlutterConsoleFilter.java
@@ -49,7 +49,7 @@ private static class OpenExternalFileHyperlink implements HyperlinkInfo {
     }
 
     @Override
-    public void navigate(Project project) {
+    public void navigate(@NotNull Project project) {
       try {
         final GeneralCommandLine cmd = new GeneralCommandLine().withExePath("open").withParameters(myPath);
         final ColoredProcessHandler handler = new ColoredProcessHandler(cmd);
@@ -257,7 +257,7 @@ private static Result getFlutterDoctorResult(final String line, final int lineSt
 
   private static class FlutterDoctorHyperlinkInfo implements HyperlinkInfo {
     @Override
-    public void navigate(final Project project) {
+    public void navigate(final @NotNull Project project) {
       // TODO(skybrian) analytics for clicking the link? (We do log the command.)
       final FlutterSdk sdk = FlutterSdk.getFlutterSdk(project);
       if (sdk == null) {
diff --git a/flutter-idea/src/io/flutter/editor/FlutterColorProvider.java b/flutter-idea/src/io/flutter/editor/FlutterColorProvider.java
@@ -86,7 +86,7 @@ else if (parent.getNode().getElementType() == DartTokenTypes.SIMPLE_TYPE) {
         }
         final PsiElement reference = resolveReferencedElement(refExpr);
         if (reference != null && reference.getLastChild() != null) {
-          Color tryParseColor = null;
+          Color tryParseColor;
           if (reference instanceof DartCallExpression) {
             final DartExpression expression = ((DartCallExpression)reference).getExpression();
             if (expression != null && expression.getLastChild() instanceof DartReferenceExpression) {
diff --git a/flutter-idea/src/io/flutter/editor/PreviewViewControllerBase.java b/flutter-idea/src/io/flutter/editor/PreviewViewControllerBase.java
@@ -656,7 +656,7 @@ public void paint(@NotNull Graphics g, int lineHeight) {
       }
       g2d.setColor(JBColor.BLACK);
 
-      drawMultilineString(g2d, getNoScreenshotMessage(), screenshotBounds.x + 4, screenshotBounds.y + +lineHeight - 4, lineHeight);
+      drawMultilineString(g2d, getNoScreenshotMessage(), screenshotBounds.x + 4, screenshotBounds.y + lineHeight - 4, lineHeight);
     }
     g2d.setClip(clip);
 
diff --git a/flutter-idea/src/io/flutter/editor/PropertyEditorPanel.java b/flutter-idea/src/io/flutter/editor/PropertyEditorPanel.java
@@ -98,7 +98,6 @@ public PropertyEnumComboBoxModel(FlutterWidgetProperty property) {
     String expression = property.getExpression();
     if (expression == null) {
       mySelected = null;
-      expression = "";
       return;
     }
     if (property.getValue() != null) {
@@ -489,7 +488,7 @@ protected void rebuildUi() {
         continue;
       }
       final String documentation = property.getDocumentation();
-      JComponent field = null;
+      JComponent field;
 
       if (property.getEditor() == null) {
         // TODO(jacobr): detect color properties more robustly.
diff --git a/flutter-idea/src/io/flutter/inspector/InspectorService.java b/flutter-idea/src/io/flutter/inspector/InspectorService.java
@@ -440,8 +440,8 @@ private void onVmServiceReceived(String streamId, Event event) {
           if (path == null) return;
 
           VirtualFile file = LocalFileSystem.getInstance().findFileByPath(path);
-          final Integer line = JsonUtils.getIntMember(json, "line");
-          final Integer column = JsonUtils.getIntMember(json, "column");;
+          final int line = JsonUtils.getIntMember(json, "line");
+          final int column = JsonUtils.getIntMember(json, "column");;
 
           ApplicationManager.getApplication().invokeLater(() -> {
             if (file != null && line >= 0 && column >= 0) {
diff --git a/flutter-idea/src/io/flutter/inspector/TreeScrollAnimator.java b/flutter-idea/src/io/flutter/inspector/TreeScrollAnimator.java
@@ -402,6 +402,7 @@ public void animateTo(List<TreePath> targets) {
       for (TreePath target : targets) {
         if (this.targets.contains(target)) {
           newTarget = false;
+          break;
         }
       }
     }
diff --git a/flutter-idea/src/io/flutter/test/DartTestEventsConverterZ.java b/flutter-idea/src/io/flutter/test/DartTestEventsConverterZ.java
@@ -112,7 +112,7 @@ public DartTestEventsConverterZ(@NotNull final String testFrameworkName,
   }
 
   @Override
-  protected boolean processServiceMessages(final String text, final Key outputType, final ServiceMessageVisitor visitor)
+  protected boolean processServiceMessages(final String text, final @NotNull Key outputType, final @NotNull ServiceMessageVisitor visitor)
     throws ParseException {
     LOG.debug("<<< " + text.trim());
     myCurrentOutputType = outputType;
diff --git a/flutter-idea/src/io/flutter/vmService/DartVmServiceDebugProcess.java b/flutter-idea/src/io/flutter/vmService/DartVmServiceDebugProcess.java
@@ -280,7 +280,7 @@ public XDebuggerEditorsProvider getEditorsProvider() {
 
   @Override
   @NotNull
-  public XBreakpointHandler<?>[] getBreakpointHandlers() {
+  public XBreakpointHandler<?> @NotNull [] getBreakpointHandlers() {
     return myBreakpointHandlers;
   }
 
diff --git a/flutter-idea/src/io/flutter/vmService/FlutterFramesMonitor.java b/flutter-idea/src/io/flutter/vmService/FlutterFramesMonitor.java
@@ -99,7 +99,7 @@ public boolean hasFps() {
    */
   public double getFPS() {
     int frameCount = 0;
-    int costCount = 0;
+    long costCount = 0;
 
     synchronized (this) {
       for (FlutterFrameEvent frame : frames) {
diff --git a/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterOutline.java b/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterOutline.java
@@ -336,29 +336,29 @@ public String toString() {
     final StringBuilder builder = new StringBuilder();
     builder.append("[");
     builder.append("kind=");
-    builder.append(kind + ", ");
+    builder.append(kind).append(", ");
     builder.append("offset=");
-    builder.append(offset + ", ");
+    builder.append(offset).append(", ");
     builder.append("length=");
-    builder.append(length + ", ");
+    builder.append(length).append(", ");
     builder.append("codeOffset=");
-    builder.append(codeOffset + ", ");
+    builder.append(codeOffset).append(", ");
     builder.append("codeLength=");
-    builder.append(codeLength + ", ");
+    builder.append(codeLength).append(", ");
     builder.append("label=");
-    builder.append(label + ", ");
+    builder.append(label).append(", ");
     builder.append("dartElement=");
-    builder.append(dartElement + ", ");
+    builder.append(dartElement).append(", ");
     if (attributes != null) {
       builder.append("attributes=");
-      builder.append(join(attributes, ", ") + ", ");
+      builder.append(join(attributes, ", ")).append(", ");
     }
     builder.append("className=");
-    builder.append(className + ", ");
+    builder.append(className).append(", ");
     builder.append("parentAssociationLabel=");
-    builder.append(parentAssociationLabel + ", ");
+    builder.append(parentAssociationLabel).append(", ");
     builder.append("variableName=");
-    builder.append(variableName + ", ");
+    builder.append(variableName).append(", ");
     if (children != null) {
       builder.append("children=");
       builder.append(join(children, ", "));
diff --git a/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterOutlineAttribute.java b/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterOutlineAttribute.java
@@ -231,17 +231,17 @@ public String toString() {
     StringBuilder builder = new StringBuilder();
     builder.append("[");
     builder.append("name=");
-    builder.append(name + ", ");
+    builder.append(name).append(", ");
     builder.append("label=");
-    builder.append(label + ", ");
+    builder.append(label).append(", ");
     builder.append("literalValueBoolean=");
-    builder.append(literalValueBoolean + ", ");
+    builder.append(literalValueBoolean).append(", ");
     builder.append("literalValueInteger=");
-    builder.append(literalValueInteger + ", ");
+    builder.append(literalValueInteger).append(", ");
     builder.append("literalValueString=");
-    builder.append(literalValueString + ", ");
+    builder.append(literalValueString).append(", ");
     builder.append("nameLocation=");
-    builder.append(nameLocation + ", ");
+    builder.append(nameLocation).append(", ");
     builder.append("valueLocation=");
     builder.append(valueLocation);
     builder.append("]");
diff --git a/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetProperty.java b/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetProperty.java
@@ -273,21 +273,21 @@ public String toString() {
     StringBuilder builder = new StringBuilder();
     builder.append("[");
     builder.append("documentation=");
-    builder.append(documentation + ", ");
+    builder.append(documentation).append(", ");
     builder.append("expression=");
-    builder.append(expression + ", ");
+    builder.append(expression).append(", ");
     builder.append("id=");
-    builder.append(id + ", ");
+    builder.append(id).append(", ");
     builder.append("isRequired=");
-    builder.append(isRequired + ", ");
+    builder.append(isRequired).append(", ");
     builder.append("isSafeToUpdate=");
-    builder.append(isSafeToUpdate + ", ");
+    builder.append(isSafeToUpdate).append(", ");
     builder.append("name=");
-    builder.append(name + ", ");
+    builder.append(name).append(", ");
     builder.append("children=");
-    builder.append(join(children, ", ") + ", ");
+    builder.append(join(children, ", ")).append(", ");
     builder.append("editor=");
-    builder.append(editor + ", ");
+    builder.append(editor).append(", ");
     builder.append("value=");
     builder.append(value);
     builder.append("]");
diff --git a/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetPropertyEditor.java b/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetPropertyEditor.java
@@ -110,7 +110,7 @@ public String toString() {
     StringBuilder builder = new StringBuilder();
     builder.append("[");
     builder.append("kind=");
-    builder.append(kind + ", ");
+    builder.append(kind).append(", ");
     builder.append("enumItems=");
     builder.append(join(enumItems, ", "));
     builder.append("]");
diff --git a/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetPropertyValue.java b/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetPropertyValue.java
@@ -170,15 +170,15 @@ public String toString() {
     StringBuilder builder = new StringBuilder();
     builder.append("[");
     builder.append("boolValue=");
-    builder.append(boolValue + ", ");
+    builder.append(boolValue).append(", ");
     builder.append("doubleValue=");
-    builder.append(doubleValue + ", ");
+    builder.append(doubleValue).append(", ");
     builder.append("intValue=");
-    builder.append(intValue + ", ");
+    builder.append(intValue).append(", ");
     builder.append("stringValue=");
-    builder.append(stringValue + ", ");
+    builder.append(stringValue).append(", ");
     builder.append("enumValue=");
-    builder.append(enumValue + ", ");
+    builder.append(enumValue).append(", ");
     builder.append("expression=");
     builder.append(expression);
     builder.append("]");
diff --git a/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetPropertyValueEnumItem.java b/flutter-idea/src/org/dartlang/analysis/server/protocol/FlutterWidgetPropertyValueEnumItem.java
@@ -152,11 +152,11 @@ public String toString() {
     StringBuilder builder = new StringBuilder();
     builder.append("[");
     builder.append("libraryUri=");
-    builder.append(libraryUri + ", ");
+    builder.append(libraryUri).append(", ");
     builder.append("className=");
-    builder.append(className + ", ");
+    builder.append(className).append(", ");
     builder.append("name=");
-    builder.append(name + ", ");
+    builder.append(name).append(", ");
     builder.append("documentation=");
     builder.append(documentation);
     builder.append("]");
diff --git a/flutter-idea/testSrc/unit/io/flutter/logging/FlutterConsoleLogManagerTest.java b/flutter-idea/testSrc/unit/io/flutter/logging/FlutterConsoleLogManagerTest.java
@@ -204,7 +204,7 @@ public void scrollTo(int i) {
   }
 
   @Override
-  public void attachToProcess(ProcessHandler handler) {
+  public void attachToProcess(@NotNull ProcessHandler handler) {
 
   }
 
@@ -255,7 +255,7 @@ public boolean canPause() {
 
   @NotNull
   @Override
-  public AnAction[] createConsoleActions() {
+  public AnAction @NotNull [] createConsoleActions() {
     return new AnAction[0];
   }
 
diff --git a/flutter-idea/testSrc/unit/io/flutter/testing/AdaptedFixture.java b/flutter-idea/testSrc/unit/io/flutter/testing/AdaptedFixture.java
@@ -6,6 +6,7 @@
 package io.flutter.testing;
 
 import com.intellij.testFramework.fixtures.IdeaTestFixture;
+import org.jetbrains.annotations.NotNull;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
@@ -30,7 +31,7 @@ public T getInner() {
   }
 
   @Override
-  public Statement apply(Statement base, Description description) {
+  public Statement apply(@NotNull Statement base, @NotNull Description description) {
     return new Statement() {
       public void evaluate() throws Throwable {
         inner = factory.create(description.getClassName());

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public FlutterAppAction(@NotNull FlutterApp app,`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
`50`		`- public ActionUpdateThread getActionUpdateThread() {`
	`50`	`+ public @NotNull ActionUpdateThread getActionUpdateThread() {`
`51`	`51`	`return ActionUpdateThread.BGT;`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ else if (parent.getNode().getElementType() == DartTokenTypes.SIMPLE_TYPE) {`
`86`	`86`	`}`
`87`	`87`	`final PsiElement reference = resolveReferencedElement(refExpr);`
`88`	`88`	`if (reference != null && reference.getLastChild() != null) {`
`89`		`- Color tryParseColor = null;`
	`89`	`+ Color tryParseColor;`
`90`	`90`	`if (reference instanceof DartCallExpression) {`
`91`	`91`	`final DartExpression expression = ((DartCallExpression)reference).getExpression();`
`92`	`92`	`if (expression != null && expression.getLastChild() instanceof DartReferenceExpression) {`
Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ public void paint(@NotNull Graphics g, int lineHeight) {`
`656`	`656`	`}`
`657`	`657`	`g2d.setColor(JBColor.BLACK);`
`658`	`658`
`659`		`- drawMultilineString(g2d, getNoScreenshotMessage(), screenshotBounds.x + 4, screenshotBounds.y + +lineHeight - 4, lineHeight);`
	`659`	`+ drawMultilineString(g2d, getNoScreenshotMessage(), screenshotBounds.x + 4, screenshotBounds.y + lineHeight - 4, lineHeight);`
`660`	`660`	`}`
`661`	`661`	`g2d.setClip(clip);`
`662`	`662`
Original file line number	Diff line number	Diff line change
`@@ -402,6 +402,7 @@ public void animateTo(List<TreePath> targets) {`
`402`	`402`	`for (TreePath target : targets) {`
`403`	`403`	`if (this.targets.contains(target)) {`
`404`	`404`	`newTarget = false;`
	`405`	`+ break;`
`405`	`406`	`}`
`406`	`407`	`}`
`407`	`408`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public DartTestEventsConverterZ(@NotNull final String testFrameworkName,`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@Override`
`115`		`- protected boolean processServiceMessages(final String text, final Key outputType, final ServiceMessageVisitor visitor)`
	`115`	`+ protected boolean processServiceMessages(final String text, final @NotNull Key outputType, final @NotNull ServiceMessageVisitor visitor)`
`116`	`116`	`throws ParseException {`
`117`	`117`	`LOG.debug("<<< " + text.trim());`
`118`	`118`	`myCurrentOutputType = outputType;`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ public XDebuggerEditorsProvider getEditorsProvider() {`
`280`	`280`
`281`	`281`	`@Override`
`282`	`282`	`@NotNull`
`283`		`- public XBreakpointHandler<?>[] getBreakpointHandlers() {`
	`283`	`+ public XBreakpointHandler<?> @NotNull [] getBreakpointHandlers() {`
`284`	`284`	`return myBreakpointHandlers;`
`285`	`285`	`}`
`286`	`286`