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

Fix flexible type rendering

Browse Source 
Do not append "!" if bounds have same nullability
This commit is contained in:
Denis Zharkov
2015-06-18 10:28:36 +03:00
parent 64866183f7
commit a6a099b0f5
7 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface InheritNotVararg {
public interface Sub : test.InheritNotVararg.Super { public interface Sub : test.InheritNotVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: (kotlin.Array<kotlin.String!>?..kotlin.Array<out kotlin.String!>?)): kotlin.Unit public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>?): kotlin.Unit
} }
public interface Super { public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface InheritNotVarargInteger {
public interface Sub : test.InheritNotVarargInteger.Super { public interface Sub : test.InheritNotVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: (kotlin.Array<kotlin.Int!>?..kotlin.Array<out kotlin.Int!>?)): kotlin.Unit public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.Int!>?): kotlin.Unit
} }
public interface Super { public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface InheritNotVarargNotNull {
public interface Sub : test.InheritNotVarargNotNull.Super { public interface Sub : test.InheritNotVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: (kotlin.Array<kotlin.String!>?..kotlin.Array<out kotlin.String!>?)): kotlin.Unit public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<(out) kotlin.String!>?): kotlin.Unit
} }
public interface Super { public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface InheritVararg {
public interface Sub : test.InheritVararg.Super { public interface Sub : test.InheritVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>*/): kotlin.Unit
} }
public interface Super { public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface InheritVarargInteger {
public interface Sub : test.InheritVarargInteger.Super { public interface Sub : test.InheritVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<(out) kotlin.Int!>!*/): kotlin.Unit public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<(out) kotlin.Int!>*/): kotlin.Unit
} }
public interface Super { public interface Super {
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface InheritVarargNotNull {
public interface Sub : test.InheritVarargNotNull.Super { public interface Sub : test.InheritVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>*/): kotlin.Unit
} }
public interface Super { public interface Super {
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+7 -2
View File
@@ -870,8 +870,13 @@ internal class DescriptorRendererImpl(
private fun replacePrefixes(lowerRendered: String, lowerPrefix: String, upperRendered: String, upperPrefix: String, foldedPrefix: String): String? { private fun replacePrefixes(lowerRendered: String, lowerPrefix: String, upperRendered: String, upperPrefix: String, foldedPrefix: String): String? {
if (lowerRendered.startsWith(lowerPrefix) && upperRendered.startsWith(upperPrefix)) { if (lowerRendered.startsWith(lowerPrefix) && upperRendered.startsWith(upperPrefix)) {
val lowerWithoutPrefix = lowerRendered.substring(lowerPrefix.length()) val lowerWithoutPrefix = lowerRendered.substring(lowerPrefix.length())
if (differsOnlyInNullability(lowerWithoutPrefix, upperRendered.substring(upperPrefix.length()))) { val upperWithoutPrefix = upperRendered.substring(upperPrefix.length())
return foldedPrefix + lowerWithoutPrefix + "!" val flexibleCollectionName = foldedPrefix + lowerWithoutPrefix
if (lowerWithoutPrefix == upperWithoutPrefix) return flexibleCollectionName
if (differsOnlyInNullability(lowerWithoutPrefix, upperWithoutPrefix)) {
return flexibleCollectionName + "!"
} }
} }
return null return null