Migrate Java syntax and APIs for new features in Java (#7513)

This includes fixes from the IntelliJ inspections for Java language
level migrations, switch statements, lambdas, etc.

Author: jwren

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

@@ -46,7 +46,6 @@
 import io.flutter.run.daemon.DeviceService;
 import io.flutter.sdk.FlutterPluginsLibraryManager;
 import io.flutter.sdk.FlutterSdk;
-import io.flutter.sdk.FlutterSdkVersion;
 import io.flutter.settings.FlutterSettings;
 import io.flutter.survey.FlutterSurveyNotifications;
 import io.flutter.utils.FlutterModuleUtils;

flutter-idea/src/io/flutter/actions/DeviceSelectorAction.java

@@ -181,8 +181,7 @@ private void updateActions(@NotNull Project project, Presentation presentation)
     if (SystemInfo.isMac) {
       boolean simulatorOpen = false;
       for (AnAction action : actions) {
-        if (action instanceof SelectDeviceAction) {
-          final SelectDeviceAction deviceAction = (SelectDeviceAction)action;
+        if (action instanceof SelectDeviceAction deviceAction) {
           final FlutterDevice device = deviceAction.device;
           if (device.isIOS() && device.emulator()) {
             simulatorOpen = true;

flutter-idea/src/io/flutter/actions/OpenInAndroidStudioAction.java

@@ -116,8 +116,7 @@ private static Editor getCurrentEditor(@NotNull Project project, @Nullable Virtu
       return null;
     }
     final FileEditor fileEditor = fileEditorManager.getSelectedEditor(file);
-    if (fileEditor instanceof TextEditor) {
-      final TextEditor textEditor = (TextEditor)fileEditor;
+    if (fileEditor instanceof TextEditor textEditor) {
       final Editor editor = textEditor.getEditor();
       if (!editor.isDisposed()) {
         return editor;

flutter-idea/src/io/flutter/analytics/FlutterAnalysisServerListener.java

@@ -527,12 +527,11 @@ private void logFileAnalysisTime(@NotNull String kind, String path, long analysi
    */
   void onPropertyChange(@NotNull PropertyChangeEvent propertyChangeEvent) {
     Object newValue = propertyChangeEvent.getNewValue();
-    if (!(newValue instanceof LookupImpl)) {
+    if (!(newValue instanceof LookupImpl lookup)) {
       return;
     }
 
     setLookupSelectionHandler();
-    LookupImpl lookup = (LookupImpl)newValue;
     lookup.addLookupListener(lookupSelectionHandler);
   }
 

flutter-idea/src/io/flutter/analytics/UnifiedAnalytics.java

@@ -15,7 +15,6 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.lang.dart.ide.toolingDaemon.DartToolingDaemonConsumer;
 import com.jetbrains.lang.dart.ide.toolingDaemon.DartToolingDaemonService;
 import de.roderick.weberknecht.WebSocketException;
 import io.flutter.sdk.FlutterSdkUtil;
@@ -75,16 +74,13 @@ private CompletableFuture<JsonObject> makeUnifiedAnalyticsRequest(String request
                                                                     @NotNull JsonObject params) {
     CompletableFuture<JsonObject> finalResult = new CompletableFuture<>();
     try {
-      service.sendRequest("UnifiedAnalytics." + requestName, params, false, new DartToolingDaemonConsumer() {
-        @Override
-        public void received(@NotNull JsonObject object) {
-          JsonObject result = object.getAsJsonObject("result");
-          if (result == null) {
-            finalResult.completeExceptionally(new Exception(requestName + " JSON result is malformed: " + object));
-            return;
-          }
-          finalResult.complete(result);
+      service.sendRequest("UnifiedAnalytics." + requestName, params, false, object -> {
+        JsonObject result = object.getAsJsonObject("result");
+        if (result == null) {
+          finalResult.completeExceptionally(new Exception(requestName + " JSON result is malformed: " + object));
+          return;
         }
+        finalResult.complete(result);
       });
     }
     catch (WebSocketException e) {

flutter-idea/src/io/flutter/bazel/PluginConfig.java

@@ -95,8 +95,7 @@ String getUpdatedIosRunMessage() {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof PluginConfig)) return false;
-    final PluginConfig other = (PluginConfig)obj;
+    if (!(obj instanceof PluginConfig other)) return false;
     return Objects.equal(fields, other.fields);
   }
 
@@ -277,8 +276,7 @@ private static class Fields {
 
     @Override
     public boolean equals(Object obj) {
-      if (!(obj instanceof Fields)) return false;
-      final Fields other = (Fields)obj;
+      if (!(obj instanceof Fields other)) return false;
       return Objects.equal(daemonScript, other.daemonScript)
              && Objects.equal(devToolsScript, other.devToolsScript)
              && Objects.equal(doctorScript, other.doctorScript)

flutter-idea/src/io/flutter/bazel/Workspace.java

@@ -247,8 +247,7 @@ public Set<String> getDependencies() {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof Workspace)) return false;
-    final Workspace other = (Workspace)obj;
+    if (!(obj instanceof Workspace other)) return false;
     return Objects.equal(root, other.root) && Objects.equal(config, other.config);
   }
 

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

@@ -28,7 +28,7 @@ public class DartSyntax {
    */
   @Nullable
   public static DartCallExpression findEnclosingFunctionCall(@NotNull PsiElement elt, @NotNull String functionName) {
-    return findEnclosingFunctionCall(elt, functionName, new Equator<String, String>() {
+    return findEnclosingFunctionCall(elt, functionName, new Equator<>() {
       @Override
       boolean equate(@NotNull String first, @NotNull String second) {
         return Objects.equals(first, second);
@@ -43,7 +43,7 @@ boolean equate(@NotNull String first, @NotNull String second) {
    */
   @Nullable
   public static DartCallExpression findEnclosingFunctionCall(@NotNull PsiElement elt, @NotNull Pattern functionRegex) {
-    return findEnclosingFunctionCall(elt, functionRegex, new Equator<Pattern, String>() {
+    return findEnclosingFunctionCall(elt, functionRegex, new Equator<>() {
       @Override
       boolean equate(@NotNull Pattern first, @NotNull String second) {
         return first.matcher(second).matches();
@@ -54,8 +54,7 @@ boolean equate(@NotNull Pattern first, @NotNull String second) {
   private static <T> DartCallExpression findEnclosingFunctionCall(
     @NotNull PsiElement elt, @NotNull T functionDescriptor, @NotNull Equator<T, String> equator) {
     while (elt != null) {
-      if (elt instanceof DartCallExpression) {
-        final DartCallExpression call = (DartCallExpression)elt;
+      if (elt instanceof DartCallExpression call) {
         final String name = getCalledFunctionName(call);
         if (name != null && equator.equate(functionDescriptor, name)) {
           return call;
@@ -72,8 +71,7 @@ private static <T> DartCallExpression findEnclosingFunctionCall(
   @Nullable
   public static DartCallExpression findClosestEnclosingFunctionCall(@Nullable PsiElement element) {
     while (element != null) {
-      if (element instanceof DartCallExpression) {
-        final DartCallExpression call = (DartCallExpression)element;
+      if (element instanceof DartCallExpression call) {
         final String name = getCalledFunctionName(call);
         if (name != null) {
           return call;
@@ -181,8 +179,7 @@ public static String unquote(@NotNull DartStringLiteralExpression lit) {
     if (lit.getFirstChild() == null) return null;
     final PsiElement second = lit.getFirstChild().getNextSibling();
     if (second.getNextSibling() != lit.getLastChild()) return null; // not three items
-    if (!(second instanceof LeafPsiElement)) return null;
-    final LeafPsiElement leaf = (LeafPsiElement)second;
+    if (!(second instanceof LeafPsiElement leaf)) return null;
 
     if (leaf.getElementType() != DartTokenTypes.REGULAR_STRING_PART) return null;
     return leaf.getText();

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

@@ -84,17 +84,15 @@ else if (object instanceof Number) {
     else if (object instanceof String) {
       return new JsonPrimitive((String)object);
     }
-    else if (object instanceof List<?>) {
-      final List<?> list = (List<?>)object;
+    else if (object instanceof List<?> list) {
       final JsonArray jsonArray = new JsonArray();
       for (Object item : list) {
         final JsonElement jsonItem = buildJsonElement(item);
         jsonArray.add(jsonItem);
       }
       return jsonArray;
     }
-    else if (object instanceof Map<?, ?>) {
-      final Map<?, ?> map = (Map<?, ?>)object;
+    else if (object instanceof Map<?, ?> map) {
       final JsonObject jsonObject = new JsonObject();
       for (Map.Entry<?, ?> entry : map.entrySet()) {
         final Object key = entry.getKey();

flutter-idea/src/io/flutter/deeplinks/DeepLinksViewFactory.java

@@ -66,9 +66,7 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         ApplicationManager.getApplication().invokeLater(() -> {
           Optional.ofNullable(
               FlutterUtils.embeddedBrowser(project))
-            .ifPresent(embeddedBrowser -> embeddedBrowser.openPanel(toolWindow, "Deep Links", devToolsUrl, (String err) -> {
-              System.out.println(err);
-            }));
+            .ifPresent(embeddedBrowser -> embeddedBrowser.openPanel(toolWindow, "Deep Links", devToolsUrl, System.out::println));
         });
       }
     );

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

@@ -93,8 +93,7 @@ public List<EditorEx> getActiveDartEditors() {
     final FileEditor[] editors = fileEditorManager.getSelectedEditors();
     final List<EditorEx> dartEditors = new ArrayList<>();
     for (FileEditor fileEditor : editors) {
-      if (!(fileEditor instanceof TextEditor)) continue;
-      final TextEditor textEditor = (TextEditor)fileEditor;
+      if (!(fileEditor instanceof TextEditor textEditor)) continue;
       final Editor editor = textEditor.getEditor();
       if (editor instanceof EditorEx && !editor.isDisposed() && FlutterUtils.isDartFile(((EditorEx)editor).getVirtualFile())) {
         dartEditors.add((EditorEx)editor);

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

@@ -31,7 +31,7 @@ public EditorEventServiceBase(Project project) {
   }
 
   protected void invokeAll(InvokeListener<L> invoke, Editor editor) {
-    if (!(editor instanceof EditorEx)) {
+    if (!(editor instanceof EditorEx editorEx)) {
       return;
     }
     final ArrayList<EditorEx> disposedEditors = new ArrayList<>();
@@ -43,7 +43,6 @@ protected void invokeAll(InvokeListener<L> invoke, Editor editor) {
     for (EditorEx e : disposedEditors) {
       listeners.removeAll(e);
     }
-    final EditorEx editorEx = (EditorEx)editor;
     final Set<L> matches = listeners.get(editorEx);
     if (matches == null || matches.isEmpty()) return;
     for (L listener : matches) {

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

@@ -451,8 +451,7 @@ public void visitVarAccessDeclaration(@NotNull DartVarAccessDeclaration o) {
         String className = null;
         DartArguments arguments = null;
         DartType type = null;
-        if (expression instanceof DartNewExpression) {
-          final DartNewExpression newExpr = (DartNewExpression)expression;
+        if (expression instanceof DartNewExpression newExpr) {
           type = newExpr.getType();
           if (type != null) {
             className = type.getText();

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

@@ -191,8 +191,7 @@ public int hashCode() {
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
-    if (!(o instanceof OutlineLocation)) return false;
-    final OutlineLocation other = (OutlineLocation)o;
+    if (!(o instanceof OutlineLocation other)) return false;
     return line == other.line &&
            column == other.column &&
            indent == other.indent &&

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

@@ -136,8 +136,7 @@ public EnumValueWrapper getSelectedItem() {
 
   @Override
   public void setSelectedItem(Object item) {
-    if (item instanceof String) {
-      final String expression = (String)item;
+    if (item instanceof String expression) {
       for (EnumValueWrapper e : myList) {
         if (Objects.equals(e.expression, expression)) {
           mySelected = e;
@@ -551,12 +550,7 @@ protected void rebuildUi() {
       }
 
       if (name.equals("data")) {
-        if (documentation != null) {
-          field.setToolTipText(documentation);
-        }
-        else {
-          field.setToolTipText("data");
-        }
+        field.setToolTipText(Objects.requireNonNullElse(documentation, "data"));
         add(field, "span, growx");
       }
       else {

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

@@ -56,8 +56,7 @@ public int hashCode() {
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
-    if (!(o instanceof WidgetIndentHitTester)) return false;
-    final WidgetIndentHitTester other = (WidgetIndentHitTester)o;
+    if (!(o instanceof WidgetIndentHitTester other)) return false;
     return Arrays.equals(lines, other.lines);
   }
 

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

@@ -527,8 +527,7 @@ public static int compare(@NotNull TextRangeDescriptorPair r, @NotNull RangeHigh
       return answer;
     }
     final CustomHighlighterRenderer renderer = h.getCustomRenderer();
-    if (renderer instanceof WidgetCustomHighlighterRenderer) {
-      final WidgetCustomHighlighterRenderer widgetRenderer = (WidgetCustomHighlighterRenderer)renderer;
+    if (renderer instanceof WidgetCustomHighlighterRenderer widgetRenderer) {
       return widgetRenderer.descriptor.compareTo(r.descriptor);
     }
     return -1;
@@ -550,9 +549,7 @@ public static void onCaretPositionChanged(EditorEx editor, Caret caret) {
     final WidgetIndentsPassData data = getIndentsPassData(editor);
     if (data == null || data.highlighters == null) return;
     for (RangeHighlighter h : data.highlighters) {
-      if (h.getCustomRenderer() instanceof WidgetIndentsHighlightingPass.WidgetCustomHighlighterRenderer) {
-        final WidgetIndentsHighlightingPass.WidgetCustomHighlighterRenderer renderer =
-          (WidgetIndentsHighlightingPass.WidgetCustomHighlighterRenderer)h.getCustomRenderer();
+      if (h.getCustomRenderer() instanceof WidgetCustomHighlighterRenderer renderer) {
         final boolean changed = renderer.updateSelected(editor, h, caret);
         if (changed) {
           editor.repaint(h.getStartOffset(), h.getEndOffset());

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

@@ -94,8 +94,7 @@ public void caretPositionChanged(@NotNull CaretEvent event) {
         final Editor editor = event.getEditor();
         if (editor.getProject() != project) return;
         if (editor.isDisposed() || project.isDisposed()) return;
-        if (!(editor instanceof EditorEx)) return;
-        final EditorEx editorEx = (EditorEx)editor;
+        if (!(editor instanceof EditorEx editorEx)) return;
         WidgetIndentsHighlightingPass.onCaretPositionChanged(editorEx, event.getCaret());
       }
     }, this);
@@ -233,8 +232,7 @@ public TextEditorHighlightingPass createHighlightingPass(@NotNull PsiFile file,
       FilteredIndentsHighlightingPass.cleanupHighlighters(e);
     }
 
-    if (!(e instanceof EditorEx)) return highlightingPass;
-    final EditorEx editor = (EditorEx)e;
+    if (!(e instanceof EditorEx editor)) return highlightingPass;
 
     final VirtualFile virtualFile = editor.getVirtualFile();
     if (!FlutterUtils.couldContainWidgets(virtualFile)) {

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

@@ -88,8 +88,7 @@ public DiagnosticsNode(JsonObject json,
 
   @Override
   public boolean equals(Object other) {
-    if (other instanceof DiagnosticsNode) {
-      final DiagnosticsNode otherNode = (DiagnosticsNode)other;
+    if (other instanceof DiagnosticsNode otherNode) {
       return getDartDiagnosticRef().equals(otherNode.getDartDiagnosticRef());
     }
     return false;

flutter-idea/src/io/flutter/inspector/InspectorInstanceRef.java

@@ -23,8 +23,7 @@ public InspectorInstanceRef(String id) {
 
   @Override
   public boolean equals(Object other) {
-    if (other instanceof InspectorInstanceRef) {
-      final InspectorInstanceRef otherRef = (InspectorInstanceRef)other;
+    if (other instanceof InspectorInstanceRef otherRef) {
       return Objects.equals(id, otherRef.id);
     }
     return false;

flutter-idea/src/io/flutter/inspector/InspectorService.java

@@ -139,8 +139,7 @@ public static InspectorService.Location outlineToLocation(Project project,
           PsiElement match = null;
           if (callExpression != null) {
             final DartExpression expression = callExpression.getExpression();
-            if (expression instanceof DartReferenceExpression) {
-              final DartReferenceExpression referenceExpression = (DartReferenceExpression)expression;
+            if (expression instanceof DartReferenceExpression referenceExpression) {
               final PsiElement[] children = referenceExpression.getChildren();
               if (children.length > 1) {
                 // This case handles expressions like 'ClassName.namedConstructor'
@@ -171,8 +170,7 @@ public static InspectorService.Location outlineToLocation(Project project,
      */
     @Nullable
     public static InspectorService.Location outlineToLocation(Editor editor, FlutterOutline outline) {
-      if (!(editor instanceof EditorEx)) return null;
-      final EditorEx editorEx = (EditorEx)editor;
+      if (!(editor instanceof EditorEx editorEx)) return null;
       return outlineToLocation(editor.getProject(), editorEx.getVirtualFile(), outline, editor.getDocument());
     }
   }
@@ -652,13 +650,10 @@ public CompletableFuture<XSourcePosition> getPropertyLocationHelper(ClassRef cla
     public CompletableFuture<DiagnosticsNode> getRoot(FlutterTreeType type) {
       // There is no excuse to call this method on a disposed group.
       assert (!disposed);
-      switch (type) {
-        case widget:
-          return getRootWidget();
-        case renderObject:
-          return getRootRenderObject();
-      }
-      throw new RuntimeException("Unexpected FlutterTreeType");
+      return switch (type) {
+        case widget -> getRootWidget();
+        case renderObject -> getRootRenderObject();
+      };
     }
 
     /**
@@ -1297,14 +1292,11 @@ public CompletableFuture<DiagnosticsNode> getSelection(DiagnosticsNode previousS
         CompletableFuture<DiagnosticsNode> result = null;
         final InspectorInstanceRef previousSelectionRef = previousSelection != null ? previousSelection.getDartDiagnosticRef() : null;
 
-        switch (treeType) {
-          case widget:
-            result = invokeServiceMethodReturningNode(localOnly ? "getSelectedSummaryWidget" : "getSelectedWidget", previousSelectionRef);
-            break;
-          case renderObject:
-            result = invokeServiceMethodReturningNode("getSelectedRenderObject", previousSelectionRef);
-            break;
-        }
+        result = switch (treeType) {
+          case widget ->
+            invokeServiceMethodReturningNode(localOnly ? "getSelectedSummaryWidget" : "getSelectedWidget", previousSelectionRef);
+          case renderObject -> invokeServiceMethodReturningNode("getSelectedRenderObject", previousSelectionRef);
+        };
         return result.thenApplyAsync((DiagnosticsNode newSelection) -> nullValueIfDisposed(() -> {
           if (newSelection != null && newSelection.getDartDiagnosticRef().equals(previousSelectionRef)) {
             return previousSelection;

flutter-idea/src/io/flutter/inspector/TreeScrollAnimator.java

@@ -323,10 +323,9 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-      if (!(o instanceof Interval)) {
+      if (!(o instanceof Interval interval)) {
         return false;
       }
-      final Interval interval = (Interval)o;
       return interval.start == start && interval.length == length;
     }
   }