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

static import: postpone @deprecated methods if possible; show deprecated if all/acceptable is deprecated (IDEA-98350)

Browse Source
This commit is contained in:
anna
2013-04-25 16:43:41 +02:00
parent aa806544c2
commit 92f0e1b91f
2 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java
View File

@@ -43,16 +43,13 @@ import com.intellij.util.ArrayUtilRt;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.ObjectUtils;
import com.intellij.util.Processor;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.*;
import java.util.List;
import java.util.Set;
public class StaticImportMethodFix implements IntentionAction {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.StaticImportMethodFix");
@@ -163,12 +160,36 @@ public class StaticImportMethodFix implements IntentionAction {
final List<PsiMethod> list = new ArrayList<PsiMethod>();
if (name == null) return list;
GlobalSearchScope scope = element.getResolveScope();
final Map<PsiClass, Boolean> possibleClasses = new HashMap<PsiClass, Boolean>();
final PsiType expectedType = getExpectedType();
final List<PsiMethod> applicableList = new ArrayList<PsiMethod>();
final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(element.getProject()).getResolveHelper();
final Map<PsiClass, PsiMethod> deprecated = new HashMap<PsiClass, PsiMethod>();
class RegisterMethodsProcessor {
private void registerMethod(PsiClass containingClass, PsiMethod method) {
final Boolean alreadyMentioned = possibleClasses.get(containingClass);
if (alreadyMentioned == Boolean.TRUE) return;
if (alreadyMentioned == null) {
list.add(method);
possibleClasses.put(containingClass, false);
}
PsiSubstitutor substitutorForMethod = resolveHelper
.inferTypeArguments(method.getTypeParameters(), method.getParameterList().getParameters(),
argumentList.getExpressions(),
PsiSubstitutor.EMPTY, element.getParent(), DefaultParameterTypeInferencePolicy.INSTANCE);
if (PsiUtil.isApplicable(method, substitutorForMethod, argumentList)) {
final PsiType returnType = substitutorForMethod.substitute(method.getReturnType());
if (expectedType == null || returnType == null || TypeConversionUtil.isAssignable(expectedType, returnType)) {
applicableList.add(method);
possibleClasses.put(containingClass, true);
}
}
}
}
final RegisterMethodsProcessor registrar = new RegisterMethodsProcessor();
cache.processMethodsWithName(name, scope, new Processor<PsiMethod>() {
private final Set<PsiClass> myPossibleClasses = new HashSet<PsiClass>();
@Override
public boolean process(PsiMethod method) {
ProgressManager.checkCanceled();
@@ -180,21 +201,24 @@ public class StaticImportMethodFix implements IntentionAction {
//do not show methods from default package
&& !((PsiJavaFile)file).getPackageName().isEmpty()
&& PsiUtil.isAccessible(method, element, containingClass)) {
if (!myPossibleClasses.add(containingClass)) return true;
list.add(method);
PsiSubstitutor substitutorForMethod = resolveHelper
.inferTypeArguments(method.getTypeParameters(), method.getParameterList().getParameters(), argumentList.getExpressions(),
PsiSubstitutor.EMPTY, element.getParent(), DefaultParameterTypeInferencePolicy.INSTANCE);
if (PsiUtil.isApplicable(method, substitutorForMethod, argumentList)) {
final PsiType returnType = substitutorForMethod.substitute(method.getReturnType());
if (expectedType == null || returnType == null || TypeConversionUtil.isAssignable(expectedType, returnType)) {
applicableList.add(method);
}
if (method.isDeprecated()) {
deprecated.put(containingClass, method);
return processCondition();
}
registrar.registerMethod(containingClass, method);
}
return (applicableList.isEmpty() ? list : applicableList).size() < 50;
return processCondition();
}
private boolean processCondition() {
return (applicableList.isEmpty() ? list : applicableList).size() + deprecated.size() < 50;
}
});
for (Map.Entry<PsiClass, PsiMethod> deprecatedMethod : deprecated.entrySet()) {
registrar.registerMethod(deprecatedMethod.getKey(), deprecatedMethod.getValue());
}
List<PsiMethod> result = applicableList.isEmpty() ? list : applicableList;
for (int i = result.size() - 1; i >= 0; i--) {
ProgressManager.checkCanceled();

22
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod/beforeInacceptable.java Normal file
View File

@@ -0,0 +1,22 @@
// "Static Import Method 'foo.B.aaaaaaa'" "false"
package foo;
public class X {
{
foo(1, 2, <caret>aaaaaaa(""));
}
void foo(Integer... p) {}
}
class B {
@Deprecated
public static Integer aaaaaaa(String s, String b) {
return 1;
}
}
class B1 {
public static String aaaaaaa(String s) {
return "";
}
}