Skip to content

Commit db9e2e8

Browse files
authored
[cq] Migrate code to Inspection-recommended Java 21 APIs (#42)
1 parent 38c1cad commit db9e2e8

34 files changed

+56
-56
lines changed

third_party/src/main/java/com/jetbrains/lang/dart/assists/AssistUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public static List<SourceEditInfo> applySourceEdits(final @NotNull Project proje
179179
}
180180
}
181181
if (map.isEmpty() && !fileEdits.isEmpty()) {
182-
String filePathOrUri = fileEdits.get(0).getFile();
182+
String filePathOrUri = fileEdits.getFirst().getFile();
183183
throw new DartSourceEditException(DartBundle.message("error.none.of.the.files.were.in.this.project.content.0", filePathOrUri));
184184
}
185185
return map;
@@ -189,7 +189,7 @@ public static List<SourceEditInfo> applySourceEdits(final @NotNull Project proje
189189
for (LinkedEditGroup group : sourceChange.getLinkedEditGroups()) {
190190
final List<Position> positions = group.getPositions();
191191
if (!positions.isEmpty()) {
192-
Position position = positions.get(0);
192+
Position position = positions.getFirst();
193193
String filePathOrUri = position.getFile();
194194
DartFileInfo fileInfo = DartFileInfoKt.getDartFileInfo(project, filePathOrUri);
195195
VirtualFile virtualFile = fileInfo.findFile();

third_party/src/main/java/com/jetbrains/lang/dart/fixes/DartQuickFix.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public static void doInvoke(@NotNull Project project,
9494
@NotNull PsiFile file,
9595
@NotNull SourceChange sourceChange,
9696
@Nullable DartQuickFix dartQuickFix) {
97-
SourceFileEdit fileEdit = sourceChange.getEdits().get(0);
97+
SourceFileEdit fileEdit = sourceChange.getEdits().getFirst();
9898
String filePathOrUri = fileEdit.getFile();
9999
DartFileInfo fileInfo = DartFileInfoKt.getDartFileInfo(project, filePathOrUri);
100100
if (!(fileInfo instanceof DartLocalFileInfo localFileInfo)) return;
@@ -191,7 +191,7 @@ public static boolean isPreviewAvailable(@NotNull PsiFile target, @Nullable Sour
191191
return false;
192192
}
193193

194-
String filePathOrUri = sourceChange.getEdits().get(0).getFile();
194+
String filePathOrUri = sourceChange.getEdits().getFirst().getFile();
195195
DartFileInfo fileInfo = DartFileInfoKt.getDartFileInfo(target.getProject(), filePathOrUri);
196196

197197
VirtualFile vFile = target.getOriginalFile().getVirtualFile();
@@ -205,7 +205,7 @@ public static void doInvokeForPreview(@NotNull PsiFile psiFile, @NotNull SourceC
205205

206206
// #isPreviewAvailable() has checked that sourceChange.getEdits().get(0) modifies _this_ PsiFile, not some other
207207
Document document = psiFile.getViewProvider().getDocument();
208-
for (SourceEdit edit : sourceChange.getEdits().get(0).getEdits()) {
208+
for (SourceEdit edit : sourceChange.getEdits().getFirst().getEdits()) {
209209
String replacement = StringUtil.convertLineSeparators(edit.getReplacement());
210210
int startOffset = edit.getOffset();
211211
int endOffset = edit.getOffset() + edit.getLength();

third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartInheritorsSearcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private static void prepare(final @NotNull DefinitionsScopedSearch.SearchParamet
124124
if (hierarchyItems.isEmpty()) return Collections.emptySet();
125125

126126
final Set<DartComponent> result = new HashSet<>(hierarchyItems.size());
127-
addSubClasses(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.get(0), false);
127+
addSubClasses(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.getFirst(), false);
128128
return result;
129129
}
130130

@@ -134,7 +134,7 @@ private static void prepare(final @NotNull DefinitionsScopedSearch.SearchParamet
134134
if (hierarchyItems.isEmpty()) return Collections.emptySet();
135135

136136
final Set<DartComponent> result = new HashSet<>(hierarchyItems.size());
137-
addSubMembers(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.get(0), false);
137+
addSubMembers(project, scope, new HashSet<>(), hierarchyItems, result, hierarchyItems.getFirst(), false);
138138
return result;
139139
}
140140

third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartServerGotoSuperHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps
4545
// build list of DartComponent(s)
4646
final List<DartComponent> supers = new ArrayList<>();
4747
if (!items.isEmpty()) {
48-
TypeHierarchyItem seed = items.get(0);
48+
TypeHierarchyItem seed = items.getFirst();
4949
{
5050
final Integer superIndex = seed.getSuperclass();
5151
if (superIndex != null) {

third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartStyleAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private static TextRange reformatRange(final @Nullable Editor editor,
112112
}
113113

114114
final String inputText = document.getText();
115-
final String formattedText = StringUtil.convertLineSeparators(edits.get(0).getReplacement());
115+
final String formattedText = StringUtil.convertLineSeparators(edits.getFirst().getReplacement());
116116
if (!wholeFile && countNonSpaceChars(inputText) != countNonSpaceChars(formattedText)) {
117117
LOG.error("dartfmt changed non-space characters for file " + file.getPath());
118118
return inputRange;
@@ -189,7 +189,7 @@ public static void runDartfmt(final @NotNull Project project, final @NotNull Lis
189189
final DartAnalysisServerService.FormatResult formatResult =
190190
DartAnalysisServerService.getInstance(project).edit_format(virtualFile, 0, 0, lineLength);
191191
if (formatResult != null && formatResult.getEdits() != null && formatResult.getEdits().size() == 1) {
192-
final String replacement = StringUtil.convertLineSeparators(formatResult.getEdits().get(0).getReplacement());
192+
final String replacement = StringUtil.convertLineSeparators(formatResult.getEdits().getFirst().getReplacement());
193193
fileToNewContentMap.put(virtualFile, replacement);
194194
}
195195
}

third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ else if (namedComponent instanceof DartEnumConstantDeclaration) {
326326
if (previous instanceof DartDocComment) {
327327
return getMultilineDocCommentText((DartDocComment)previous);
328328
}
329-
siblingComments.add(0, (PsiComment)previous);
329+
siblingComments.addFirst((PsiComment)previous);
330330
}
331331

332332
if (!siblingComments.isEmpty()) {

third_party/src/main/java/com/jetbrains/lang/dart/ide/documentation/DartDocumentationProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Ob
109109
if (hoverList.isEmpty()) {
110110
return null;
111111
}
112-
return hoverList.get(0);
112+
return hoverList.getFirst();
113113
}
114114

115115
private static @Nullable String constructDocUrl(final @NotNull DartComponent component) {

third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsTableModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ String getTabTitleText() {
350350

351351
@Nls String statusText;
352352
if (statusParts.size() == 1) {
353-
statusText = statusParts.get(0);
353+
statusText = statusParts.getFirst();
354354
}
355355
else if (statusParts.size() == 2) {
356356
statusText = DartBundle.message("dart.problems.view.status.0.and.1", statusParts.get(0), statusParts.get(1));

third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsViewPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void invokePopup(Component comp, int x, int y) {
100100
table.getRowSorter().addRowSorterListener(e -> {
101101
List<? extends RowSorter.SortKey> sortKeys = myTable.getRowSorter().getSortKeys();
102102
assert sortKeys.size() == 1 : sortKeys;
103-
((DartProblemsTableModel)myTable.getModel()).setSortKey(sortKeys.get(0));
103+
((DartProblemsTableModel)myTable.getModel()).setSortKey(sortKeys.getFirst());
104104
});
105105

106106
TableSpeedSearch.installOn(table, object -> object instanceof DartProblem
@@ -125,7 +125,7 @@ private void popupInvoked(Component component, int x, int y) {
125125
group.add(ActionManager.getInstance().getAction(IdeActions.ACTION_COPY));
126126

127127
List<DartProblem> selectedProblems = myTable.getSelectedObjects();
128-
DartProblem selectedProblem = selectedProblems.size() == 1 ? selectedProblems.get(0) : null;
128+
DartProblem selectedProblem = selectedProblems.size() == 1 ? selectedProblems.getFirst() : null;
129129

130130
addQuickFixActions(group, selectedProblem);
131131
addDiagnosticMessageActions(group, selectedProblem);

third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartBlock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public boolean isIncomplete() {
106106
if (previousType == SWITCH_CASE || previousType == DEFAULT_CASE) {
107107
final List<DartBlock> subBlocks = previousBlock.getSubDartBlocks();
108108
if (!subBlocks.isEmpty()) {
109-
final DartBlock lastChildInPrevBlock = subBlocks.get(subBlocks.size() - 1);
109+
final DartBlock lastChildInPrevBlock = subBlocks.getLast();
110110
final List<DartBlock> subSubBlocks = lastChildInPrevBlock.getSubDartBlocks();
111111
if (isLastTokenInSwitchCase(subSubBlocks)) {
112112
return new ChildAttributes(Indent.getNormalIndent(), null); // e.g. Enter after BREAK_STATEMENT

0 commit comments

Comments
 (0)