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

[java] cleanup: use reversed iteration

Browse Source 
GitOrigin-RevId: d06c8b96458e1f73308825669af589888ed67aef
This commit is contained in:
Tagir Valeev
2025-09-15 08:54:13 +00:00
committed by intellij-monorepo-bot
parent 53489602f1
commit 865726ee14
14 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/StatementChecker.java
+2 -4
View File
@@ -15,6 +15,7 @@ import com.intellij.refactoring.util.RefactoringChangeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.JavaPsiConstructorUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -238,10 +239,7 @@ final class StatementChecker {
}
private static boolean checkMultipleTypes(@NotNull PsiClass catchClass, @NotNull List<? extends PsiType> upperCatchTypes) {
for (int i = upperCatchTypes.size() - 1; i >= 0; i--) {
if (checkSingleType(catchClass, upperCatchTypes.get(i))) return true;
}
return false;
return ContainerUtil.exists(upperCatchTypes.reversed(), type -> checkSingleType(catchClass, type));
}
private static boolean checkSingleType(@NotNull PsiClass catchClass, @Nullable PsiType upperCatchType) {
java/debugger/impl/src/com/intellij/debugger/engine/DefaultSourcePositionProvider.java
+2 -2
View File
@@ -97,8 +97,8 @@ public final class DefaultSourcePositionProvider extends SourcePositionProvider
// important: use the last location to be sure the position will be within the anonymous class
// and do not use type.allLineLocations as it fetches line tables for all methods
List<Method> methods = type.methods();
for (int i = methods.size() - 1; i >= 0; i--) {
List<Location> locations = methods.get(i).allLineLocations();
for (Method m : methods.reversed()) {
List<Location> locations = m.allLineLocations();
if (!locations.isEmpty()) {
aClass = JVMNameUtil.getClassAt(debugProcess.getPositionManager().getSourcePosition(ContainerUtil.getLastItem(locations)));
break;
java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
+1 -5
View File
@@ -590,11 +590,7 @@ public final class JarRepositoryManager {
@NotNull ArtifactRepositoryManager manager) throws Exception {
try {
List<Version> versions = new ArrayList<>(manager.getAvailableVersions(groupId, artifactId, "[0,)", ArtifactKind.ARTIFACT));
ArrayList<String> strings = new ArrayList<>(versions.size());
for (int i = versions.size() - 1; i >= 0; i--) {
strings.add(versions.get(i).toString());
}
return strings;
return ContainerUtil.map(versions.reversed(), Version::toString);
}
catch (TransferCancelledException e) {
throw new ProcessCanceledException(e);
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/MethodReturnInferenceVisitor.java
+4 -8
View File
@@ -13,6 +13,7 @@ import com.intellij.psi.impl.source.tree.java.PsiSwitchLabeledRuleStatementImpl;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.util.containers.ContainerUtil;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -259,8 +260,7 @@ class MethodReturnInferenceVisitor {
}
if (tokenType == DECLARATION_STATEMENT) {
List<LighterASTNode> declaredElements = tree.getChildren(statement);
for (int i = declaredElements.size() - 1; i >= 0; i--) {
LighterASTNode declared = declaredElements.get(i);
for (LighterASTNode declared : declaredElements.reversed()) {
if (declared.getTokenType() != LOCAL_VARIABLE) continue;
LighterASTNode initializer = findExpressionChild(tree, declared);
if (declared.equals(target)) {
@@ -276,12 +276,8 @@ class MethodReturnInferenceVisitor {
LighterASTNode block = firstChildOfType(tree, statement, CODE_BLOCK);
if (block != null) {
List<LighterASTNode> children = getChildrenOfType(tree, block, ElementType.JAVA_STATEMENT_BIT_SET);
for (int i = children.size() - 1; i >= 0; i--) {
ReturnValue value = findValueInStatement(children.get(i), target);
if (value != null) {
return value;
}
}
return StreamEx.ofReversed(children).map(node -> findValueInStatement(node, target))
.nonNull().findFirst().orElse(null);
}
return null;
}
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
+1 -2
View File
@@ -109,8 +109,7 @@ public class ParametersFolder {
int currentRank = 0;
PsiExpression mostRanked = null;
for (int i = mentionedInExpressions.size() - 1; i >= 0; i--) {
PsiExpression expression = mentionedInExpressions.get(i);
for (PsiExpression expression : mentionedInExpressions.reversed()) {
final int r = findUsedVariables(data, inputVariables, expression).size();
if (currentRank < r || expression instanceof PsiArrayAccessExpression && myFoldingSelectedByDefault && currentRank == r) {
currentRank = r;
java/java-analysis-impl/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java
+2 -3
View File
@@ -121,15 +121,14 @@ public final class TryFinallyCanBeTryWithResourcesInspection extends BaseInspect
.toList();
if (locals.size() == 1) {
PsiLocalVariable variable = locals.get(0);
PsiLocalVariable variable = locals.getFirst();
PsiStatement declaration = PsiTreeUtil.getParentOfType(variable, PsiStatement.class);
if (declaration != null) {
if (declaration.getParent() == tryStatement.getParent()) {
List<PsiStatement> statements = collectStatementsBetween(declaration, tryStatement);
PsiJavaToken lBrace = tryBlock.getLBrace();
if (lBrace != null) {
for (int i = statements.size() - 1; i >= 0; i--) {
PsiStatement statement = statements.get(i);
for (PsiStatement statement : statements.reversed()) {
tryBlock.addAfter(statement, lBrace);
if (statement.isValid()) {
statement.delete();
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java
+1 -3
View File
@@ -44,9 +44,7 @@ public final class DocTagSelectioner extends WordSelectioner {
List<ASTNode> children = BasicJavaAstTreeUtil.getChildren(node);
for (int i = children.size() - 1; i >= 0; i--) {
ASTNode child = children.get(i);
for (ASTNode child : children.reversed()) {
int childStartOffset = child.getTextRange().getStartOffset();
if (childStartOffset <= minOffset) {
java/java-impl-inspections/src/com/intellij/codeInspection/TrailingWhitespacesInTextBlockInspection.java
+1 -4
View File
@@ -16,7 +16,6 @@ import com.intellij.psi.util.PsiLiteralUtil;
import com.siyeh.ig.PsiReplacementUtil;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
@@ -177,9 +176,7 @@ public final class TrailingWhitespacesInTextBlockInspection extends AbstractBase
}
else if (element instanceof PsiFragment fragment) {
if (fragment.isTextBlock() && fragment.getParent() instanceof PsiTemplate template) {
@NotNull List<@NotNull PsiFragment> fragments = template.getFragments();
for (int i = fragments.size() - 1; i >= 0; i--) {
PsiFragment current = fragments.get(i);
for (PsiFragment current : template.getFragments().reversed()) {
String suffix = fragment.getTokenType() == JavaTokenType.TEXT_BLOCK_TEMPLATE_END ? "\"\"\"" : "\\{";
String text = buildReplacementText(current, suffix, myTransformation);
if (text == null) return;
java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
+1 -2
View File
@@ -707,8 +707,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
private static void replaceWithAccessors(PsiReferenceExpression ref, PsiCodeBlock block) {
List<PsiReferenceExpression> list = SyntaxTraverser.psiTraverser(block).filter(PsiReferenceExpression.class).toList();
// Iterate in opposite order, so in case of nested accessors, we first replace method arguments, then methods itself
for (int i = list.size() - 1; i >= 0; i--) {
PsiReferenceExpression r = list.get(i);
for (PsiReferenceExpression r: list.reversed()) {
if (!r.isValid()) continue;
FieldAccessFixer fixer = FieldAccessFixer.create(r, r.resolve(), ref);
// Name-based is too risky for inline
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+2 -3
View File
@@ -236,9 +236,8 @@ public final class ExpectedTypesProvider {
List<PsiPrimitiveType> primitiveTypes = PsiTypes.primitiveTypes();
Stack<PsiType> stack = new Stack<>();
for (int i = primitiveTypes.size() - 1; i >= 0; i--) {
PsiPrimitiveType primitiveType = primitiveTypes.get(i);
if (primitiveTypes.get(i).equals(type)) break;
for (PsiPrimitiveType primitiveType : primitiveTypes.reversed()) {
if (primitiveType.equals(type)) break;
//it is already processed before
if (primitiveType.equals(PsiTypes.booleanType())) continue;
stack.push(primitiveType);
java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java
+4 -7
View File
@@ -357,14 +357,11 @@ public final class MagicConstantInspection extends AbstractBaseJavaLocalInspecti
if (remainingFlags == 0) {
// found flags to combine with OR, suggest the fix
if (flags.size() > 1) {
for (int i = flags.size() - 1; i >= 0; i--) {
PsiAnnotationMemberValue flag = flags.get(i);
flags.removeIf(flag -> {
Long flagValue = MagicConstantUtils.evaluateLongConstant((PsiExpression)flag);
if (flagValue != null && flagValue == 0) {
// no sense in ORing with '0'
flags.remove(i);
}
}
// no sense in ORing with '0'
return flagValue != null && flagValue == 0;
});
}
if (!flags.isEmpty()) {
return LocalQuickFix.from(new ReplaceWithMagicConstantFix(argument, flags.toArray(PsiAnnotationMemberValue.EMPTY_ARRAY)));
java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantUtils.java
+4 -7
View File
@@ -174,14 +174,11 @@ public final class MagicConstantUtils {
if (remainingFlags == 0) {
// found flags to combine with OR, suggest the fix
if (flags.size() > 1) {
for (int i = flags.size() - 1; i >= 0; i--) {
PsiAnnotationMemberValue flag = flags.get(i);
flags.removeIf(flag -> {
Long flagValue = evaluateLongConstant((PsiExpression)flag);
if (flagValue != null && flagValue == 0) {
// no sense in ORing with '0'
flags.remove(i);
}
}
// no sense in ORing with '0'
return flagValue != null && flagValue == 0;
});
}
if (!flags.isEmpty()) {
return StreamEx.of(flags)
java/java-impl/src/com/siyeh/ig/performance/TailRecursionInspection.java
+2 -3
View File
@@ -142,9 +142,8 @@ public final class TailRecursionInspection extends BaseInspection implements Cle
for (PsiStatement statement : emptyElseBranches) {
final List<PsiComment> comments = new ArrayList<>(PsiTreeUtil.collectElementsOfType(statement, PsiComment.class));
final PsiParserFacade parserFacade = PsiParserFacade.getInstance(statement.getProject());
for (int i = comments.size() - 1; i >= 0; i--) {
final PsiElement parent = statement.getParent();
final PsiComment comment = comments.get(i);
final PsiElement parent = statement.getParent();
for (PsiComment comment : comments.reversed()) {
parent.addAfter(comment, statement);
// newline followed by space convinces formatter to indent line
parent.addAfter(parserFacade.createWhiteSpaceFromText(isAtStartOfLine(comment) ? "\n" : "\n "), statement);
java/java-impl/src/com/siyeh/ipp/exceptions/ReplaceArmWithTryFinallyIntention.java
+2 -2
View File
@@ -64,8 +64,8 @@ public final class ReplaceArmWithTryFinallyIntention extends MCIntention {
final PsiElement child = children[i];
newTryStatement.append(child.getText());
}
for (int i = resources.size() - 1; i >= 0; i--) {
newTryStatement.append("} finally {\n").append(resources.get(i)).append(".close();\n}");
for (String res : resources.reversed()) {
newTryStatement.append("} finally {\n").append(res).append(".close();\n}");
}
newTryStatement.append('}');
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(element.getProject());