Replaced hard exception with LOG.error.
This commit is contained in:
@@ -26,7 +26,7 @@ import java.util.List;
|
||||
|
||||
public interface PsiClassFinder {
|
||||
enum RuntimeClassesHandleMode {
|
||||
THROW,
|
||||
REPORT_ERROR,
|
||||
IGNORE,
|
||||
}
|
||||
|
||||
|
||||
+15
-10
@@ -18,6 +18,8 @@ package org.jetbrains.jet.lang.resolve.java;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.intellij.openapi.application.ApplicationManager;
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Comparing;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
@@ -39,6 +41,7 @@ import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public class PsiClassFinderImpl implements PsiClassFinder {
|
||||
private static final Logger LOG = Logger.getInstance(PsiClassFinderImpl.class);
|
||||
|
||||
@NotNull
|
||||
private Project project;
|
||||
@@ -106,17 +109,19 @@ public class PsiClassFinderImpl implements PsiClassFinder {
|
||||
original, JvmStdlibNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName().getFqName());
|
||||
|
||||
if (assertInvisibleAnnotation != null) {
|
||||
if (runtimeClassesHandleMode == RuntimeClassesHandleMode.IGNORE) {
|
||||
return null;
|
||||
}
|
||||
else if (runtimeClassesHandleMode == RuntimeClassesHandleMode.THROW) {
|
||||
throw new IllegalStateException(
|
||||
"classpath is configured incorrectly:" +
|
||||
" class " + qualifiedName + " from runtime must not be loaded by compiler");
|
||||
}
|
||||
else {
|
||||
throw new IllegalStateException("unknown parameter value: " + runtimeClassesHandleMode);
|
||||
switch (runtimeClassesHandleMode) {
|
||||
case IGNORE:
|
||||
break;
|
||||
case REPORT_ERROR:
|
||||
if (ApplicationManager.getApplication().isInternal()) {
|
||||
LOG.error("classpath is configured incorrectly:" +
|
||||
" class " + qualifiedName + " from runtime must not be loaded by compiler");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("unknown parameter value: " + runtimeClassesHandleMode);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -167,7 +167,7 @@ public final class JavaClassResolver {
|
||||
}
|
||||
|
||||
private ClassDescriptor doResolveClass(@NotNull FqName qualifiedName, @NotNull PostponedTasks tasks) {
|
||||
PsiClass psiClass = psiClassFinder.findPsiClass(qualifiedName, PsiClassFinder.RuntimeClassesHandleMode.THROW);
|
||||
PsiClass psiClass = psiClassFinder.findPsiClass(qualifiedName, PsiClassFinder.RuntimeClassesHandleMode.REPORT_ERROR);
|
||||
if (psiClass == null) {
|
||||
cacheNegativeValue(javaClassToKotlinFqName(qualifiedName));
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user