From 541ca31584f4f48da0cde4de6a635c2230f43a16 Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Fri, 29 Nov 2019 14:38:21 +0300 Subject: [PATCH] Fix for exception on HelpAction in KotlinInlineValDialog --- .../idea/refactoring/inline/KotlinInlineValDialog.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt index 480951d9ceb..f7f89746140 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt @@ -17,8 +17,10 @@ package org.jetbrains.kotlin.idea.refactoring.inline import com.intellij.openapi.editor.ex.EditorSettingsExternalizable -import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings +import com.intellij.openapi.help.HelpManager +import com.intellij.refactoring.HelpID import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.psi.KtBinaryExpression import org.jetbrains.kotlin.psi.KtProperty @@ -57,6 +59,10 @@ class KotlinInlineValDialog( fun shouldBeShown() = !simpleLocal || EditorSettingsExternalizable.getInstance().isShowInlineLocalDialog + override fun doHelpAction() = + HelpManager.getInstance().invokeHelp(HelpID.INLINE_VARIABLE) + + override fun isInlineThis() = KotlinRefactoringSettings.instance.INLINE_LOCAL_THIS public override fun doAction() {