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

Minor, JavaClass#getOriginKind -> isKotlinLightClass

Browse Source
This commit is contained in:
Alexander Udalov
2016-03-17 18:36:01 +03:00
parent 0ba0e2b10d
commit 0a54464420
6 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.search.DelegatingGlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.asJava.KtJavaMirrorMarker;
import org.jetbrains.kotlin.idea.KotlinFileType;
import org.jetbrains.kotlin.load.java.structure.JavaClass;
import org.jetbrains.kotlin.load.java.structure.JavaPackage;
@@ -96,7 +97,7 @@ public class JavaClassFinderImpl implements JavaClassFinder {
throw new IllegalStateException("Requested " + fqName + ", got " + javaClass.getFqName());
}
if (javaClass.getOriginKind() == JavaClass.OriginKind.KOTLIN_LIGHT_CLASS) {
if (psiClass instanceof KtJavaMirrorMarker) {
throw new IllegalStateException("Kotlin light classes should not be found by JavaPsiFacade, resolving: " + fqName);
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java
+2 -12
View File
@@ -152,18 +152,8 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
}
@Override
@NotNull
public OriginKind getOriginKind() {
PsiClass psiClass = getPsi();
if (psiClass instanceof KtJavaMirrorMarker) {
return OriginKind.KOTLIN_LIGHT_CLASS;
}
else if (psiClass instanceof PsiCompiledElement) {
return OriginKind.COMPILED;
}
else {
return OriginKind.SOURCE;
}
public boolean isKotlinLightClass() {
return getPsi() instanceof KtJavaMirrorMarker;
}
@Nullable