hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Fix scope of static interface methods

Browse Source
This commit is contained in:
Clément Fournier
2023-05-03 21:50:18 +02:00
parent da54727f4c
commit 838caff522
2 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/internal/JavaResolvers.java
View File

@ -128,9 +128,17 @@ public final class JavaResolvers {
return t.streamMethods(
it -> it.nameEquals(simpleName)
&& isAccessibleIn(nestRoot, it, true) // fetch protected methods
&& isNotStaticInterfaceMethod(it)
).collect(OverloadSet.collectMostSpecific(t)); // remove overridden, hidden methods
}
// Static interface methods are not inherited and are in fact not in scope in the subtypes.
// They must be explicitly qualified or imported.
private boolean isNotStaticInterfaceMethod(JMethodSymbol it) {
return !it.isStatic() || it.getEnclosingClass() == t.getSymbol()
|| !it.getEnclosingClass().isInterface();
}
@Override
public String toString() {
return "methods of " + t;

53
pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/MemberInheritanceTest.kt
View File

@ -15,10 +15,7 @@ import net.sourceforge.pmd.lang.ast.test.component8
import net.sourceforge.pmd.lang.ast.test.shouldMatchN
import net.sourceforge.pmd.lang.java.ast.*
import net.sourceforge.pmd.lang.java.symbols.table.coreimpl.ShadowChain
import net.sourceforge.pmd.lang.java.types.JClassType
import net.sourceforge.pmd.lang.java.types.JVariableSig
import net.sourceforge.pmd.lang.java.types.shouldHaveType
import net.sourceforge.pmd.lang.java.types.typeDsl
import net.sourceforge.pmd.lang.java.types.*
@Suppress("UNUSED_VARIABLE")
class MemberInheritanceTest : ParserTestSpec({
@ -765,4 +762,52 @@ class Top {
importedMethodCall.methodType.symbol shouldBe importedMethodSym
}
parserTest("Static methods of interfaces are not in scope in subclasses") {
// This is what allows the import below to not be shadowed by the inherited declaration
// This was tested with javac. The intellij compiler doesn't understand this code.
val acu = parser.withProcessing().parse("""
package p;
import static p.Top2.foo;
class Klass implements Top {
static {
foo(); // This is Top2.foo
}
static class Child {
{
foo(); // This is also Top2.foo
}
}
}
interface Top {
static void foo() {}
static void bar() {
foo(); // just test that this is not the import
}
}
interface Top2 {
static void foo() {}
}
""")
val (fooInTop1, _, fooInTop2) = acu.methodDeclarations().toList()
val (call1, call2, callInBar) = acu.methodCalls().crossFindBoundaries().toList()
withClue(call1) {
call1.methodType.symbol shouldBe fooInTop2.symbol
}
withClue(call2) {
call2.methodType.symbol shouldBe fooInTop2.symbol
}
withClue(callInBar) {
callInBar.methodType.symbol shouldBe fooInTop1.symbol
}
}
})