Simplify 'suppressDiagnosticsInDebugMode'

In the new evaluator, suppressDiagnosticsInDebugMode is never set, and effectively the only check is that if a particular file is a KtCodeFragment.
This commit is contained in:
Yan Zhulanow
2019-02-05 19:57:22 +03:00
parent 6cb2146d31
commit b9f76683dd
4 changed files with 6 additions and 12 deletions
@@ -32,11 +32,7 @@ import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityUtilsKt;
import org.jetbrains.kotlin.metadata.jvm.deserialization.ModuleMapping;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.Call;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.psi.KtFunction;
import org.jetbrains.kotlin.psi.KtSuperTypeListEntry;
import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilKt;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
@@ -256,7 +252,7 @@ public class JvmCodegenUtil {
}
}
return file instanceof KtFile && CodeFragmentUtilKt.getSuppressDiagnosticsInDebugMode((KtFile) file);
return file instanceof KtCodeFragment;
}
@Nullable
@@ -18,8 +18,7 @@ package org.jetbrains.kotlin.idea.debugger
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode
import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.resolve.diagnostics.DiagnosticSuppressor
class DiagnosticSuppressorForDebugger : DiagnosticSuppressor {
@@ -27,7 +26,7 @@ class DiagnosticSuppressorForDebugger : DiagnosticSuppressor {
val element = diagnostic.psiElement
val containingFile = element.containingFile
if (containingFile is KtFile && containingFile.suppressDiagnosticsInDebugMode) {
if (containingFile is KtCodeFragment) {
val diagnosticFactory = diagnostic.factory
return diagnosticFactory == Errors.UNSAFE_CALL
}
@@ -23,8 +23,8 @@ import org.jetbrains.kotlin.load.java.lazy.types.toAttributes
import org.jetbrains.kotlin.load.java.structure.classId
import org.jetbrains.kotlin.load.kotlin.internalName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode
import org.jetbrains.kotlin.resolve.DescriptorFactory
import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
@@ -82,7 +82,7 @@ private class DebuggerFieldSyntheticScope(val javaSyntheticPropertiesScope: Java
return false
}
return containingFile.suppressDiagnosticsInDebugMode
return containingFile is KtCodeFragment
}
private fun getSyntheticPropertiesForClass(clazz: ClassDescriptor): Collection<PropertyDescriptor> {
@@ -149,7 +149,6 @@ fun PsiElement.isInJavaSourceRoot(): Boolean =
fun KtFile.createTempCopy(text: String? = null): KtFile {
val tmpFile = KtPsiFactory(this).createAnalyzableFile(name, text ?: this.text ?: "", this)
tmpFile.originalFile = this
tmpFile.suppressDiagnosticsInDebugMode = suppressDiagnosticsInDebugMode
return tmpFile
}