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

untie static methods in interface hierarchy (IDEA-118577)

Browse Source
This commit is contained in:
Anna Kozlova
2013-12-23 16:15:14 +04:00
parent 3d7a8fb300
commit 6565df2bab
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
View File

@@ -273,7 +273,12 @@ public class PsiSuperMethodImplUtil {
if (superClass != null) {
if (superClass.isInterface() ||
CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) {
if (superMethod.hasModifierProperty(PsiModifier.DEFAULT) || hierarchicalMethodSignature.getMethod().hasModifierProperty(PsiModifier.DEFAULT)) {
if (superMethod.hasModifierProperty(PsiModifier.STATIC) ||
hierarchicalMethodSignature.getMethod().hasModifierProperty(PsiModifier.STATIC)) {
return false;
}
if (superMethod.hasModifierProperty(PsiModifier.DEFAULT) ||
hierarchicalMethodSignature.getMethod().hasModifierProperty(PsiModifier.DEFAULT)) {
return !InheritanceUtil.isInheritorOrSelf(superClass, containingClass, true);
}
return true;

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/StaticMethods.java Normal file
View File

@@ -0,0 +1,8 @@
interface A
{
static void foo(){}
}
interface B extends A
{
static int foo(){ return 1; }
}

1
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Interface8MethodsHighlightingTest.java
View File

@@ -32,6 +32,7 @@ public class Interface8MethodsHighlightingTest extends LightDaemonAnalyzerTestCa
public void testThisAccessibility() { doTest(false, false); }
public void testStaticMethodCalls() { doTest(false, false); }
public void testDefaultMethodOverrideEquivalentObject() { doTest(false, false); }
public void testStaticMethods() { doTest(false, false); }
public void testDefaultSupersInStaticContext() {
doTest(false, false);
}