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

(no message)

Browse Source
This commit is contained in:
Alexey Kudravtsev
2005-02-15 18:47:06 +03:00
parent 25f54c3d96
commit 886b599dd4
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
+13 -22
View File
@@ -27,7 +27,7 @@ import java.text.MessageFormat;
import java.util.*;
public class HighlightMethodUtil {
static final String WRONG_METHOD_ARGUMENTS = "''{0}'' in ''{1}'' cannot be applied to ''{2}''";
private static final String WRONG_METHOD_ARGUMENTS = "''{0}'' in ''{1}'' cannot be applied to ''{2}''";
public static final String EXCEPTION_NEVER_THROWN_IN_METHOD = "Exception ''{0}'' is never thrown in the method";
private static final String CANNOT_RESOLVE_METHOD = "Cannot resolve method ''{0}''";
private static final String INCOMPATIBLE_RETURN_TYPE = "attempting to use incompatible return type";
@@ -43,14 +43,13 @@ public class HighlightMethodUtil {
if (showContainingClasses) {
pattern += " in ''{3}''";
}
String message = MessageFormat.format(pattern,
new Object[]{
HighlightUtil.formatMethod(method1),
HighlightUtil.formatMethod(method2),
HighlightUtil.formatClass(method1.getContainingClass()),
HighlightUtil.formatClass(method2.getContainingClass())
});
return message;
return MessageFormat.format(pattern,
new Object[]{
HighlightUtil.formatMethod(method1),
HighlightUtil.formatMethod(method2),
HighlightUtil.formatClass(method1.getContainingClass()),
HighlightUtil.formatClass(method2.getContainingClass())
});
}
//@top
@@ -353,8 +352,8 @@ public class HighlightMethodUtil {
//@top
public static HighlightInfo checkMethodCall(PsiMethodCallExpression methodCall,
PsiExpressionList list,
PsiResolveHelper resolveHelper) {
PsiExpressionList list = methodCall.getArgumentList();
PsiReferenceExpression referenceToMethod = methodCall.getMethodExpression();
final ResolveResult resolveResult = referenceToMethod.advancedResolve(true);
final PsiElement element = resolveResult.getElement();
@@ -367,10 +366,7 @@ public class HighlightMethodUtil {
if (!(constructor instanceof PsiMethod)) {
final String description = MessageFormat.format("Call to ''{0}()'' allowed in constructor only",
new Object[]{referenceToMethod.getReferenceName()});
HighlightInfo errorResult = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR,
methodCall,
description);
return errorResult;
return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, methodCall, description);
}
if (list.getExpressions().length == 0) { // implicit ctr call
final CandidateInfo[] candidates = resolveHelper.getReferencedMethodCandidates(methodCall, true);
@@ -412,8 +408,6 @@ public class HighlightMethodUtil {
if (!resolveResult.isAccessible() || !resolveResult.isStaticsScopeCorrect()) {
// check for ambiguous method call
String methodName = referenceToMethod.getReferenceName();
methodName += HighlightUtil.buildArgTypesList(list);
final ResolveResult[] resolveResults = referenceToMethod.multiResolve(true);
MethodCandidateInfo methodCandidate1 = null;
@@ -470,6 +464,7 @@ public class HighlightMethodUtil {
elementToHighlight = referenceToMethod.getReferenceNameElement();
}
else {
String methodName = referenceToMethod.getReferenceName() + HighlightUtil.buildArgTypesList(list);
description = MessageFormat.format(CANNOT_RESOLVE_METHOD, new Object[]{methodName});
if (candidateList.size() == 0) {
elementToHighlight = referenceToMethod.getReferenceNameElement();
@@ -568,7 +563,7 @@ public class HighlightMethodUtil {
HighlightInfo highlightInfo) {
for (int i = 0; i < methodCandidates.length; i++) {
ResolveResult methodCandidate = methodCandidates[i];
PsiMethod method = ((PsiMethod)methodCandidate.getElement());
PsiMethod method = (PsiMethod)methodCandidate.getElement();
if (!methodCandidate.isAccessible() && PsiUtil.isApplicable(method, methodCandidate.getSubstitutor(), exprList)) {
HighlightUtil.registerAccessQuickFixAction(method, methodCall.getMethodExpression(), highlightInfo);
}
@@ -792,7 +787,6 @@ public class HighlightMethodUtil {
static HighlightInfo checkConstructorCallMustBeFirstStatement(PsiReferenceExpression expression) {
final String text = expression.getText();
if (!PsiKeyword.THIS.equals(text) && !PsiKeyword.SUPER.equals(text)) return null;
if (!(expression.getParent() instanceof PsiMethodCallExpression)) return null;
final PsiElement codeBlock = PsiUtil.getTopLevelEnclosingCodeBlock(expression, null);
if (new PsiMatcherImpl(expression)
.parent(PsiMatcherImpl.hasClass(PsiMethodCallExpression.class))
@@ -1200,10 +1194,7 @@ public class HighlightMethodUtil {
public static HighlightInfo checkRecursiveConstructorInvocation(PsiMethod method) {
if (HighlightControlFlowUtil.isRecursivelyCalledConstructor(method)) {
TextRange textRange = HighlightUtil.getMethodDeclarationTextRange(method);
final HighlightInfo highlightInfo = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR,
textRange,
"Recursive constructor invocation");
return highlightInfo;
return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, textRange, "Recursive constructor invocation");
}
return null;
}
source/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
+3 -5
View File
@@ -533,13 +533,8 @@ public class HighlightVisitorImpl extends PsiElementVisitor implements Highlight
}
public void visitMethodCallExpression(PsiMethodCallExpression expr) {
PsiExpressionList list = expr.getArgumentList();
final PsiReferenceExpression methodExpression = expr.getMethodExpression();
methodExpression.accept(this);
if (!myHolder.hasErrorResults()) {
myHolder.add(HighlightMethodUtil.checkMethodCall(expr, list, myResolveHelper));
}
if (!myHolder.hasErrorResults()) myHolder.add(GenericsHighlightUtil.checkEnumSuperConstructorCall(expr));
if (!myHolder.hasErrorResults()) visitExpression(expr);
}
@@ -805,6 +800,9 @@ public class HighlightVisitorImpl extends PsiElementVisitor implements Highlight
if (!myHolder.hasErrorResults()) myHolder.add(HighlightControlFlowUtil.checkFinalVariableInitalizedInLoop(expression, resolved));
}
}
else if (expression.getParent() instanceof PsiMethodCallExpression) {
myHolder.add(HighlightMethodUtil.checkMethodCall((PsiMethodCallExpression)expression.getParent(), myResolveHelper));
}
if (!myHolder.hasErrorResults()) myHolder.add(HighlightUtil.checkExpressionRequired(expression));
if (!myHolder.hasErrorResults() && resolved instanceof PsiField) {
myHolder.add(HighlightUtil.checkIllegalForwardReferenceToField(expression, (PsiField)resolved));