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

Inline variable: do not show dialog / preview from J2K #KT-19332 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-08-01 16:06:45 +03:00
parent b56f5593ab
commit 8d5e69b06c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
+1 -1
View File
@@ -280,7 +280,7 @@ object J2KPostProcessingRegistrar {
if (!UnnecessaryVariableInspection.isActiveFor(element)) return null if (!UnnecessaryVariableInspection.isActiveFor(element)) return null
return { return {
KotlinInlineValHandler().inlineElement(element.project, element.findExistingEditor(), element) KotlinInlineValHandler(withPrompt = false).inlineElement(element.project, element.findExistingEditor(), element)
} }
} }
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt
+3 -2
View File
@@ -30,7 +30,8 @@ class KotlinInlineValDialog(
private val property: KtProperty, private val property: KtProperty,
private val reference: KtSimpleNameReference?, private val reference: KtSimpleNameReference?,
private val replacementStrategy: UsageReplacementStrategy, private val replacementStrategy: UsageReplacementStrategy,
private val assignmentToDelete: KtBinaryExpression? private val assignmentToDelete: KtBinaryExpression?,
withPreview: Boolean = true
) : InlineOptionsDialog(property.project, true, property) { ) : InlineOptionsDialog(property.project, true, property) {
private var occurrenceCount = initOccurrencesNumber(property) private var occurrenceCount = initOccurrencesNumber(property)
@@ -42,7 +43,7 @@ class KotlinInlineValDialog(
init { init {
myInvokedOnReference = reference != null myInvokedOnReference = reference != null
title = refactoringName title = refactoringName
setPreviewResults(shouldBeShown()) setPreviewResults(withPreview && shouldBeShown())
if (forSimpleLocal()) { if (forSimpleLocal()) {
setDoNotAskOption(object : DialogWrapper.DoNotAskOption { setDoNotAskOption(object : DialogWrapper.DoNotAskOption {
override fun isToBeShown() = EditorSettingsExternalizable.getInstance().isShowInlineLocalDialog override fun isToBeShown() = EditorSettingsExternalizable.getInstance().isShowInlineLocalDialog
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.kt
+5 -3
View File
@@ -47,7 +47,9 @@ import org.jetbrains.kotlin.psi.KtProperty
import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS
import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis
class KotlinInlineValHandler : InlineActionHandler() { class KotlinInlineValHandler(private val withPrompt: Boolean) : InlineActionHandler() {
constructor(): this(withPrompt = true)
override fun isEnabledForLanguage(l: Language) = l == KotlinLanguage.INSTANCE override fun isEnabledForLanguage(l: Language) = l == KotlinLanguage.INSTANCE
@@ -185,9 +187,9 @@ class KotlinInlineValHandler : InlineActionHandler() {
val reference = editor?.let { TargetElementUtil.findReference(it, it.caretModel.offset) } as? KtSimpleNameReference val reference = editor?.let { TargetElementUtil.findReference(it, it.caretModel.offset) } as? KtSimpleNameReference
val dialog = KotlinInlineValDialog(declaration, reference, replacementStrategy, assignmentToDelete) val dialog = KotlinInlineValDialog(declaration, reference, replacementStrategy, assignmentToDelete, withPreview = withPrompt)
if (!ApplicationManager.getApplication().isUnitTestMode && dialog.shouldBeShown()) { if (withPrompt && !ApplicationManager.getApplication().isUnitTestMode && dialog.shouldBeShown()) {
dialog.show() dialog.show()
if (!dialog.isOK && hasHighlightings) { if (!dialog.isOK && hasHighlightings) {
val statusBar = WindowManager.getInstance().getStatusBar(declaration.project) val statusBar = WindowManager.getInstance().getStatusBar(declaration.project)