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

Refactoring: remove warning and use constant

Browse Source
This commit is contained in:
Nikolay Krasko
2013-01-15 17:59:48 +04:00
parent 303a613389
commit fa08289706
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderImpl.java
+8 -5
View File
@@ -30,6 +30,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetFileType;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
@@ -85,8 +86,9 @@ public class PsiClassFinderImpl implements PsiClassFinder {
PsiClass original = javaFacade.findClass(qualifiedName.getFqName(), javaSearchScope); PsiClass original = javaFacade.findClass(qualifiedName.getFqName(), javaSearchScope);
if (original != null) { if (original != null) {
FqName actualQualifiedName = new FqName(original.getQualifiedName()); String classQualifiedName = original.getQualifiedName();
if (!actualQualifiedName.equals(qualifiedName)) { FqName actualQualifiedName = classQualifiedName != null ? new FqName(classQualifiedName) : null;
if (!qualifiedName.equals(actualQualifiedName)) {
throw new IllegalStateException("requested " + qualifiedName + ", got " + actualQualifiedName); throw new IllegalStateException("requested " + qualifiedName + ", got " + actualQualifiedName);
} }
} }
@@ -99,9 +101,10 @@ public class PsiClassFinderImpl implements PsiClassFinder {
return null; return null;
} }
if ("jet".equals(qualifiedName.parent().getFqName())) { if (KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.equals(qualifiedName.parent())) {
PsiAnnotation assertInvisibleAnnotation = PsiAnnotation assertInvisibleAnnotation = JavaAnnotationResolver.findOwnAnnotation(
JavaAnnotationResolver.findOwnAnnotation(original, JvmStdlibNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName().getFqName()); original, JvmStdlibNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName().getFqName());
if (assertInvisibleAnnotation != null) { if (assertInvisibleAnnotation != null) {
if (runtimeClassesHandleMode == RuntimeClassesHandleMode.IGNORE) { if (runtimeClassesHandleMode == RuntimeClassesHandleMode.IGNORE) {
return null; return null;