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

Add button to open script settings from Multiple script definition notification

Browse Source
This commit is contained in:
Natalia Selezneva
2018-07-31 09:40:50 +03:00
parent 6596a6ba75
commit 71e72ec6c2
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java
+3 -1
View File
@@ -20,6 +20,8 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
public class KotlinScriptingSettingsConfigurable implements SearchableConfigurable, Configurable.NoScroll { public class KotlinScriptingSettingsConfigurable implements SearchableConfigurable, Configurable.NoScroll {
public static final String ID = "preferences.language.Kotlin.scripting";
private JPanel root; private JPanel root;
private JPanel panelScriptDefinitionsChooser; private JPanel panelScriptDefinitionsChooser;
private JCheckBox scriptDependenciesAutoReload; private JCheckBox scriptDependenciesAutoReload;
@@ -97,6 +99,6 @@ public class KotlinScriptingSettingsConfigurable implements SearchableConfigurab
@Override @Override
@NotNull @NotNull
public String getId() { public String getId() {
return "preferences.language.Kotlin.scripting"; return ID;
} }
} }
idea/src/org/jetbrains/kotlin/idea/script/configutation/MultipleScriptDefinitionsChecker.kt
+6
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.idea.script.configutation package org.jetbrains.kotlin.idea.script.configutation
import com.intellij.ide.actions.ShowSettingsUtilImpl
import com.intellij.openapi.fileEditor.FileEditor import com.intellij.openapi.fileEditor.FileEditor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.popup.JBPopupFactory 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.ScriptDefinitionsManager
import org.jetbrains.kotlin.idea.core.script.StandardIdeScriptDefinition import org.jetbrains.kotlin.idea.core.script.StandardIdeScriptDefinition
import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings 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.parsing.KotlinParserDefinition
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinition
@@ -87,6 +89,10 @@ class MultipleScriptDefinitionsChecker(private val project: Project) : EditorNot
KotlinScriptingSettings.getInstance(psiFile.project).suppressDefinitionsCheck = true KotlinScriptingSettings.getInstance(psiFile.project).suppressDefinitionsCheck = true
EditorNotifications.getInstance(psiFile.project).updateAllNotifications() EditorNotifications.getInstance(psiFile.project).updateAllNotifications()
} }
createComponentActionLabel("Open Settings") {
ShowSettingsUtilImpl.showSettingsDialog(psiFile.project, KotlinScriptingSettingsConfigurable.ID, "")
}
} }
} }