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

Minor: rename

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-12-24 13:08:48 +03:00
parent 3b81d63334
commit b709baa9b4
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
+1 -1
View File
@@ -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
compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt
+5 -5
View File
@@ -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<Boolean> = Key.create<Boolean>("SKIP_VISIBILITY_CHECK")
public val SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE: Key<Boolean> = Key.create<Boolean>("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)
}
idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt
+2 -2
View File
@@ -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 ||
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+2 -2
View File
@@ -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
}
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+2 -2
View File
@@ -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
idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
+2 -2
View File
@@ -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
}