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

Remove warnings in createByPattern.kt

Browse Source
This commit is contained in:
Nikolay Krasko
2018-10-19 16:02:49 +03:00
parent 4024d0c484
commit 77be4a9e85
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt
+3 -3
View File
@@ -28,7 +28,7 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
import org.jetbrains.kotlin.psi.CREATEBYPATTERN_MAY_NOT_REFORMAT
import org.jetbrains.kotlin.psi.CREATE_BY_PATTERN_MAY_NOT_REFORMAT
import org.jetbrains.kotlin.psi.KtBlockExpression
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.psiUtil.containsInside
@@ -86,13 +86,13 @@ abstract class SelfTargetingIntention<TElement : PsiElement>(
final override fun isAvailable(project: Project, editor: Editor, file: PsiFile): Boolean {
if (ApplicationManager.getApplication().isUnitTestMode) {
CREATEBYPATTERN_MAY_NOT_REFORMAT = true
CREATE_BY_PATTERN_MAY_NOT_REFORMAT = true
}
try {
return getTarget(editor, file) != null
}
finally {
CREATEBYPATTERN_MAY_NOT_REFORMAT = false
CREATE_BY_PATTERN_MAY_NOT_REFORMAT = false
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixActionBase.kt
+3 -3
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.psi.CREATEBYPATTERN_MAY_NOT_REFORMAT
import org.jetbrains.kotlin.psi.CREATE_BY_PATTERN_MAY_NOT_REFORMAT
import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
@@ -39,7 +39,7 @@ abstract class QuickFixActionBase<out T : PsiElement>(element: T) : IntentionAct
final override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
if (ApplicationManager.getApplication().isUnitTestMode) {
CREATEBYPATTERN_MAY_NOT_REFORMAT = true
CREATE_BY_PATTERN_MAY_NOT_REFORMAT = true
}
try {
val element = element ?: return false
@@ -50,7 +50,7 @@ abstract class QuickFixActionBase<out T : PsiElement>(element: T) : IntentionAct
isAvailableImpl(project, editor, file)
}
finally {
CREATEBYPATTERN_MAY_NOT_REFORMAT = false
CREATE_BY_PATTERN_MAY_NOT_REFORMAT = false
}
}