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

redundant args: copy the file to avoid incompleted psi

Browse Source
This commit is contained in:
Anna Kozlova
2016-02-16 15:57:18 +01:00
parent ff05d1b0b4
commit abd1b44e85
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
+7 -10
View File
@@ -21,7 +21,6 @@ import com.intellij.codeInspection.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.graphInference.InferenceSessionContainer;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiTypesUtil;
import com.intellij.psi.util.PsiUtil;
@@ -130,16 +129,14 @@ public class RedundantTypeArgsInspection extends GenericsInspectionToolBase {
}
}
else {
final PsiCall topLevelCall = InferenceSessionContainer.treeWalkUp(expression);
if (topLevelCall != null) {
final int offset = expression.getTextRange().getStartOffset() - topLevelCall.getTextRange().getStartOffset();
final PsiCall topLevelCopy = (PsiCall)topLevelCall.copy();
final PsiElement elementInCopy = topLevelCopy.getContainingFile().findElementAt(topLevelCopy.getTextRange().getStartOffset() + offset);
if (!isInferenceEquivalent(typeArguments, method, typeParameters, elementInCopy)) {
return;
}
final int offset = expression.getTextRange().getStartOffset();
final PsiFile containingFile = expression.getContainingFile();
final PsiFile fileCopy = (PsiFile)containingFile.copy();
final PsiElement elementInCopy = fileCopy.findElementAt(offset);
if (method.getContainingFile() == containingFile) {
method = PsiTreeUtil.getParentOfType(fileCopy.findElementAt(method.getTextOffset()), PsiMethod.class);
}
else {
if (!isInferenceEquivalent(typeArguments, method, typeParameters, elementInCopy)) {
return;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantTypeArgs/afterEnumConstant.java
+9
View File
@@ -0,0 +1,9 @@
// "Remove explicit type arguments" "true"
import java.util.Collections;
import java.util.List;
enum ExposeRemotely {
NEVER("never", Collections.emptyList());
ExposeRemotely(String name, List<String> keys) {}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantTypeArgs/beforeEnumConstant.java
+9
View File
@@ -0,0 +1,9 @@
// "Remove explicit type arguments" "true"
import java.util.Collections;
import java.util.List;
enum ExposeRemotely {
NEVER("never", Collections.<Str<caret>ing>emptyList());
ExposeRemotely(String name, List<String> keys) {}
}