jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-05 08:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix JavaClassifierType.getTypeArguments impls

Browse Source 
Make them return arguments both for current classifier and for the outer one
This commit is contained in:
Denis Zharkov
2015-11-03 18:17:28 +03:00
parent 910718ff45
commit c5103f9ac4
11 changed files with 102 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.txt vendored
View File

@@ -5,7 +5,7 @@ public interface ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B : kotlin.Any!> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B : kotlin.Any!>()
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner {
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super<B!>.Inner {
public/*package*/ constructor Inner()
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
}

1
compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.java vendored
View File

@@ -8,6 +8,7 @@ public interface WrongNumberOfGenericParameters {
Zero<String> z();
One o0();
// Our Java resolve supposes that return type has exactly one argument
One<String, String> o2();
// This does not produce the expected result, because IDEA thinks Two<X> is a raw type

2
compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt vendored
View File

@@ -2,7 +2,7 @@ package test
public interface WrongNumberOfGenericParameters {
public abstract fun o0(): test.WrongNumberOfGenericParameters.One<(raw) kotlin.Any!>!
public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>!
public abstract fun o2(): test.WrongNumberOfGenericParameters.One<kotlin.String!>!
public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<(raw) kotlin.Any!, (raw) kotlin.Any!>!
public abstract fun z(): test.WrongNumberOfGenericParameters.Zero!