azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR Java: don't add type parameter bounds multiple times

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-11-11 14:05:58 +03:00
parent a18da68171
commit db11c14fee
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+3 -1
View File
@@ -146,7 +146,9 @@ class JavaSymbolProvider(
.map { it.toFirTypeParameter(stack) } .map { it.toFirTypeParameter(stack) }
.also { .also {
it.forEachIndexed { index, typeParameter -> it.forEachIndexed { index, typeParameter ->
typeParameter.addBounds(this[index], stack) if (typeParameter.bounds.isEmpty()) {
typeParameter.addBounds(this[index], stack)
}
} }
} }
} }
compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public final class ClassWithTypePP<P, Q : R|P|, R|P|> : R|kotlin/Any| { public final class ClassWithTypePP<P, Q : R|P|> : R|kotlin/Any| {
public constructor<P, Q : R|P|, R|P|>(): R|test/ClassWithTypePP<P, Q>| public constructor<P, Q : R|P|>(): R|test/ClassWithTypePP<P, Q>|
} }
compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public open class ClassWithTypePRefNext<R : R|kotlin/collections/MutableIterable<P>|, R|kotlin/collections/MutableIterable<P>|, P> : R|kotlin/Any| { public open class ClassWithTypePRefNext<R : R|kotlin/collections/MutableIterable<P>|, P> : R|kotlin/Any| {
public constructor<R : R|kotlin/collections/MutableIterable<P>|, R|kotlin/collections/MutableIterable<P>|, P>(): R|test/ClassWithTypePRefNext<R, P>| public constructor<R : R|kotlin/collections/MutableIterable<P>|, P>(): R|test/ClassWithTypePRefNext<R, P>|
} }
compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public final class ClassWithTypePRefSelf<P : R|kotlin/Enum<P>|, R|kotlin/Enum<P>|> : R|kotlin/Any| { public final class ClassWithTypePRefSelf<P : R|kotlin/Enum<P>|> : R|kotlin/Any| {
public constructor<P : R|kotlin/Enum<P>|, R|kotlin/Enum<P>|>(): R|test/ClassWithTypePRefSelf<P>| public constructor<P : R|kotlin/Enum<P>|>(): R|test/ClassWithTypePRefSelf<P>|
} }
compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|, R|test/ClassWithTypePRefSelfAndClass<P>|> : R|kotlin/Any| { public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|> : R|kotlin/Any| {
public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>|, R|test/ClassWithTypePRefSelfAndClass<P>|>(): R|test/ClassWithTypePRefSelfAndClass<P>| public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
} }