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

Rendering flexible types with "!" and optional parts

Browse Source
This commit is contained in:
Andrey Breslav
2014-08-07 16:29:12 +04:00
parent c2a03d60f0
commit bdf7e924b5
4 changed files with 171 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+46 -2
View File
@@ -301,9 +301,14 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
}
return "???";
}
if (type instanceof FlexibleType && debugMode) {
if (type instanceof FlexibleType) {
FlexibleType flexibleType = (FlexibleType) type;
return "(" + renderType(flexibleType.getLowerBound()) + ".." + renderType(flexibleType.getUpperBound()) + ")";
if (!debugMode) {
return renderFlexibleType(flexibleType);
}
else {
return "(" + renderType(flexibleType.getLowerBound()) + ".." + renderType(flexibleType.getUpperBound()) + ")";
}
}
if (type instanceof LazyType && debugMode) {
return type.toString();
@@ -317,6 +322,45 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
return renderDefaultType(type);
}
@NotNull
private String renderFlexibleType(@NotNull FlexibleType type) {
JetType lower = type.getLowerBound();
JetType upper = type.getUpperBound();
String lowerRendered = renderDefaultType(lower);
String upperRendered = renderDefaultType(upper);
if (differsOnlyInNullability(lowerRendered, upperRendered)) {
return lowerRendered + "!";
}
String kotlinPrefix = "kotlin.";
String mutablePrefix = "Mutable";
// e.g. lower = kotlin.MutableList<Foo>, upper = kotlin.List<Foo?>?
if (lowerRendered.startsWith(kotlinPrefix + mutablePrefix)) {
// List<Foo>
String lowerWithoutPrefix = lowerRendered.substring(mutablePrefix.length() + kotlinPrefix.length());
if (differsOnlyInNullability(lowerWithoutPrefix, upperRendered.substring(kotlinPrefix.length()))) {
return kotlinPrefix + "(" + mutablePrefix + ")" + lowerWithoutPrefix + "!";
}
}
else {
String arrayPrefix = "kotlin.Array<";
String covariantArrayPrefix = "kotlin.Array<out ";
if (lowerRendered.startsWith(arrayPrefix) && upperRendered.startsWith(covariantArrayPrefix)) {
String lowerWithoutPrefix = lowerRendered.substring(arrayPrefix.length());
if (differsOnlyInNullability(lowerWithoutPrefix, upperRendered.substring(covariantArrayPrefix.length()))) {
return arrayPrefix + "(out) " + lowerWithoutPrefix + "!";
}
}
}
return "(" + renderType(lower) + ".." + renderType(upper) + ")";
}
private static boolean differsOnlyInNullability(String lower, String upper) {
return lower.equals(upper.replace("?", "")) || upper.endsWith("?") && (lower + "?").equals(upper);
}
@NotNull
@Override
public String renderTypeArguments(@NotNull List<TypeProjection> typeArguments) {