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

Rewrite Progression, Range, Unit to Kotlin

Browse Source 
Delete useless (by now) AssertInvisibleInResolver
This commit is contained in:
Alexander Udalov
2014-01-15 16:23:39 +04:00
parent d66c5b2fbe
commit d88f76f438
5 changed files with 23 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java
-19
View File
@@ -16,8 +16,6 @@
package org.jetbrains.jet.lang.resolve.java.resolver;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiField;
import com.intellij.psi.impl.JavaConstantExpressionEvaluator;
@@ -40,18 +38,12 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaFieldImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
import javax.inject.Inject;
import static org.jetbrains.jet.lang.resolve.BindingContext.*;
import static org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils.fqNameByClass;
public class TraceBasedJavaResolverCache implements JavaResolverCache {
private static final Logger LOG = Logger.getInstance(TraceBasedJavaResolverCache.class);
private static final FqName ASSERT_INVISIBLE_IN_RESOLVER_ANNOTATION = fqNameByClass(AssertInvisibleInResolver.class);
private BindingTrace trace;
@Inject
@@ -80,17 +72,6 @@ public class TraceBasedJavaResolverCache implements JavaResolverCache {
@Nullable
@Override
public ClassDescriptor getClass(@NotNull JavaClass javaClass) {
FqName fqName = javaClass.getFqName();
if (fqName != null && KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.equals(fqName.parent())) {
if (javaClass.findAnnotation(ASSERT_INVISIBLE_IN_RESOLVER_ANNOTATION) != null) {
if (ApplicationManager.getApplication().isInternal()) {
LOG.error("Classpath is configured incorrectly:" +
" class " + fqName + " from runtime must not be loaded by compiler");
}
return null;
}
}
return trace.get(CLASS, ((JavaClassImpl) javaClass).getPsi());
}