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

Rename KotlinBuiltIns.isAny -> isAnyOrNullableAny

Browse Source 
Reduce confusion, prevent bugs
This commit is contained in:
Alexander Udalov
2013-12-11 18:03:20 +04:00
parent 0576851102
commit cc1d4a033a
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+1 -1
View File
@@ -939,7 +939,7 @@ public class KotlinBuiltIns {
&& type.getConstructor() == getNothing().getTypeConstructor();
}
public boolean isAny(@NotNull JetType type) {
public boolean isAnyOrNullableAny(@NotNull JetType type) {
return !(type instanceof NamespaceType) &&
type.getConstructor() == getAny().getTypeConstructor();
}
core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+2 -1
View File
@@ -636,7 +636,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
if (!klass.equals(KotlinBuiltIns.getInstance().getNothing())) {
Collection<JetType> supertypes = klass.getTypeConstructor().getSupertypes();
if (supertypes.isEmpty() || !alwaysRenderAny && supertypes.size() == 1 && KotlinBuiltIns.getInstance().isAny(supertypes.iterator().next())) {
if (supertypes.isEmpty() || !alwaysRenderAny && supertypes.size() == 1 && KotlinBuiltIns.getInstance().isAnyOrNullableAny(
supertypes.iterator().next())) {
}
else {
builder.append(" : ");