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

Not loading SAM constructors for FunctionN classes.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-05-07 17:31:09 +04:00
parent d56494ebd3
commit cb2f24b1cc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java
+6 -1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.prop.PropertyNameUtils;
import org.jetbrains.jet.lang.resolve.java.prop.PropertyParseResult; import org.jetbrains.jet.lang.resolve.java.prop.PropertyParseResult;
import org.jetbrains.jet.lang.resolve.java.wrapper.*; import org.jetbrains.jet.lang.resolve.java.wrapper.*;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@@ -126,7 +127,7 @@ public final class MembersCache {
if (JetClassAnnotation.get(psiClass).kind() == JvmStdlibNames.FLAG_CLASS_KIND_OBJECT) { if (JetClassAnnotation.get(psiClass).kind() == JvmStdlibNames.FLAG_CLASS_KIND_OBJECT) {
processObjectClass(psiClass); processObjectClass(psiClass);
} }
if (!DescriptorResolverUtils.isKotlinClass(psiClass) && isSamInterface(psiClass)) { if (isSamInterface(psiClass)) {
processSamInterface(psiClass); processSamInterface(psiClass);
} }
} }
@@ -404,6 +405,10 @@ public final class MembersCache {
if (DescriptorResolverUtils.isKotlinClass(psiClass)) { if (DescriptorResolverUtils.isKotlinClass(psiClass)) {
return false; return false;
} }
String qualifiedName = psiClass.getQualifiedName();
if (qualifiedName == null || qualifiedName.startsWith(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.getFqName() + ".")) {
return false;
}
if (!psiClass.isInterface() || psiClass.isAnnotationType()) { if (!psiClass.isInterface() || psiClass.isAnnotationType()) {
return false; return false;
} }
idea/testData/completion/basic/java/PropertyMetadata.kt
+1 -1
View File
@@ -8,4 +8,4 @@ fun firstFun() {
// TIME: 1 // TIME: 1
// EXIST: PropertyMetadata@PropertyMetadata~(jet) // EXIST: PropertyMetadata@PropertyMetadata~(jet)
// EXIST: PropertyMetadataImpl@PropertyMetadataImpl~(jet) // EXIST: PropertyMetadataImpl@PropertyMetadataImpl~(jet)
// NUMBER: 5 // NUMBER: 4