From 97fe832818f1334d627aaf37b2de198ba750e4c1 Mon Sep 17 00:00:00 2001 From: Jaime Wren Date: Tue, 29 Jul 2025 19:18:36 -0700 Subject: [PATCH] [cq] Migrate code to Inspection-recommended Java 21 APIs --- .../jetbrains/lang/dart/assists/AssistUtils.java | 4 ++-- .../jetbrains/lang/dart/fixes/DartQuickFix.java | 6 +++--- .../dart/ide/actions/DartInheritorsSearcher.java | 4 ++-- .../ide/actions/DartServerGotoSuperHandler.java | 2 +- .../lang/dart/ide/actions/DartStyleAction.java | 4 ++-- .../lang/dart/ide/documentation/DartDocUtil.java | 2 +- .../documentation/DartDocumentationProvider.java | 2 +- .../errorTreeView/DartProblemsTableModel.java | 2 +- .../ide/errorTreeView/DartProblemsViewPanel.java | 4 ++-- .../lang/dart/ide/formatter/DartBlock.java | 2 +- .../method/DartMethodHierarchyTreeStructure.java | 2 +- ...DartServerSubtypesHierarchyTreeStructure.java | 2 +- ...rtServerSupertypesHierarchyTreeStructure.java | 2 +- .../DartServerTypeHierarchyTreeStructure.java | 4 ++-- .../lang/dart/ide/index/DartLibraryIndex.java | 4 ++-- .../marker/DartServerOverrideMarkerProvider.java | 2 +- .../dart/ide/refactoring/DartInlineHandler.java | 2 +- .../DartServerExtractLocalVariableHandler.java | 2 +- .../refactoring/status/RefactoringStatus.java | 2 +- .../ide/runner/server/DartConsoleFolding.java | 16 ++++++++-------- .../server/OpenDartObservatoryUrlAction.java | 2 +- .../server/vmService/VmServiceWrapper.java | 4 ++-- .../test/DartTestRunConfigurationProducer.java | 2 +- .../runner/util/DartTestLocationProvider.java | 6 +++--- .../lang/dart/ide/runner/util/TestUtil.java | 2 +- .../DartWithTryCatchFinallySurrounder.java | 2 +- .../statement/DartWithTryCatchSurrounder.java | 2 +- .../template/macro/DartFilterByClassMacro.java | 2 +- .../lang/dart/psi/impl/AbstractDartPsiClass.java | 2 +- .../lang/dart/psi/impl/DartFileReference.java | 2 +- .../lang/dart/psi/impl/DartReferenceImpl.java | 2 +- .../com/jetbrains/lang/dart/sdk/DartSdkUtil.java | 8 ++++---- .../lang/dart/util/DartPsiImplUtil.java | 2 +- .../lang/dart/util/DartResolveUtil.java | 4 ++-- 34 files changed, 56 insertions(+), 56 deletions(-) diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java b/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java index abe70dcd9..33477b939 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java @@ -179,7 +179,7 @@ public static List applySourceEdits(final @NotNull Project proje } } if (map.isEmpty() && !fileEdits.isEmpty()) { - String filePathOrUri = fileEdits.get(0).getFile(); + String filePathOrUri = fileEdits.getFirst().getFile(); throw new DartSourceEditException(DartBundle.message("error.none.of.the.files.were.in.this.project.content.0", filePathOrUri)); } return map; @@ -189,7 +189,7 @@ public static List applySourceEdits(final @NotNull Project proje for (LinkedEditGroup group : sourceChange.getLinkedEditGroups()) { final List positions = group.getPositions(); if (!positions.isEmpty()) { - Position position = positions.get(0); + Position position = positions.getFirst(); String filePathOrUri = position.getFile(); DartFileInfo fileInfo = DartFileInfoKt.getDartFileInfo(project, filePathOrUri); VirtualFile virtualFile = fileInfo.findFile(); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/fixes/DartQuickFix.java b/third_party/src/main/java/com/jetbrains/lang/dart/fixes/DartQuickFix.java index 8bbc915b9..9f2f78a39 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/fixes/DartQuickFix.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/fixes/DartQuickFix.java @@ -94,7 +94,7 @@ public static void doInvoke(@NotNull Project project, @NotNull PsiFile file, @NotNull SourceChange sourceChange, @Nullable DartQuickFix dartQuickFix) { - SourceFileEdit fileEdit = sourceChange.getEdits().get(0); + SourceFileEdit fileEdit = sourceChange.getEdits().getFirst(); String filePathOrUri = fileEdit.getFile(); DartFileInfo fileInfo = DartFileInfoKt.getDartFileInfo(project, filePathOrUri); if (!(fileInfo instanceof DartLocalFileInfo localFileInfo)) return; @@ -191,7 +191,7 @@ public static boolean isPreviewAvailable(@NotNull PsiFile target, @Nullable Sour return false; } - String filePathOrUri = sourceChange.getEdits().get(0).getFile(); + String filePathOrUri = sourceChange.getEdits().getFirst().getFile(); DartFileInfo fileInfo = DartFileInfoKt.getDartFileInfo(target.getProject(), filePathOrUri); VirtualFile vFile = target.getOriginalFile().getVirtualFile(); @@ -205,7 +205,7 @@ public static void doInvokeForPreview(@NotNull PsiFile psiFile, @NotNull SourceC // #isPreviewAvailable() has checked that sourceChange.getEdits().get(0) modifies _this_ PsiFile, not some other Document document = psiFile.getViewProvider().getDocument(); - for (SourceEdit edit : sourceChange.getEdits().get(0).getEdits()) { + for (SourceEdit edit : sourceChange.getEdits().getFirst().getEdits()) { String replacement = StringUtil.convertLineSeparators(edit.getReplacement()); int startOffset = edit.getOffset(); int endOffset = edit.getOffset() + edit.getLength(); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartInheritorsSearcher.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartInheritorsSearcher.java index 06cfd2d8d..d2271aacf 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartInheritorsSearcher.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartInheritorsSearcher.java @@ -124,7 +124,7 @@ private static void prepare(final @NotNull DefinitionsScopedSearch.SearchParamet if (hierarchyItems.isEmpty()) return Collections.emptySet(); final Set result = new HashSet<>(hierarchyItems.size()); - addSubClasses(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.get(0), false); + addSubClasses(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.getFirst(), false); return result; } @@ -134,7 +134,7 @@ private static void prepare(final @NotNull DefinitionsScopedSearch.SearchParamet if (hierarchyItems.isEmpty()) return Collections.emptySet(); final Set result = new HashSet<>(hierarchyItems.size()); - addSubMembers(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.get(0), false); + addSubMembers(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.getFirst(), false); return result; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartServerGotoSuperHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartServerGotoSuperHandler.java index 30673c366..00fcf7bb5 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartServerGotoSuperHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartServerGotoSuperHandler.java @@ -45,7 +45,7 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps // build list of DartComponent(s) final List supers = new ArrayList<>(); if (!items.isEmpty()) { - TypeHierarchyItem seed = items.get(0); + TypeHierarchyItem seed = items.getFirst(); { final Integer superIndex = seed.getSuperclass(); if (superIndex != null) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartStyleAction.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartStyleAction.java index d0d298907..bb14ec65f 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartStyleAction.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartStyleAction.java @@ -112,7 +112,7 @@ private static TextRange reformatRange(final @Nullable Editor editor, } final String inputText = document.getText(); - final String formattedText = StringUtil.convertLineSeparators(edits.get(0).getReplacement()); + final String formattedText = StringUtil.convertLineSeparators(edits.getFirst().getReplacement()); if (!wholeFile && countNonSpaceChars(inputText) != countNonSpaceChars(formattedText)) { LOG.error("dartfmt changed non-space characters for file " + file.getPath()); return inputRange; @@ -189,7 +189,7 @@ public static void runDartfmt(final @NotNull Project project, final @NotNull Lis final DartAnalysisServerService.FormatResult formatResult = DartAnalysisServerService.getInstance(project).edit_format(virtualFile, 0, 0, lineLength); if (formatResult != null && formatResult.getEdits() != null && formatResult.getEdits().size() == 1) { - final String replacement = StringUtil.convertLineSeparators(formatResult.getEdits().get(0).getReplacement()); + final String replacement = StringUtil.convertLineSeparators(formatResult.getEdits().getFirst().getReplacement()); fileToNewContentMap.put(virtualFile, replacement); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocUtil.java index 0f8d96392..a3952d6ae 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocUtil.java @@ -326,7 +326,7 @@ else if (namedComponent instanceof DartEnumConstantDeclaration) { if (previous instanceof DartDocComment) { return getMultilineDocCommentText((DartDocComment)previous); } - siblingComments.add(0, (PsiComment)previous); + siblingComments.addFirst((PsiComment)previous); } if (!siblingComments.isEmpty()) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocumentationProvider.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocumentationProvider.java index 27b2c96c4..fff8bede1 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocumentationProvider.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocumentationProvider.java @@ -109,7 +109,7 @@ public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Ob if (hoverList.isEmpty()) { return null; } - return hoverList.get(0); + return hoverList.getFirst(); } private static @Nullable String constructDocUrl(final @NotNull DartComponent component) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsTableModel.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsTableModel.java index 2025434f5..62dc87fb0 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsTableModel.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsTableModel.java @@ -350,7 +350,7 @@ String getTabTitleText() { @Nls String statusText; if (statusParts.size() == 1) { - statusText = statusParts.get(0); + statusText = statusParts.getFirst(); } else if (statusParts.size() == 2) { statusText = DartBundle.message("dart.problems.view.status.0.and.1", statusParts.get(0), statusParts.get(1)); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java index c25e136da..d60d436f2 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java @@ -100,7 +100,7 @@ public void invokePopup(Component comp, int x, int y) { table.getRowSorter().addRowSorterListener(e -> { List sortKeys = myTable.getRowSorter().getSortKeys(); assert sortKeys.size() == 1 : sortKeys; - ((DartProblemsTableModel)myTable.getModel()).setSortKey(sortKeys.get(0)); + ((DartProblemsTableModel)myTable.getModel()).setSortKey(sortKeys.getFirst()); }); TableSpeedSearch.installOn(table, object -> object instanceof DartProblem @@ -125,7 +125,7 @@ private void popupInvoked(Component component, int x, int y) { group.add(ActionManager.getInstance().getAction(IdeActions.ACTION_COPY)); List selectedProblems = myTable.getSelectedObjects(); - DartProblem selectedProblem = selectedProblems.size() == 1 ? selectedProblems.get(0) : null; + DartProblem selectedProblem = selectedProblems.size() == 1 ? selectedProblems.getFirst() : null; addQuickFixActions(group, selectedProblem); addDiagnosticMessageActions(group, selectedProblem); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartBlock.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartBlock.java index c640dcd44..0a3491864 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartBlock.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartBlock.java @@ -106,7 +106,7 @@ public boolean isIncomplete() { if (previousType == SWITCH_CASE || previousType == DEFAULT_CASE) { final List subBlocks = previousBlock.getSubDartBlocks(); if (!subBlocks.isEmpty()) { - final DartBlock lastChildInPrevBlock = subBlocks.get(subBlocks.size() - 1); + final DartBlock lastChildInPrevBlock = subBlocks.getLast(); final List subSubBlocks = lastChildInPrevBlock.getSubDartBlocks(); if (isLastTokenInSwitchCase(subSubBlocks)) { return new ChildAttributes(Indent.getNormalIndent(), null); // e.g. Enter after BREAK_STATEMENT diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyTreeStructure.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyTreeStructure.java index c025ebdca..e2ee0dd5b 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyTreeStructure.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyTreeStructure.java @@ -43,7 +43,7 @@ public DartMethodHierarchyTreeStructure(Project project, DartComponent element) final List items = getTypeHierarchyItems(dartClass); if (items.isEmpty()) return ArrayUtilRt.EMPTY_OBJECT_ARRAY; - addAllVisibleSubclasses(new HashSet<>(), myProject, items, items.get(0), descriptor); + addAllVisibleSubclasses(new HashSet<>(), myProject, items, items.getFirst(), descriptor); return descriptor.getCachedChildren(); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSubtypesHierarchyTreeStructure.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSubtypesHierarchyTreeStructure.java index 08f76bea2..8961c8ac2 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSubtypesHierarchyTreeStructure.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSubtypesHierarchyTreeStructure.java @@ -39,7 +39,7 @@ public DartServerSubtypesHierarchyTreeStructure(final Project project, final Dar final List items = getTypeHierarchyItems(dartClass); if (items.isEmpty()) return ArrayUtilRt.EMPTY_OBJECT_ARRAY; - addSubClassHierarchy(new HashSet<>(), myProject, items, items.get(0), descriptor); + addSubClassHierarchy(new HashSet<>(), myProject, items, items.getFirst(), descriptor); return descriptor.getCachedChildren(); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSupertypesHierarchyTreeStructure.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSupertypesHierarchyTreeStructure.java index ffcaf99dd..b7163a79d 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSupertypesHierarchyTreeStructure.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerSupertypesHierarchyTreeStructure.java @@ -34,7 +34,7 @@ public DartServerSupertypesHierarchyTreeStructure(final Project project, final D final List items = getTypeHierarchyItems(dartClass); if (items.isEmpty()) return ArrayUtilRt.EMPTY_OBJECT_ARRAY; - addSuperClassHierarchy(new HashSet<>(), myProject, items, items.get(0), descriptor); + addSuperClassHierarchy(new HashSet<>(), myProject, items, items.getFirst(), descriptor); return descriptor.getCachedChildren(); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerTypeHierarchyTreeStructure.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerTypeHierarchyTreeStructure.java index ef72cce16..f04107e17 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerTypeHierarchyTreeStructure.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartServerTypeHierarchyTreeStructure.java @@ -47,7 +47,7 @@ public DartServerTypeHierarchyTreeStructure(final Project project, final DartCla superDescriptor.setCachedChildren(new HierarchyNodeDescriptor[]{baseDescriptor}); } if (!items.isEmpty()) { - addSubClassHierarchy(new HashSet<>(), project, items, items.get(0), baseDescriptor); + addSubClassHierarchy(new HashSet<>(), project, items, items.getFirst(), baseDescriptor); } return baseDescriptor; @@ -73,7 +73,7 @@ public DartServerTypeHierarchyTreeStructure(final Project project, final DartCla final Set seenItems = new HashSet<>(); final List superClasses = new ArrayList<>(); - Integer superIndex = items.get(0).getSuperclass(); + Integer superIndex = items.getFirst().getSuperclass(); while (superIndex != null) { TypeHierarchyItem superItem = items.get(superIndex); if (!seenItems.add(superItem)) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartLibraryIndex.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartLibraryIndex.java index 53f8dad23..548996596 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartLibraryIndex.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartLibraryIndex.java @@ -75,7 +75,7 @@ public static Collection getFilesByLibName(final @NotNull GlobalSea final DartSdk sdk = DartSdk.getDartSdk(project); final List libNames = sdk == null ? null : getSdkLibUriToRelativePathMap(project, sdk.getHomePath()).getKeysByValue(relativePath); - return libNames == null || libNames.isEmpty() ? null : libNames.get(0); + return libNames == null || libNames.isEmpty() ? null : libNames.getFirst(); } public static @Nullable VirtualFile getSdkLibByUri(final @NotNull Project project, final @NotNull String sdkLibUri) { @@ -157,7 +157,7 @@ public void visitMapEntry(@NotNull DartMapEntry mapEntry) { final DartArguments arguments = newExpression.getArguments(); final DartArgumentList argumentList = arguments != null ? arguments.getArgumentList() : null; final List expressionList = argumentList != null ? argumentList.getExpressionList() : null; - final DartExpression firstExpression = expressionList == null || expressionList.isEmpty() ? null : expressionList.get(0); + final DartExpression firstExpression = expressionList == null || expressionList.isEmpty() ? null : expressionList.getFirst(); final String libraryRelativePath = firstExpression instanceof DartStringLiteralExpression ? StringUtil.unquoteString(firstExpression.getText()) : null; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/marker/DartServerOverrideMarkerProvider.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/marker/DartServerOverrideMarkerProvider.java index 891e6b6be..54383d184 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/marker/DartServerOverrideMarkerProvider.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/marker/DartServerOverrideMarkerProvider.java @@ -90,7 +90,7 @@ private static void addDartComponent(List components, Project pro } else { overrides = false; - superComponent = interfaceComponents.iterator().next(); + superComponent = interfaceComponents.getFirst(); } final Icon icon = overrides ? AllIcons.Gutter.OverridingMethod : AllIcons.Gutter.ImplementingMethod; PsiElement anchor = PsiTreeUtil.getDeepestFirst(componentName); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java index 21241be12..25275c81e 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/DartInlineHandler.java @@ -129,7 +129,7 @@ public boolean isEnabledOnElement(PsiElement element, @Nullable Editor editor) { for (DartNavigationRegion region : navigationRegions) { if (region.getOffset() <= offset && offset <= region.getOffset() + region.getLength()) { final List targets = region.getTargets(); - final String kind = targets.get(0).getKind(); + final String kind = targets.getFirst().getKind(); return new InlineRefactoringContext(virtualFile, offset, kind); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java index 2db3b042f..3260568f7 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java @@ -92,7 +92,7 @@ public void perform() { } // select the expression to extract if (expressions.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) { - performOnExpression(expressions.get(0)); + performOnExpression(expressions.getFirst()); } else if (expressions.size() > 1) { IntroduceTargetChooser.showChooser(editor, expressions, new Pass<>() { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java index be653aa76..f225b3e77 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/refactoring/status/RefactoringStatus.java @@ -96,7 +96,7 @@ public void addWarning(@NotNull String msg, @Nullable RefactoringStatusContext c if (entries.isEmpty()) { return null; } - RefactoringStatusEntry result = entries.get(0); + RefactoringStatusEntry result = entries.getFirst(); for (RefactoringStatusEntry entry : entries) { if (result.getSeverity().ordinal() < entry.getSeverity().ordinal()) { result = entry; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/DartConsoleFolding.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/DartConsoleFolding.java index 23b3c4b4e..168752c52 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/DartConsoleFolding.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/DartConsoleFolding.java @@ -68,19 +68,19 @@ public boolean shouldFoldLine(@NotNull Project project, final @NotNull String li // depending on the Moon phase (well, on initialization speed) we may get lines.size() == 2 where first line is Dart VM startup and 2nd line is Observatory URL) // but more frequently we get these 2 lines one by one - if (lines.size() == 1 && lines.get(0).startsWith(DartConsoleFilter.OBSERVATORY_LISTENING_ON)) { - return " [Debug service available at " + lines.get(0).substring(DartConsoleFilter.OBSERVATORY_LISTENING_ON.length()) + "]"; + if (lines.size() == 1 && lines.getFirst().startsWith(DartConsoleFilter.OBSERVATORY_LISTENING_ON)) { + return " [Debug service available at " + lines.getFirst().substring(DartConsoleFilter.OBSERVATORY_LISTENING_ON.length()) + "]"; } - else if (lines.size() == 1 && lines.get(0).startsWith(DartConsoleFilter.DART_VM_LISTENING_ON)) { - return " [Debug service available at " + lines.get(0).substring(DartConsoleFilter.DART_VM_LISTENING_ON.length()) + "]"; + else if (lines.size() == 1 && lines.getFirst().startsWith(DartConsoleFilter.DART_VM_LISTENING_ON)) { + return " [Debug service available at " + lines.getFirst().substring(DartConsoleFilter.DART_VM_LISTENING_ON.length()) + "]"; } - if (lines.size() == 1 && lines.get(0).contains(TEST_RUNNER_MARKER)) { - return foldTestRunnerCommand(lines.get(0)); + if (lines.size() == 1 && lines.getFirst().contains(TEST_RUNNER_MARKER)) { + return foldTestRunnerCommand(lines.getFirst()); } - if (lines.size() == 1 && lines.get(0).contains(WEBDEV_RUNNER_MARKER)) { - return foldWebdevCommand(lines.get(0)); + if (lines.size() == 1 && lines.getFirst().contains(WEBDEV_RUNNER_MARKER)) { + return foldWebdevCommand(lines.getFirst()); } // exception folding diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/OpenDartObservatoryUrlAction.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/OpenDartObservatoryUrlAction.java index ed4327e31..c6124ac5a 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/OpenDartObservatoryUrlAction.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/OpenDartObservatoryUrlAction.java @@ -78,6 +78,6 @@ private static void openInAnyChromeFamilyBrowser(final @NotNull String url) { final List chromeBrowsers = WebBrowserManager.getInstance().getBrowsers( browser -> browser.getFamily() == BrowserFamily.CHROME, true); - BrowserLauncher.getInstance().browse(url, chromeBrowsers.isEmpty() ? null : chromeBrowsers.get(0)); + BrowserLauncher.getInstance().browse(url, chromeBrowsers.isEmpty() ? null : chromeBrowsers.getFirst()); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/VmServiceWrapper.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/VmServiceWrapper.java index 4dacd4db4..118af4b3c 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/VmServiceWrapper.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/vmService/VmServiceWrapper.java @@ -394,7 +394,7 @@ public void received(UriList response) { List uris = response.getUris(); - if (uris == null || uris.get(0) == null) { + if (uris == null || uris.getFirst() == null) { LOG.info("Uri was not found"); JsonObject error = new JsonObject(); error.addProperty("error", "Breakpoint could not be mapped to package URI"); @@ -404,7 +404,7 @@ public void received(UriList response) { return; } - String scriptUri = uris.get(0); + String scriptUri = uris.getFirst(); LOG.info("in received of lookupPackageUris. scriptUri: " + scriptUri); myVmService.addBreakpointWithScriptUri(isolateId, scriptUri, line, new AddBreakpointWithScriptUriConsumer() { @Override diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunConfigurationProducer.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunConfigurationProducer.java index 3f1fecdbf..1d439d902 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunConfigurationProducer.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunConfigurationProducer.java @@ -140,7 +140,7 @@ private static boolean setupRunnerParametersForFile(final @NotNull DartTestRunne runnerParams.setTestName(testName); runnerParams.setScope(DartTestRunnerParameters.Scope.GROUP_OR_TEST_BY_NAME); - final VirtualFile dartFile = virtualFiles.iterator().next(); + final VirtualFile dartFile = virtualFiles.getFirst(); final String dartFilePath = dartFile.getPath(); runnerParams.setFilePath(dartFilePath); return true; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProvider.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProvider.java index acbe2fc23..8829a7823 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProvider.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/DartTestLocationProvider.java @@ -109,7 +109,7 @@ protected List getLocationByGroupAndTestNames(final PsiFile psiFile, f public boolean execute(final @NotNull PsiElement element) { if (element instanceof DartCallExpression expression) { if (TestUtil.isTest(expression) || TestUtil.isGroup(expression)) { - if (nodes.get(nodes.size() - 1).equals(getTestLabel(expression))) { + if (nodes.getLast().equals(getTestLabel(expression))) { boolean matches = true; for (int i = nodes.size() - 2; i >= 0 && matches; --i) { expression = getGroup(expression); @@ -145,8 +145,8 @@ public boolean execute(final @NotNull PsiElement element) { final DartArguments arguments = testCallExpression.getArguments(); final DartArgumentList argumentList = arguments == null ? null : arguments.getArgumentList(); final List argExpressions = argumentList == null ? null : argumentList.getExpressionList(); - return argExpressions != null && !argExpressions.isEmpty() && argExpressions.get(0) instanceof DartStringLiteralExpression - ? StringUtil.unquoteString(argExpressions.get(0).getText()) + return argExpressions != null && !argExpressions.isEmpty() && argExpressions.getFirst() instanceof DartStringLiteralExpression + ? StringUtil.unquoteString(argExpressions.getFirst().getText()) : null; } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/TestUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/TestUtil.java index 1884a2dd6..51a7039cd 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/TestUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/util/TestUtil.java @@ -20,7 +20,7 @@ public final class TestUtil { if (dartArgumentList == null || dartArgumentList.getExpressionList().isEmpty()) { return null; } - final DartExpression dartExpression = dartArgumentList.getExpressionList().get(0); + final DartExpression dartExpression = dartArgumentList.getExpressionList().getFirst(); testName = dartExpression == null ? "" : StringUtil.unquoteString(dartExpression.getText()); return testName; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchFinallySurrounder.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchFinallySurrounder.java index eca293c62..dbcf96156 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchFinallySurrounder.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchFinallySurrounder.java @@ -21,6 +21,6 @@ protected String getTemplateText() { @Override protected @Nullable PsiElement findElementToDelete(PsiElement surrounder) { //noinspection ConstantConditions - return ((DartTryStatement)surrounder).getOnPartList().get(0).getBlock().getStatements().getFirstChild(); // todo preselect print(e); + return ((DartTryStatement)surrounder).getOnPartList().getFirst().getBlock().getStatements().getFirstChild(); // todo preselect print(e); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchSurrounder.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchSurrounder.java index 225e0543d..c73d465e2 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchSurrounder.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/surroundWith/statement/DartWithTryCatchSurrounder.java @@ -21,6 +21,6 @@ protected String getTemplateText() { @Override protected @Nullable PsiElement findElementToDelete(PsiElement surrounder) { //noinspection ConstantConditions - return ((DartTryStatement)surrounder).getOnPartList().get(0).getBlock().getStatements().getFirstChild(); // todo preselect print(e); + return ((DartTryStatement)surrounder).getOnPartList().getFirst().getBlock().getStatements().getFirstChild(); // todo preselect print(e); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartFilterByClassMacro.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartFilterByClassMacro.java index e0bc9a66f..6c325e5db 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartFilterByClassMacro.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/template/macro/DartFilterByClassMacro.java @@ -30,7 +30,7 @@ public Result calculateResult(Expression @NotNull [] params, ExpressionContext c final DartClass dartClass = result.getDartClass(); return dartClass != null && filter(dartClass); }); - return filtered.isEmpty() ? null : new PsiElementResult(filtered.iterator().next()); + return filtered.isEmpty() ? null : new PsiElementResult(filtered.getFirst()); } protected abstract boolean filter(@NotNull DartClass dartClass); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/AbstractDartPsiClass.java b/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/AbstractDartPsiClass.java index 5ac6708c7..af51df96c 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/AbstractDartPsiClass.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/AbstractDartPsiClass.java @@ -143,7 +143,7 @@ public DartComponent findMethodByName(final @NotNull String name) { @Override public DartComponent findMemberByName(@NotNull String name) { final List membersByName = findMembersByName(name); - return membersByName.isEmpty() ? null : membersByName.iterator().next(); + return membersByName.isEmpty() ? null : membersByName.getFirst(); } @Override diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartFileReference.java b/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartFileReference.java index acba6efad..1135d35f2 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartFileReference.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartFileReference.java @@ -155,7 +155,7 @@ private static class Resolver implements ResolveCache.PolyVariantResolver targets = region.getTargets(); if (!targets.isEmpty()) { - final DartNavigationTarget target = targets.get(0); + final DartNavigationTarget target = targets.getFirst(); final VirtualFile targetVirtualFile = target.findFile(); if (targetVirtualFile != null) { final PsiFile targetFile = reference.getElement().getManager().findFile(targetVirtualFile); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartReferenceImpl.java b/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartReferenceImpl.java index b7d2d276c..4e15349ec 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartReferenceImpl.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/psi/impl/DartReferenceImpl.java @@ -142,7 +142,7 @@ public PsiElement resolve() { PsiElement parent = this.getParent(); if (parent instanceof DartValueExpression) { final List expressionList = ((DartValueExpression)parent).getExpressionList(); - final DartExpression firstExpression = expressionList.isEmpty() ? null : expressionList.get(0); + final DartExpression firstExpression = expressionList.isEmpty() ? null : expressionList.getFirst(); if (firstExpression instanceof DartReference) { return ((DartReference)firstExpression).resolveDartClass(); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java index 810f3aac4..88ae8cac7 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java @@ -133,8 +133,8 @@ protected void textChanged(final @NotNull DocumentEvent e) { public static @Nullable String getFirstKnownDartSdkPath() { List knownPaths = PropertiesComponent.getInstance().getList(DART_SDK_KNOWN_PATHS); - if (knownPaths != null && !knownPaths.isEmpty() && isDartSdkHome(knownPaths.get(0))) { - return knownPaths.get(0); + if (knownPaths != null && !knownPaths.isEmpty() && isDartSdkHome(knownPaths.getFirst())) { + return knownPaths.getFirst(); } return null; } @@ -173,11 +173,11 @@ public static void updateKnownSdkPaths(final @NotNull Project project, final @No if (oldSdk != null) { knownPaths.remove(oldSdk.getHomePath()); - knownPaths.add(0, oldSdk.getHomePath()); + knownPaths.addFirst(oldSdk.getHomePath()); } knownPaths.remove(newSdkPath); - knownPaths.add(0, newSdkPath); + knownPaths.addFirst(newSdkPath); PropertiesComponent.getInstance().setList(DART_SDK_KNOWN_PATHS, knownPaths); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java index 0cf4e6b6e..a20c89677 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartPsiImplUtil.java @@ -217,7 +217,7 @@ private static PsiElement doResolveTypeReference(final DartType dartType) { DartResolveUtil.processTopLevelDeclarations(dartType, dartResolveProcessor, libraryFiles, typeName); } - return result.isEmpty() ? null : result.iterator().next(); + return result.isEmpty() ? null : result.getFirst(); } public static @Nullable DartComponentName findComponentName(final @NotNull DartNormalFormalParameter normalFormalParameter) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java index e67a18099..798585f01 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java @@ -125,7 +125,7 @@ private static boolean canAssign(final @Nullable DartClass baseClass, @Nullable final VirtualFile dartCoreLib = DartLibraryIndex.getSdkLibByUri(context.getProject(), DART_CORE_URI); final List result = new ArrayList<>(); processTopLevelDeclarations(context, new DartResolveProcessor(result, className), dartCoreLib, className); - final PsiElement parent = result.isEmpty() ? null : result.iterator().next().getParent(); + final PsiElement parent = result.isEmpty() ? null : result.getFirst().getParent(); return DartClassResolveResult.create(parent instanceof DartClass ? (DartClass)parent : null); } @@ -367,7 +367,7 @@ public static boolean isLibraryRoot(@NotNull DartFile dartFile) { parent = parent.getParent(); if (parent instanceof DartValueExpression) { final List expressionList = ((DartValueExpression)parent).getExpressionList(); - final DartExpression firstExpression = expressionList.isEmpty() ? null : expressionList.get(0); + final DartExpression firstExpression = expressionList.isEmpty() ? null : expressionList.getFirst(); if (firstExpression instanceof DartReference) { return (DartReference)firstExpression; }