From b709baa9b4a0cbb38c67824ba5ad8de87161521c Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 24 Dec 2014 13:08:48 +0300 Subject: [PATCH] Minor: rename --- .../org/jetbrains/kotlin/codegen/JvmCodegenUtil.java | 2 +- .../src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt | 10 +++++----- .../plugin/debugger/DiagnosticSuppressorForDebugger.kt | 4 ++-- .../debugger/evaluate/KotlinEvaluationBuilder.kt | 4 ++-- .../evaluate/extractFunctionForDebuggerUtil.kt | 4 ++-- .../jet/plugin/refactoring/jetRefactoringUtil.kt | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index b0c5e694b09..f7cb20c5b13 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -191,7 +191,7 @@ public class JvmCodegenUtil { private static boolean isDebuggerContext(@NotNull MethodContext context) { JetFile file = DescriptorToSourceUtils.getContainingFile(context.getContextDescriptor()); - return file != null && CodeFragmentUtilPackage.getSkipVisibilityCheck(file); + return file != null && CodeFragmentUtilPackage.getSuppressDiagnosticsInDebugMode(file); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt index 5242ef8b869..337cc070b7b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt @@ -20,14 +20,14 @@ import com.intellij.openapi.util.Key import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetCodeFragment -public val SKIP_VISIBILITY_CHECK: Key = Key.create("SKIP_VISIBILITY_CHECK") +public val SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE: Key = Key.create("SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE") -public var JetFile.skipVisibilityCheck: Boolean +public var JetFile.suppressDiagnosticsInDebugMode: Boolean get() = when (this) { is JetCodeFragment -> true - is JetFile -> getUserData(SKIP_VISIBILITY_CHECK) ?: false + is JetFile -> getUserData(SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE) ?: false else -> false } set(skip: Boolean) { - putUserData(SKIP_VISIBILITY_CHECK, skip) - } + putUserData(SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE, skip) + } \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt index 9bf9cd4ed4d..daea75ac728 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt @@ -20,14 +20,14 @@ import org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck +import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode public class DiagnosticSuppressorForDebugger : DiagnosticsWithSuppression.DiagnosticSuppressor { override fun isSuppressed(diagnostic: Diagnostic): Boolean { val element = diagnostic.getPsiElement() val containingFile = element.getContainingFile() - if (containingFile is JetFile && containingFile.skipVisibilityCheck) { + if (containingFile is JetFile && containingFile.suppressDiagnosticsInDebugMode) { val diagnosticFactory = diagnostic.getFactory() return diagnosticFactory == Errors.INVISIBLE_MEMBER || diagnosticFactory == Errors.INVISIBLE_REFERENCE || diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt index 95425859cb7..c47f1bc0173 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.codegen.ClassFileFactory import org.jetbrains.kotlin.backend.common.output.OutputFileCollection import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.psi.JetCodeFragment -import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck +import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.codegen.CompilationErrorHandler import org.jetbrains.kotlin.diagnostics.Severity @@ -327,7 +327,7 @@ private fun createFileForDebugger(codeFragment: JetCodeFragment, fileText = fileText.replace("!FUNCTION!", extractedFunction.getText()!!) val jetFile = codeFragment.createJetFile("debugFile.kt", fileText) - jetFile.skipVisibilityCheck = true + jetFile.suppressDiagnosticsInDebugMode = true return jetFile } diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt index f719009e4ea..555397648e8 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.ErrorMessage import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import org.jetbrains.jet.plugin.refactoring.createTempCopy -import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck +import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionData import org.jetbrains.jet.plugin.refactoring.extractFunction.performAnalysis @@ -76,7 +76,7 @@ fun getFunctionForExtractedFragment( val originalFile = breakpointFile as JetFile val tmpFile = originalFile.createTempCopy { it } - tmpFile.skipVisibilityCheck = true + tmpFile.suppressDiagnosticsInDebugMode = true val contextElement = getExpressionToAddDebugExpressionBefore(tmpFile, codeFragment.getContext(), breakpointLine) if (contextElement == null) return null diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index ddba33b2264..b4453a9dc9c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -37,7 +37,7 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.ui.ConflictsDialog import com.intellij.util.containers.MultiMap -import org.jetbrains.kotlin.psi.codeFragmentUtil.skipVisibilityCheck +import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode import com.intellij.ide.util.PsiElementListCellRenderer import com.intellij.openapi.ui.popup.JBPopup import com.intellij.openapi.ui.popup.PopupChooserBuilder @@ -117,7 +117,7 @@ public fun PsiElement.isInJavaSourceRoot(): Boolean = public inline fun JetFile.createTempCopy(textTransform: (String) -> String): JetFile { val tmpFile = JetPsiFactory(this).createAnalyzableFile(getName(), textTransform(getText() ?: ""), this) tmpFile.setOriginalFile(this) - tmpFile.skipVisibilityCheck = skipVisibilityCheck + tmpFile.suppressDiagnosticsInDebugMode = suppressDiagnosticsInDebugMode return tmpFile }