From 966def6c77a4b22965ab151162a13394b9f64496 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 2 Jun 2014 18:07:12 +0400 Subject: [PATCH] Replace accessor functions with property --- .../jet/lang/psi/codeFragmentUtil.kt | 21 ++++++++----------- .../resolve/DiagnosticsWithSuppression.java | 2 +- .../evaluate/KotlinEvaluationBuilder.kt | 6 +++--- .../plugin/refactoring/jetRefactoringUtil.kt | 5 +---- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt index 0e5934d9b2f..f94bfe4acfb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt @@ -17,20 +17,17 @@ package org.jetbrains.jet.lang.psi.codeFragmentUtil import com.intellij.openapi.util.Key -import com.intellij.psi.PsiFile import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.psi.JetCodeFragment public val SKIP_VISIBILITY_CHECK: Key = Key.create("SKIP_VISIBILITY_CHECK") -public fun JetFile.skipVisibilityCheck(): Boolean = - when (this) { - is JetCodeFragment -> true - is JetFile -> getUserData(SKIP_VISIBILITY_CHECK) ?: false - else -> false - } - -public fun JetFile.setSkipVisibilityCheck(skip: Boolean) { - putUserData(SKIP_VISIBILITY_CHECK, skip) -} - +public var JetFile.skipVisibilityCheck: Boolean + get() = when (this) { + is JetCodeFragment -> true + is JetFile -> getUserData(SKIP_VISIBILITY_CHECK) ?: false + else -> false + } + set(skip: Boolean) { + putUserData(SKIP_VISIBILITY_CHECK, skip) + } \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java index 275751bbf0a..f169857ea1e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java @@ -110,7 +110,7 @@ public class DiagnosticsWithSuppression implements Diagnostics { private static boolean isSuppressedForDebugger(@NotNull Diagnostic diagnostic, @NotNull PsiElement element) { PsiFile containingFile = element.getContainingFile(); - if (containingFile instanceof JetFile && CodeFragmentUtilPackage.skipVisibilityCheck((JetFile) containingFile)) { + if (containingFile instanceof JetFile && CodeFragmentUtilPackage.getSkipVisibilityCheck((JetFile) containingFile)) { DiagnosticFactory 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 27976a0ce3e..fa1b40cd308 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -58,7 +58,7 @@ import org.jetbrains.jet.OutputFileCollection import org.jetbrains.jet.plugin.caches.resolve.getAnalysisResults import org.jetbrains.jet.lang.psi.JetCodeFragment import org.jetbrains.jet.lang.psi.JetImportList -import org.jetbrains.jet.lang.psi.codeFragmentUtil.setSkipVisibilityCheck +import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck import org.jetbrains.jet.lang.psi.JetExpression import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status import com.intellij.openapi.diagnostic.Logger @@ -265,7 +265,7 @@ private fun createFileForDebugger(codeFragment: JetCodeFragment, virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET) val jetFile = (PsiFileFactory.getInstance(codeFragment.getProject()) as PsiFileFactoryImpl) .trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false) as JetFile - jetFile.setSkipVisibilityCheck(true) + jetFile.skipVisibilityCheck = true return jetFile } @@ -344,7 +344,7 @@ private fun getFunctionForExtractedFragment( if (lineStart == null) return null val tmpFile = originalFile.createTempCopy { it } - tmpFile.setSkipVisibilityCheck(true) + tmpFile.skipVisibilityCheck = true val elementAtOffset = tmpFile.findElementAt(lineStart) if (elementAtOffset == 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 410f6cfe516..bc089494f44 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -45,7 +45,6 @@ import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsExcepti import com.intellij.refactoring.ui.ConflictsDialog import com.intellij.util.containers.MultiMap import com.intellij.openapi.command.CommandProcessor -import org.jetbrains.jet.lang.psi.codeFragmentUtil.setSkipVisibilityCheck import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck /** @@ -126,9 +125,7 @@ public fun PsiElement.isInJavaSourceRoot(): Boolean = public inline fun JetFile.createTempCopy(textTransform: (String) -> String): JetFile { val tmpFile = JetPsiFactory.createFile(getProject(), getName(), textTransform(getText() ?: "")) tmpFile.setOriginalFile(this) - if (skipVisibilityCheck()) { - tmpFile.setSkipVisibilityCheck(true) - } + tmpFile.skipVisibilityCheck = skipVisibilityCheck return tmpFile }