From 35fba7c13dfe0fe8ecf9459f22fd478d876d1f22 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@jetbrains.com>
Date: Thu, 15 Aug 2019 19:25:14 +0300
Subject: [PATCH] make smart keys configurables searchable

GitOrigin-RevId: c45b6ae281bd3149d5bf797ee70e71cb5e0cb635
---
 .../json/editor/JsonSmartKeysConfigurable.java        | 11 +++++++++--
 .../platform-resources/src/META-INF/JsonPlugin.xml    |  2 +-
 python/src/META-INF/python-core-common.xml            |  2 +-
 .../python/codeInsight/PySmartKeysOptions.java        | 11 +++++++++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/json/src/com/intellij/json/editor/JsonSmartKeysConfigurable.java b/json/src/com/intellij/json/editor/JsonSmartKeysConfigurable.java
index c822717e65b3..b995d1394f98 100644
--- a/json/src/com/intellij/json/editor/JsonSmartKeysConfigurable.java
+++ b/json/src/com/intellij/json/editor/JsonSmartKeysConfigurable.java
@@ -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";
+  }
 }
diff --git a/platform/platform-resources/src/META-INF/JsonPlugin.xml b/platform/platform-resources/src/META-INF/JsonPlugin.xml
index 53cbff091b45..07b5791067ad 100644
--- a/platform/platform-resources/src/META-INF/JsonPlugin.xml
+++ b/platform/platform-resources/src/META-INF/JsonPlugin.xml
@@ -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 -->
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 9ba6c2562f15..f5afbb4de057 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -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"/>
diff --git a/python/src/com/jetbrains/python/codeInsight/PySmartKeysOptions.java b/python/src/com/jetbrains/python/codeInsight/PySmartKeysOptions.java
index 812e37782081..56d3343ee5bd 100644
--- a/python/src/com/jetbrains/python/codeInsight/PySmartKeysOptions.java
+++ b/python/src/com/jetbrains/python/codeInsight/PySmartKeysOptions.java
@@ -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";
+  }
 }