MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

StreamToLoopInspection: fixed unqualified reference to stream() method handling

Browse Source
This commit is contained in:
Tagir Valeev
2017-01-16 14:44:34 +07:00
parent e5a9e1e3eb
commit 8924fda614
5 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/java-impl/src/com/intellij/codeInspection/streamToLoop/SourceOperation.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -104,15 +104,17 @@ abstract class SourceOperation extends Operation {
}
static class ForEachSource extends SourceOperation {
private PsiExpression myQualifier;
private @Nullable PsiExpression myQualifier;
ForEachSource(PsiExpression qualifier) {
ForEachSource(@Nullable PsiExpression qualifier) {
myQualifier = qualifier;
}
@Override
void rename(String oldName, String newName, StreamToLoopReplacementContext context) {
myQualifier = replaceVarReference(myQualifier, oldName, newName, context);
if(myQualifier != null) {
myQualifier = replaceVarReference(myQualifier, oldName, newName, context);
}
}
@Override
@@ -135,8 +137,9 @@ abstract class SourceOperation extends Operation {
@Override
public String wrap(StreamVariable outVar, String code, StreamToLoopReplacementContext context) {
return context.getLoopLabel() +
"for(" + outVar.getDeclaration() + ": " + (myQualifier == null ? "this" : myQualifier.getText()) + ") {" + code + "}\n";
PsiExpression iterationParameter = myQualifier == null ? ExpressionUtils
.getQualifierOrThis(((PsiMethodCallExpression)context.createExpression("stream()")).getMethodExpression()) : myQualifier;
return context.getLoopLabel() + "for(" + outVar.getDeclaration() + ": " + iterationParameter.getText() + ") {" + code + "}\n";
}
}

3
java/java-impl/src/com/intellij/codeInspection/streamToLoop/StreamToLoopInspection.java
View File

@@ -355,7 +355,8 @@ public class StreamToLoopInspection extends BaseJavaBatchLocalInspectionTool {
mySuffix = "Inner";
}
public void registerReusedElement(PsiElement element) {
public void registerReusedElement(@Nullable PsiElement element) {
if(element == null) return;
element.accept(new JavaRecursiveElementVisitor() {
@Override
public void visitVariable(PsiVariable variable) {

19
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterOuterRef.java Normal file
View File

@@ -0,0 +1,19 @@
// "Replace Stream API chain with loop" "true"
import java.util.ArrayList;
public class Test extends ArrayList<String> {
void test() {
new Runnable() {
@Override
public void run() {
int sum = 0;
for (String s : Test.this) {
int length = s.length();
sum += length;
}
System.out.println(sum);
}
};
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/beforeOuterRef.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace Stream API chain with loop" "true"
import java.util.ArrayList;
public class Test extends ArrayList<String> {
void test() {
new Runnable() {
@Override
public void run() {
System.out.println(stream().mapToInt(String::length).s<caret>um());
}
};
}
}

3
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java
View File

@@ -904,6 +904,9 @@ public class ExpressionUtils {
PsiClass memberClass = member.getContainingClass();
if (memberClass != null) {
PsiClass containingClass = ClassUtils.getContainingClass(ref);
if (containingClass == null) {
containingClass = PsiTreeUtil.getContextOfType(ref, PsiClass.class);
}
if (!InheritanceUtil.isInheritorOrSelf(containingClass, memberClass, true)) {
containingClass = ClassUtils.getContainingClass(containingClass);
while (containingClass != null && !InheritanceUtil.isInheritorOrSelf(containingClass, memberClass, true)) {