From 71e72ec6c2cf1ef5d2b71e86080bb77d4f4405f0 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 31 Jul 2018 09:40:50 +0300 Subject: [PATCH] Add button to open script settings from Multiple script definition notification --- .../configuration/KotlinScriptingSettingsConfigurable.java | 4 +++- .../configutation/MultipleScriptDefinitionsChecker.kt | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java index 79aa411d2d3..da107e4e283 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java +++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java @@ -20,6 +20,8 @@ import javax.swing.*; import java.awt.*; public class KotlinScriptingSettingsConfigurable implements SearchableConfigurable, Configurable.NoScroll { + public static final String ID = "preferences.language.Kotlin.scripting"; + private JPanel root; private JPanel panelScriptDefinitionsChooser; private JCheckBox scriptDependenciesAutoReload; @@ -97,6 +99,6 @@ public class KotlinScriptingSettingsConfigurable implements SearchableConfigurab @Override @NotNull public String getId() { - return "preferences.language.Kotlin.scripting"; + return ID; } } diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configutation/MultipleScriptDefinitionsChecker.kt b/idea/src/org/jetbrains/kotlin/idea/script/configutation/MultipleScriptDefinitionsChecker.kt index caffd607899..09c72e3a23a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/configutation/MultipleScriptDefinitionsChecker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/configutation/MultipleScriptDefinitionsChecker.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.script.configutation +import com.intellij.ide.actions.ShowSettingsUtilImpl import com.intellij.openapi.fileEditor.FileEditor import com.intellij.openapi.project.Project import com.intellij.openapi.ui.popup.JBPopupFactory @@ -20,6 +21,7 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager import org.jetbrains.kotlin.idea.core.script.StandardIdeScriptDefinition import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings +import org.jetbrains.kotlin.idea.script.configuration.KotlinScriptingSettingsConfigurable import org.jetbrains.kotlin.parsing.KotlinParserDefinition import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.script.KotlinScriptDefinition @@ -87,6 +89,10 @@ class MultipleScriptDefinitionsChecker(private val project: Project) : EditorNot KotlinScriptingSettings.getInstance(psiFile.project).suppressDefinitionsCheck = true EditorNotifications.getInstance(psiFile.project).updateAllNotifications() } + + createComponentActionLabel("Open Settings") { + ShowSettingsUtilImpl.showSettingsDialog(psiFile.project, KotlinScriptingSettingsConfigurable.ID, "") + } } }