make smart keys configurables searchable

GitOrigin-RevId: c45b6ae281bd3149d5bf797ee70e71cb5e0cb635
This commit is contained in:
Dennis Ushakov
2019-08-15 20:30:27 +03:00
committed by intellij-monorepo-bot
parent 3e64217de4
commit 35fba7c13d
4 changed files with 20 additions and 6 deletions
@@ -2,10 +2,11 @@
package com.intellij.json.editor;
import com.intellij.openapi.options.BeanConfigurable;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.SearchableConfigurable;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
public class JsonSmartKeysConfigurable extends BeanConfigurable<JsonEditorOptions> implements Configurable {
public class JsonSmartKeysConfigurable extends BeanConfigurable<JsonEditorOptions> implements SearchableConfigurable {
public JsonSmartKeysConfigurable() {
super(JsonEditorOptions.getInstance());
JsonEditorOptions settings = getInstance();
@@ -35,4 +36,10 @@ public class JsonSmartKeysConfigurable extends BeanConfigurable<JsonEditorOption
public String getDisplayName() {
return "JSON";
}
@NotNull
@Override
public String getId() {
return "editor.preferences.jsonOptions";
}
}
@@ -25,7 +25,7 @@
<enterHandlerDelegate implementation="com.intellij.json.editor.JsonEnterHandler" id="JsonEnterHandler"/>
<typedHandler implementation="com.intellij.json.editor.JsonTypedHandler" id="JsonTypedHandler"/>
<copyPastePreProcessor implementation="com.intellij.json.editor.JsonCopyPasteProcessor"/>
<editorSmartKeysConfigurable instance="com.intellij.json.editor.JsonSmartKeysConfigurable"/>
<editorSmartKeysConfigurable instance="com.intellij.json.editor.JsonSmartKeysConfigurable" id="editor.preferences.jsonOptions"/>
<applicationService serviceImplementation="com.intellij.json.editor.JsonEditorOptions"/>
<!-- Codeinsight -->
+1 -1
View File
@@ -541,7 +541,7 @@
<problemFileHighlightFilter implementation="com.jetbrains.python.codeInsight.PyProblemFileHighlightFilter"/>
<editorSmartKeysConfigurable instance="com.jetbrains.python.codeInsight.PySmartKeysOptions"/>
<editorSmartKeysConfigurable instance="com.jetbrains.python.codeInsight.PySmartKeysOptions" id="editor.preferences.pyOptions"/>
<psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PyStdReferenceContributor" language="Python"/>
<psi.referenceContributor implementation="com.jetbrains.python.testing.pyTestFixtures.PyTestFixtureReferenceContributor" language="Python"/>
@@ -17,14 +17,15 @@ package com.jetbrains.python.codeInsight;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.openapi.options.BeanConfigurable;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.SearchableConfigurable;
import com.jetbrains.python.PyBundle;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
/**
* @author yole
*/
public class PySmartKeysOptions extends BeanConfigurable<CodeInsightSettings> implements Configurable {
public class PySmartKeysOptions extends BeanConfigurable<CodeInsightSettings> implements SearchableConfigurable {
public PySmartKeysOptions() {
super(CodeInsightSettings.getInstance());
//CodeInsightSettings.getInstance().REFORMAT_ON_PASTE = CodeInsightSettings.NO_REFORMAT; //TODO: remove combobox from settings
@@ -42,4 +43,10 @@ public class PySmartKeysOptions extends BeanConfigurable<CodeInsightSettings> im
public String getDisplayName() {
return "Python";
}
@NotNull
@Override
public String getId() {
return "editor.preferences.pyOptions";
}
}