Fix ambiguity when KtUltraLightClass contains overrides

#KT-27987 Fixed
This commit is contained in:
Denis Zharkov
2018-11-06 16:37:51 +03:00
parent 234776820b
commit d74c12323f
6 changed files with 37 additions and 0 deletions
@@ -616,6 +616,8 @@ internal class KtUltraLightMethod(
list
}
override fun getHierarchicalMethodSignature() = PsiSuperMethodImplUtil.getHierarchicalMethodSignature(this)
override fun getThrowsList(): PsiReferenceList = _throwsList
}
@@ -0,0 +1,10 @@
package test;
class GenericOverrides {
public static void main(String[] args) {
KotlinClass b = new KotlinClass();
b.foo("");
}
}
@@ -0,0 +1,10 @@
// ALLOW_AST_ACCESS
package test
open class Parent {
open fun foo(x: String) {}
}
open class KotlinClass : Parent() {
override fun foo(x: String) {}
}
@@ -129,6 +129,11 @@ public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaA
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/MyFunctionType.kt");
}
@TestMetadata("OverridesAmbiguity.kt")
public void testOverridesAmbiguity() throws Exception {
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt");
}
@TestMetadata("ReturnInnerClasses.kt")
public void testReturnInnerClasses() throws Exception {
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
@@ -131,6 +131,11 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/MyFunctionType.kt");
}
@TestMetadata("OverridesAmbiguity.kt")
public void testOverridesAmbiguity() throws Exception {
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt");
}
@TestMetadata("ReturnInnerClasses.kt")
public void testReturnInnerClasses() throws Exception {
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
@@ -131,6 +131,11 @@ public class JavaAgainstKotlinSourceCheckerWithUltraLightTestGenerated extends A
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/MyFunctionType.kt");
}
@TestMetadata("OverridesAmbiguity.kt")
public void testOverridesAmbiguity() throws Exception {
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/OverridesAmbiguity.kt");
}
@TestMetadata("ReturnInnerClasses.kt")
public void testReturnInnerClasses() throws Exception {
runTest("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");