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

Replace accessor functions with property

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-02 18:07:12 +04:00
parent 6ce0ac8187
commit 966def6c77
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/codeFragmentUtil.kt
+9 -12
View File
@@ -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<Boolean> = Key.create<Boolean>("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)
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java
+1 -1
View File
@@ -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 ||
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+3 -3
View File
@@ -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
idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
+1 -4
View File
@@ -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
}