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

Better handling of PackageTypes in KotlinBuiltIns

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-19 19:27:21 +04:00
parent a05c8a3d96
commit 7bce9060e2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+4 -2
View File
@@ -727,7 +727,8 @@ public class KotlinBuiltIns {
} }
public boolean isFunctionType(@NotNull JetType type) { public boolean isFunctionType(@NotNull JetType type) {
if (!(type instanceof PackageType) && setContainsClassOf(functionClassesSet, type)) return true; if (type instanceof PackageType) return false;
if (setContainsClassOf(functionClassesSet, type)) return true;
for (JetType superType : type.getConstructor().getSupertypes()) { for (JetType superType : type.getConstructor().getSupertypes()) {
if (isFunctionType(superType)) return true; if (isFunctionType(superType)) return true;
@@ -742,7 +743,8 @@ public class KotlinBuiltIns {
} }
public boolean isExtensionFunctionType(@NotNull JetType type) { public boolean isExtensionFunctionType(@NotNull JetType type) {
if (!(type instanceof PackageType) && setContainsClassOf(extensionFunctionClassesSet, type)) return true; if (type instanceof PackageType) return false;
if (setContainsClassOf(extensionFunctionClassesSet, type)) return true;
for (JetType superType : type.getConstructor().getSupertypes()) { for (JetType superType : type.getConstructor().getSupertypes()) {
if (isExtensionFunctionType(superType)) return true; if (isExtensionFunctionType(superType)) return true;