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

static method calls should not be treated as inherited (IDEA-105021)

Browse Source
This commit is contained in:
anna
2013-04-11 16:22:44 +02:00
parent fc74d8740d
commit 38d197e704
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java
View File

@@ -172,11 +172,11 @@ public class HighlightNamesUtil {
if (method.isConstructor()) {
return isDeclaration ? HighlightInfoType.CONSTRUCTOR_DECLARATION : HighlightInfoType.CONSTRUCTOR_CALL;
}
if (isInheritedMethod) return HighlightInfoType.INHERITED_METHOD;
if (isDeclaration) return HighlightInfoType.METHOD_DECLARATION;
if (method.hasModifierProperty(PsiModifier.STATIC)) {
return HighlightInfoType.STATIC_METHOD;
}
if (isInheritedMethod) return HighlightInfoType.INHERITED_METHOD;
if(method.hasModifierProperty(PsiModifier.ABSTRACT)) {
return HighlightInfoType.ABSTRACT_METHOD;
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StaticMethodCalls.java Normal file
View File

@@ -0,0 +1,9 @@
class <symbolName descr="null">A</symbolName> {
static void <symbolName descr="null">foo</symbolName>(){}
}
class <symbolName descr="null">B</symbolName> extends <symbolName descr="null">A</symbolName> {
static {
<symbolName descr="null">A</symbolName>.<symbolName descr="null" type="STATIC_METHOD">foo</symbolName>();
<symbolName descr="null" type="STATIC_METHOD">foo</symbolName>();
}
}

3
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
View File

@@ -362,4 +362,7 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testExplicitConstructorInvocation() throws Exception { doTest(false, false); }
public void testThisInInterface() throws Exception { doTest(false, false); }
public void testInnerClassConstantReference() throws Exception { doTest(false, false); }
public void testStaticMethodCalls() throws Exception {
doTestFile(BASE_PATH + "/" + getTestName(false) + ".java").checkSymbolNames().test();
}
}