From af4117c8d360ccc635f5ed337767160902078135 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Fri, 13 Apr 2012 17:44:42 +0400 Subject: [PATCH] assert JetJavaMirrorMaker cannot appear in resolve.java --- .../jet/lang/resolve/java/JavaClassOrPackageScope.java | 2 +- .../jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassOrPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassOrPackageScope.java index 705d86fb3e9..d4111144d85 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassOrPackageScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassOrPackageScope.java @@ -105,7 +105,7 @@ public abstract class JavaClassOrPackageScope extends JetScopeImpl { } if (psiClass instanceof JetJavaMirrorMarker) { - continue; + throw new IllegalStateException("JetJavaMirrorMaker is not possible in resolve.java, resolving: " + resolverScopeData.fqName); } // TODO: Temp hack for collection function descriptors from java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java index 82bcea7f4b9..07040b7be22 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java @@ -92,7 +92,7 @@ public class PsiClassFinderForJvm implements PsiClassFinder { } if (result instanceof JetJavaMirrorMarker) { - return null; + throw new IllegalStateException("JetJavaMirrorMaker is not possible in resolve.java, resolving: " + qualifiedName); } if (result == null) {