From 6742e9aab5c3ca830a29db3e39db04d0356e5697 Mon Sep 17 00:00:00 2001 From: "Roman.Ivanov" Date: Wed, 19 Jun 2019 15:10:34 +0700 Subject: [PATCH] Revert "InlayHintsProvider -> InlayHintProvider" This reverts commit 0669fc60 - backward incompatible change GitOrigin-RevId: 0d35822ffaea2e2ad34d1db21ff00444a6dc4ff5 --- .../codeInsight/hints/MethodChainsInlayProvider.kt | 2 +- .../hints/{InlayHintProvider.kt => InlayHintsProvider.kt} | 4 ++-- .../codeInsight/hints/InlayHintsProviderFactory.kt | 4 ++-- .../src/com/intellij/codeInsight/hints/InlayHintsUtils.kt | 8 ++++---- .../hints/SingleLanguageInlayProviderFactory.kt | 3 ++- .../src/META-INF/LangExtensionPoints.xml | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) rename platform/lang-api/src/com/intellij/codeInsight/hints/{InlayHintProvider.kt => InlayHintsProvider.kt} (97%) diff --git a/java/java-impl/src/com/intellij/codeInsight/hints/MethodChainsInlayProvider.kt b/java/java-impl/src/com/intellij/codeInsight/hints/MethodChainsInlayProvider.kt index ac579b142fef..c8428f4ff94c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hints/MethodChainsInlayProvider.kt +++ b/java/java-impl/src/com/intellij/codeInsight/hints/MethodChainsInlayProvider.kt @@ -16,7 +16,7 @@ import javax.swing.JPanel import javax.swing.event.DocumentEvent import javax.swing.event.DocumentListener -class MethodChainsInlayProvider : InlayHintProvider { +class MethodChainsInlayProvider : InlayHintsProvider { override fun getCollectorFor(file: PsiFile, editor: Editor, settings: Settings, sink: InlayHintsSink) = object : FactoryInlayHintsCollector(editor) { override fun collect(element: PsiElement, editor: Editor, sink: InlayHintsSink) : Boolean { diff --git a/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintProvider.kt b/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintsProvider.kt similarity index 97% rename from platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintProvider.kt rename to platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintsProvider.kt index 77f7d75baced..1b95598cb697 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintProvider.kt +++ b/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintsProvider.kt @@ -10,7 +10,7 @@ import com.intellij.util.xmlb.annotations.Property import org.jetbrains.annotations.Nls import javax.swing.JComponent -object InlayHintsProviderExtension : LanguageExtension>("com.intellij.codeInsight.inlayProvider") +object InlayHintsProviderExtension : LanguageExtension>("com.intellij.codeInsight.inlayProvider") /** * Provider of inlay hints for single language. If you need to create hints for multiple languages, please use InlayHintsProviderFactory. @@ -20,7 +20,7 @@ object InlayHintsProviderExtension : LanguageExtension>("co * @see com.intellij.openapi.editor.InlayModel.addInlineElement * @see com.intellij.openapi.editor.InlayModel.addBlockElement */ -interface InlayHintProvider { +interface InlayHintsProvider { /** * If this method is called, provider is enabled for this file * Warning! Your collector should not use any settings besides [settings] diff --git a/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintsProviderFactory.kt b/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintsProviderFactory.kt index fb849ba9efb3..be237f93da32 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintsProviderFactory.kt +++ b/platform/lang-api/src/com/intellij/codeInsight/hints/InlayHintsProviderFactory.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project /** - * Factory for [InlayHintProvider], can be used to support multiple languages with a single type of inlay hints. + * Factory for [InlayHintsProvider], can be used to support multiple languages with a single type of inlay hints. */ interface InlayHintsProviderFactory { fun getProvidersInfo(project: Project): List> @@ -19,6 +19,6 @@ interface InlayHintsProviderFactory { class ProviderInfo( val language: Language, - val provider: InlayHintProvider + val provider: InlayHintsProvider ) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt index aa6ea0925df0..5091a7e4f521 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/InlayHintsUtils.kt @@ -20,7 +20,7 @@ class ProviderWithSettings( ) { val configurable by lazy { provider.createConfigurable(settings) } - val provider: InlayHintProvider + val provider: InlayHintsProvider get() = info.provider val language: Language get() = info.language @@ -42,16 +42,16 @@ fun ProviderWithSettings.getCollectorWrapperFor(file: PsiFile, edit return CollectorWithSettings(collector, key, language, sink) } -internal fun InlayHintProvider.withSettings(language: Language, config: InlayHintsSettings): ProviderWithSettings { +internal fun InlayHintsProvider.withSettings(language: Language, config: InlayHintsSettings): ProviderWithSettings { val settings = getActualSettings(config, language) return ProviderWithSettings(ProviderInfo(language, this), settings) } -internal fun InlayHintProvider.getActualSettings(config: InlayHintsSettings, language: Language): T { +internal fun InlayHintsProvider.getActualSettings(config: InlayHintsSettings, language: Language): T { return config.findSettings(key, language, createSettings()) } -internal fun copySettings(from: T, provider: InlayHintProvider): T { +internal fun copySettings(from: T, provider: InlayHintsProvider): T { val settings = provider.createSettings() // Workaround to make a deep copy of settings. The other way is to parametrize T with something like // interface DeepCopyable { fun deepCopy(from: T): T }, but there will be a lot of problems with recursive type bounds diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/SingleLanguageInlayProviderFactory.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/SingleLanguageInlayProviderFactory.kt index 2d56400bff24..6a30d916f997 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hints/SingleLanguageInlayProviderFactory.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/SingleLanguageInlayProviderFactory.kt @@ -3,10 +3,11 @@ package com.intellij.codeInsight.hints import com.intellij.lang.Language import com.intellij.lang.LanguageExtensionPoint +import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project -private val inlayProviderName = ExtensionPointName>>("com.intellij.codeInsight.inlayProvider") +private val inlayProviderName = ExtensionPointName>>("com.intellij.codeInsight.inlayProvider") class SingleLanguageInlayProviderFactory : InlayHintsProviderFactory { override fun getProvidersInfo(project: Project): List> { diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index 0e936dd6febd..bc293a488709 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -645,7 +645,7 @@ - +