[plugins] IJPL-181065 PluginSet: narrow down types

vsalavatov · intellij-monorepo-bot · commit e285546eb576 · 2025-05-26T12:16:12.000Z
GitOrigin-RevId: b376ffd8cdfbea1fbb31b3c794f8470d3c9694f2
diff --git a/api.features/src/com/jetbrains/ls/api/features/LSConfiguration.kt b/api.features/src/com/jetbrains/ls/api/features/LSConfiguration.kt
@@ -1,6 +1,6 @@
 package com.jetbrains.ls.api.features
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.commands.LSCommandDescriptor
 import com.jetbrains.ls.api.features.commands.LSCommandDescriptorProvider
 import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
@@ -12,7 +12,7 @@ import com.jetbrains.lsp.protocol.TextDocumentIdentifier
 
 class LSConfiguration(
     val entries: List<LSConfigurationEntry>,
-    val plugins: List<IdeaPluginDescriptorImpl>,
+    val plugins: List<PluginMainDescriptor>,
     val languages: List<LSLanguage>,
 ) {
     val allCommandDescriptors: List<LSCommandDescriptor> = entries<LSCommandDescriptorProvider>().flatMap { it.commandDescriptors }
diff --git a/api.features/src/com/jetbrains/ls/api/features/language/LSLanguageConfiguration.kt b/api.features/src/com/jetbrains/ls/api/features/language/LSLanguageConfiguration.kt
@@ -1,10 +1,10 @@
 package com.jetbrains.ls.api.features.language
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.LSConfigurationEntry
 
 class LSLanguageConfiguration(
     val entries: List<LSConfigurationEntry>,
-    val plugins: List<IdeaPluginDescriptorImpl>,
+    val plugins: List<PluginMainDescriptor>,
     val languages: List<LSLanguage>,
 )
diff --git a/api.features/src/com/jetbrains/ls/api/features/lsApiPlugin.kt b/api.features/src/com/jetbrains/ls/api/features/lsApiPlugin.kt
@@ -1,6 +1,6 @@
 package com.jetbrains.ls.api.features
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-val lsApiPlugin: IdeaPluginDescriptorImpl = ijPluginByXml("META-INF/language-server/features/api/lsApi.xml")
+val lsApiPlugin: PluginMainDescriptor = ijPluginByXml("META-INF/language-server/features/api/lsApi.xml")
diff --git a/api.features/src/com/jetbrains/ls/api/features/utils/ijPlugins.kt b/api.features/src/com/jetbrains/ls/api/features/utils/ijPlugins.kt
@@ -1,6 +1,6 @@
 package com.jetbrains.ls.api.features.utils
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.plugins.loadAndInitForCoreEnv
 import com.intellij.openapi.application.PathManager
@@ -13,7 +13,7 @@ fun ijPluginByXml(
     xmlResourcePath: String,
     classForClasspath: Class<*>,
     useFakePluginId: Boolean = false,
-): IdeaPluginDescriptorImpl {
+): PluginMainDescriptor {
     val xmlResourcePath = xmlResourcePath.removePrefix("/")
     val pluginRoot = getPluginRoot(classForClasspath)
     fun createFakePluginId(): PluginId = PluginId.getId(xmlResourcePath)
@@ -49,6 +49,6 @@ private fun getPluginRoot(classForClasspath: Class<*>): Path {
  * The function is inline to have a correct classloader of the call-side
  */
 @Suppress("NOTHING_TO_INLINE")
-inline fun ijPluginByXml(xmlResourcePath: String): IdeaPluginDescriptorImpl {
+inline fun ijPluginByXml(xmlResourcePath: String): PluginMainDescriptor {
     return ijPluginByXml(xmlResourcePath, object : Any() {}::class.java)
 }
diff --git a/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/api/commonLsApiPlugin.kt b/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/api/commonLsApiPlugin.kt
@@ -1,7 +1,7 @@
 package com.jetbrains.ls.api.features.impl.common.api
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-internal val commonLsApiPlugin: IdeaPluginDescriptorImpl =
+internal val commonLsApiPlugin: PluginMainDescriptor =
     ijPluginByXml("META-INF/language-server/features/common/commonLsApi.xml")
diff --git a/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/codeStyle/commonCodeStylePlugin.kt b/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/codeStyle/commonCodeStylePlugin.kt
@@ -1,8 +1,8 @@
 package com.jetbrains.ls.api.features.impl.common.codeStyle
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-val commonCodeStylePlugin: IdeaPluginDescriptorImpl = ijPluginByXml(
+val commonCodeStylePlugin: PluginMainDescriptor = ijPluginByXml(
     "META-INF/language-server/features/common/codeStyle.xml"
 )
diff --git a/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/completion/commonCompletionPlugin.kt b/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/completion/commonCompletionPlugin.kt
@@ -1,7 +1,7 @@
 package com.jetbrains.ls.api.features.impl.common.completion
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-val commonCompletionPlugin: IdeaPluginDescriptorImpl =
+val commonCompletionPlugin: PluginMainDescriptor =
     ijPluginByXml("/META-INF/language-server/features/common/completion.xml")
diff --git a/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/coreIjPlugin.kt b/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/coreIjPlugin.kt
@@ -1,8 +1,8 @@
 package com.jetbrains.ls.api.features.impl.common
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-val coreIjPlugin: IdeaPluginDescriptorImpl = ijPluginByXml(
+val coreIjPlugin: PluginMainDescriptor = ijPluginByXml(
     "META-INF/language-server/features/common/core.xml"
 )
diff --git a/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/search/commonUsagesPlugin.kt b/features-impl/common/src/com/jetbrains/ls/api/features/impl/common/search/commonUsagesPlugin.kt
@@ -1,7 +1,7 @@
 package com.jetbrains.ls.api.features.impl.common.search
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-val commonUsagesPlugin: IdeaPluginDescriptorImpl =
+val commonUsagesPlugin: PluginMainDescriptor =
     ijPluginByXml("META-INF/language-server/features/common/usages.xml")
diff --git a/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/apiImpl/lsApiKotlinImplPlugin.kt b/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/apiImpl/lsApiKotlinImplPlugin.kt
@@ -1,6 +1,7 @@
 package com.jetbrains.ls.api.features.impl.common.kotlin.apiImpl
 
 import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-internal val lsApiKotlinImpl: IdeaPluginDescriptorImpl = ijPluginByXml("META-INF/language-server/features/kotlin/lsApiKotlinImpl.xml")
+internal val lsApiKotlinImpl: PluginMainDescriptor = ijPluginByXml("META-INF/language-server/features/kotlin/lsApiKotlinImpl.xml")
diff --git a/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/codeActions/kotlinCodeActionsPlugin.kt b/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/codeActions/kotlinCodeActionsPlugin.kt
@@ -1,11 +1,11 @@
 package com.jetbrains.ls.api.features.impl.common.kotlin.codeActions
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 import org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
 import org.jetbrains.kotlin.idea.k2.codeinsight.inspections.UsePropertyAccessSyntaxInspection
 
-internal val kotlinCodeActionsPlugins: List<IdeaPluginDescriptorImpl> = listOf(
+internal val kotlinCodeActionsPlugins: List<PluginMainDescriptor> = listOf(
     ijPluginByXml("META-INF/language-server/features/kotlin/codeActions.xml"),
     ijPluginByXml("kotlin.code-insight.inspections.k2.xml", classForClasspath = UsePropertyAccessSyntaxInspection::class.java),
     ijPluginByXml("kotlin.code-insight.inspections.shared.xml", classForClasspath = KotlinUnusedImportInspection::class.java),
diff --git a/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/codeStyle/kotlinCodeStylePlugin.kt b/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/codeStyle/kotlinCodeStylePlugin.kt
@@ -1,10 +1,10 @@
 package com.jetbrains.ls.api.features.impl.common.kotlin.codeStyle
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 import org.jetbrains.kotlin.idea.plugin.common.KotlinPluginCommonClassForClassPath
 
-internal val kotlinCodeStylePlugin: IdeaPluginDescriptorImpl =
+internal val kotlinCodeStylePlugin: PluginMainDescriptor =
     ijPluginByXml(
         "/META-INF/formatter.xml",
         classForClasspath = KotlinPluginCommonClassForClassPath::class.java,
diff --git a/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/completion/kotlinCompletionPlugin.kt b/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/completion/kotlinCompletionPlugin.kt
@@ -1,8 +1,8 @@
 package com.jetbrains.ls.api.features.impl.common.kotlin.completion
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 
-internal val kotlinCompletionPlugin: IdeaPluginDescriptorImpl = ijPluginByXml(
+internal val kotlinCompletionPlugin: PluginMainDescriptor = ijPluginByXml(
     "META-INF/language-server/features/kotlin/completion.xml"
 )
diff --git a/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/usages/kotlinUsagesIjPlugin.kt b/features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/usages/kotlinUsagesIjPlugin.kt
@@ -1,11 +1,11 @@
 package com.jetbrains.ls.api.features.impl.common.kotlin.usages
 
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
+import com.intellij.ide.plugins.PluginMainDescriptor
 import com.jetbrains.ls.api.features.utils.ijPluginByXml
 import org.jetbrains.kotlin.idea.plugin.common.KotlinPluginCommonClassForClassPath
 import org.jetbrains.kotlin.idea.searching.kmp.KotlinK2ExpectActualSupport
 
-internal val kotlinUsagesIjPlugins: List<IdeaPluginDescriptorImpl> by lazy {
+internal val kotlinUsagesIjPlugins: List<PluginMainDescriptor> by lazy {
     listOf(
         ijPluginByXml("META-INF/searching-base.xml", KotlinPluginCommonClassForClassPath::class.java, useFakePluginId = true),
         ijPluginByXml("META-INF/language-server/features/kotlin/usages.xml"),

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.jetbrains.ls.api.features.impl.common.codeStyle`
`2`	`2`
`3`		`-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl`
	`3`	`+import com.intellij.ide.plugins.PluginMainDescriptor`
`4`	`4`	`import com.jetbrains.ls.api.features.utils.ijPluginByXml`
`5`	`5`
`6`		`-val commonCodeStylePlugin: IdeaPluginDescriptorImpl = ijPluginByXml(`
	`6`	`+val commonCodeStylePlugin: PluginMainDescriptor = ijPluginByXml(`
`7`	`7`	`"META-INF/language-server/features/common/codeStyle.xml"`
`8`	`8`	`)`