MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-10 13:17:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] cleanup: use getLast/getFirst/etc.

Browse Source 
GitOrigin-RevId: e77d2952e8d83aedd00784a2b3290c6c92460717
This commit is contained in:
Tagir Valeev
2025-09-15 08:54:13 +00:00
committed by intellij-monorepo-bot
parent 2bc43dfd13
commit 53489602f1
43 changed files with 109 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/JavaCaseBlockMover.java
+2 -2
View File
@@ -39,8 +39,8 @@ public final class JavaCaseBlockMover extends LineMover {
if (statements.isEmpty()) return false;
if (firstElement != null) return info.prohibitMove(); // nonsensical selection
PsiSwitchLabelStatement firstToMove = getThisCaseBlockStart(statements.get(0));
PsiSwitchLabelStatement lastStatement = statements.get(statements.size() - 1);
PsiSwitchLabelStatement firstToMove = getThisCaseBlockStart(statements.getFirst());
PsiSwitchLabelStatement lastStatement = statements.getLast();
PsiElement nextCaseBlockStart = getNextCaseBlockStart(lastStatement);
PsiElement lastToMove = PsiTreeUtil.skipWhitespacesBackward(nextCaseBlockStart);
assert lastToMove != null;
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java
+1 -1
View File
@@ -79,7 +79,7 @@ public final class CodeBlockOrInitializerSelectioner extends AbstractBasicBackBa
}
public static int findClosingBrace(List<ASTNode> children, int startOffset) {
int end = children.get(children.size() - 1).getTextRange().getEndOffset();
int end = children.getLast().getTextRange().getEndOffset();
for (int i = 0; i < children.size(); i++) {
ASTNode child = children.get(i);
java/java-frontback-impl/src/com/intellij/psi/formatter/java/SyntheticCodeBlock.java
+8 -9
View File
@@ -48,8 +48,8 @@ public class SyntheticCodeBlock implements Block, JavaBlock{
myAlignment = alignment;
mySettings = settings;
myWrap = wrap;
myTextRange = new TextRange(mySubBlocks.get(0).getTextRange().getStartOffset(),
mySubBlocks.get(mySubBlocks.size() - 1).getTextRange().getEndOffset());
myTextRange = new TextRange(mySubBlocks.getFirst().getTextRange().getStartOffset(),
mySubBlocks.getLast().getTextRange().getEndOffset());
}
@Override
@@ -85,13 +85,13 @@ public class SyntheticCodeBlock implements Block, JavaBlock{
@Override
public String toString() {
ASTNode treeNode = null;
Block child = mySubBlocks.get(0);
Block child = mySubBlocks.getFirst();
while (treeNode == null) {
if (child instanceof AbstractBlock) {
treeNode = ((AbstractBlock)child).getNode();
}
else if (child instanceof SyntheticCodeBlock) {
child = ((SyntheticCodeBlock)child).mySubBlocks.get(0);
child = ((SyntheticCodeBlock)child).mySubBlocks.getFirst();
}
else {
break;
@@ -112,7 +112,7 @@ public class SyntheticCodeBlock implements Block, JavaBlock{
@Override
public @Nullable ASTNode getFirstTreeNode() {
return AbstractJavaBlock.getTreeNode(mySubBlocks.get(0));
return AbstractJavaBlock.getTreeNode(mySubBlocks.getFirst());
}
public void setChildAttributes(final ChildAttributes childAttributes) {
@@ -160,7 +160,7 @@ public class SyntheticCodeBlock implements Block, JavaBlock{
private static boolean isDotFirst(final Block block) {
Block current = block;
while (!current.getSubBlocks().isEmpty()) {
current = current.getSubBlocks().get(0);
current = current.getSubBlocks().getFirst();
}
ASTNode node = current instanceof LeafBlock ? ((LeafBlock)current).getNode() : null;
return node != null && node.getElementType() == JavaTokenType.DOT;
@@ -170,8 +170,7 @@ public class SyntheticCodeBlock implements Block, JavaBlock{
Block rightMost = null;
List<Block> subBlocks = getSubBlocks();
while (!subBlocks.isEmpty()) {
int lastIndex = subBlocks.size() - 1;
rightMost = subBlocks.get(lastIndex);
rightMost = subBlocks.getLast();
subBlocks = rightMost.getSubBlocks();
}
return rightMost;
@@ -180,7 +179,7 @@ public class SyntheticCodeBlock implements Block, JavaBlock{
@Override
public boolean isIncomplete() {
if (myIsIncomplete) return true;
return getSubBlocks().get(getSubBlocks().size() - 1).isIncomplete();
return getSubBlocks().getLast().isIncomplete();
}
@Override