From e2c4eb74d77fc934658d7cdca036fb14dd8b8c97 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@jetbrains.com>
Date: Tue, 21 Jan 2020 12:35:06 +0300
Subject: [PATCH] inlay settings: dynamic

GitOrigin-RevId: 39112503ae30daf72b62862fba3898f3b61b98aa
---
 .../codeInsight/hints/settings/InlaySettingsProvider.kt      | 2 +-
 .../codeInsight/hints/settings/InlayHintsConfigurable.kt     | 5 ++++-
 .../src/META-INF/PlatformExtensionPoints.xml                 | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/codeInsight/hints/settings/InlaySettingsProvider.kt b/platform/lang-api/src/com/intellij/codeInsight/hints/settings/InlaySettingsProvider.kt
index a26e82985490..1c91f43f602e 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/hints/settings/InlaySettingsProvider.kt
+++ b/platform/lang-api/src/com/intellij/codeInsight/hints/settings/InlaySettingsProvider.kt
@@ -23,7 +23,7 @@ interface InlaySettingsProvider {
   fun getSupportedLanguages(project: Project): Collection<Language>
 
   object EP {
-    private val EXTENSION_POINT_NAME =
+    val EXTENSION_POINT_NAME =
       ExtensionPointName.create<InlaySettingsProvider>("com.intellij.config.inlaySettingsProvider")
 
     fun getExtensions(): Array<out InlaySettingsProvider> {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt
index 68d8fbff9ff6..80de41824ed1 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlayHintsConfigurable.kt
@@ -6,6 +6,7 @@ import com.intellij.codeInsight.hints.settings.language.SingleLanguageInlayHints
 import com.intellij.ide.DataManager
 import com.intellij.lang.Language
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.extensions.BaseExtensionPointName
 import com.intellij.openapi.options.Configurable
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.options.ex.Settings
@@ -13,7 +14,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.util.messages.MessageBusConnection
 import javax.swing.JComponent
 
-class InlayHintsConfigurable(val project: Project) : Configurable, Configurable.Composite {
+class InlayHintsConfigurable(val project: Project) : Configurable, Configurable.Composite, Configurable.WithEpDependencies {
   private val settings = InlayHintsSettings.instance()
   private val configurables: List<SingleLanguageInlayHintsConfigurable>
   private val panel: InlayHintsPanel
@@ -64,6 +65,8 @@ class InlayHintsConfigurable(val project: Project) : Configurable, Configurable.
     }
   }
 
+  override fun getDependencies(): Collection<BaseExtensionPointName<*>> = listOf(InlaySettingsProvider.EP.EXTENSION_POINT_NAME)
+
   companion object {
     /**
      * Updates settings UI when external change happens (e. g. when some provider is changed).
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
index e66f3049e038..3f13c538228e 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
@@ -350,7 +350,7 @@
 
     <extensionPoint name="actionConfigurationCustomizer" interface="com.intellij.openapi.actionSystem.impl.ActionConfigurationCustomizer" dynamic="false"/>
 
-    <extensionPoint name="config.inlaySettingsProvider" interface="com.intellij.codeInsight.hints.settings.InlaySettingsProvider"/>
+    <extensionPoint name="config.inlaySettingsProvider" interface="com.intellij.codeInsight.hints.settings.InlaySettingsProvider" dynamic="true"/>
 
     <extensionPoint name="breadcrumbsPresentationProvider" interface="com.intellij.xml.breadcrumbs.BreadcrumbsPresentationProvider"/>
     <extensionPoint name="unknownSdkResolver" interface="com.intellij.openapi.roots.ui.configuration.UnknownSdkResolver" dynamic="true"/>