Skip to content

Commit e285546

Browse files
vsalavatovintellij-monorepo-bot
authored andcommitted
[plugins] IJPL-181065 PluginSet: narrow down types
GitOrigin-RevId: b376ffd8cdfbea1fbb31b3c794f8470d3c9694f2
1 parent a1689f4 commit e285546

File tree

14 files changed

+29
-28
lines changed

14 files changed

+29
-28
lines changed

api.features/src/com/jetbrains/ls/api/features/LSConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.jetbrains.ls.api.features
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.commands.LSCommandDescriptor
55
import com.jetbrains.ls.api.features.commands.LSCommandDescriptorProvider
66
import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
@@ -12,7 +12,7 @@ import com.jetbrains.lsp.protocol.TextDocumentIdentifier
1212

1313
class LSConfiguration(
1414
val entries: List<LSConfigurationEntry>,
15-
val plugins: List<IdeaPluginDescriptorImpl>,
15+
val plugins: List<PluginMainDescriptor>,
1616
val languages: List<LSLanguage>,
1717
) {
1818
val allCommandDescriptors: List<LSCommandDescriptor> = entries<LSCommandDescriptorProvider>().flatMap { it.commandDescriptors }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jetbrains.ls.api.features.language
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.LSConfigurationEntry
55

66
class LSLanguageConfiguration(
77
val entries: List<LSConfigurationEntry>,
8-
val plugins: List<IdeaPluginDescriptorImpl>,
8+
val plugins: List<PluginMainDescriptor>,
99
val languages: List<LSLanguage>,
1010
)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.jetbrains.ls.api.features
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55

6-
val lsApiPlugin: IdeaPluginDescriptorImpl = ijPluginByXml("META-INF/language-server/features/api/lsApi.xml")
6+
val lsApiPlugin: PluginMainDescriptor = ijPluginByXml("META-INF/language-server/features/api/lsApi.xml")

api.features/src/com/jetbrains/ls/api/features/utils/ijPlugins.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.jetbrains.ls.api.features.utils
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.intellij.ide.plugins.PluginManagerCore
55
import com.intellij.ide.plugins.loadAndInitForCoreEnv
66
import com.intellij.openapi.application.PathManager
@@ -13,7 +13,7 @@ fun ijPluginByXml(
1313
xmlResourcePath: String,
1414
classForClasspath: Class<*>,
1515
useFakePluginId: Boolean = false,
16-
): IdeaPluginDescriptorImpl {
16+
): PluginMainDescriptor {
1717
val xmlResourcePath = xmlResourcePath.removePrefix("/")
1818
val pluginRoot = getPluginRoot(classForClasspath)
1919
fun createFakePluginId(): PluginId = PluginId.getId(xmlResourcePath)
@@ -49,6 +49,6 @@ private fun getPluginRoot(classForClasspath: Class<*>): Path {
4949
* The function is inline to have a correct classloader of the call-side
5050
*/
5151
@Suppress("NOTHING_TO_INLINE")
52-
inline fun ijPluginByXml(xmlResourcePath: String): IdeaPluginDescriptorImpl {
52+
inline fun ijPluginByXml(xmlResourcePath: String): PluginMainDescriptor {
5353
return ijPluginByXml(xmlResourcePath, object : Any() {}::class.java)
5454
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jetbrains.ls.api.features.impl.common.api
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55

6-
internal val commonLsApiPlugin: IdeaPluginDescriptorImpl =
6+
internal val commonLsApiPlugin: PluginMainDescriptor =
77
ijPluginByXml("META-INF/language-server/features/common/commonLsApi.xml")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.jetbrains.ls.api.features.impl.common.codeStyle
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55

6-
val commonCodeStylePlugin: IdeaPluginDescriptorImpl = ijPluginByXml(
6+
val commonCodeStylePlugin: PluginMainDescriptor = ijPluginByXml(
77
"META-INF/language-server/features/common/codeStyle.xml"
88
)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jetbrains.ls.api.features.impl.common.completion
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55

6-
val commonCompletionPlugin: IdeaPluginDescriptorImpl =
6+
val commonCompletionPlugin: PluginMainDescriptor =
77
ijPluginByXml("/META-INF/language-server/features/common/completion.xml")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.jetbrains.ls.api.features.impl.common
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55

6-
val coreIjPlugin: IdeaPluginDescriptorImpl = ijPluginByXml(
6+
val coreIjPlugin: PluginMainDescriptor = ijPluginByXml(
77
"META-INF/language-server/features/common/core.xml"
88
)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jetbrains.ls.api.features.impl.common.search
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55

6-
val commonUsagesPlugin: IdeaPluginDescriptorImpl =
6+
val commonUsagesPlugin: PluginMainDescriptor =
77
ijPluginByXml("META-INF/language-server/features/common/usages.xml")
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.jetbrains.ls.api.features.impl.common.kotlin.apiImpl
22

33
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
4+
import com.intellij.ide.plugins.PluginMainDescriptor
45
import com.jetbrains.ls.api.features.utils.ijPluginByXml
56

6-
internal val lsApiKotlinImpl: IdeaPluginDescriptorImpl = ijPluginByXml("META-INF/language-server/features/kotlin/lsApiKotlinImpl.xml")
7+
internal val lsApiKotlinImpl: PluginMainDescriptor = ijPluginByXml("META-INF/language-server/features/kotlin/lsApiKotlinImpl.xml")

features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/codeActions/kotlinCodeActionsPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.jetbrains.ls.api.features.impl.common.kotlin.codeActions
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55
import org.jetbrains.kotlin.idea.codeInsight.inspections.shared.KotlinUnusedImportInspection
66
import org.jetbrains.kotlin.idea.k2.codeinsight.inspections.UsePropertyAccessSyntaxInspection
77

8-
internal val kotlinCodeActionsPlugins: List<IdeaPluginDescriptorImpl> = listOf(
8+
internal val kotlinCodeActionsPlugins: List<PluginMainDescriptor> = listOf(
99
ijPluginByXml("META-INF/language-server/features/kotlin/codeActions.xml"),
1010
ijPluginByXml("kotlin.code-insight.inspections.k2.xml", classForClasspath = UsePropertyAccessSyntaxInspection::class.java),
1111
ijPluginByXml("kotlin.code-insight.inspections.shared.xml", classForClasspath = KotlinUnusedImportInspection::class.java),

features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/codeStyle/kotlinCodeStylePlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.jetbrains.ls.api.features.impl.common.kotlin.codeStyle
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55
import org.jetbrains.kotlin.idea.plugin.common.KotlinPluginCommonClassForClassPath
66

7-
internal val kotlinCodeStylePlugin: IdeaPluginDescriptorImpl =
7+
internal val kotlinCodeStylePlugin: PluginMainDescriptor =
88
ijPluginByXml(
99
"/META-INF/formatter.xml",
1010
classForClasspath = KotlinPluginCommonClassForClassPath::class.java,
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.jetbrains.ls.api.features.impl.common.kotlin.completion
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55

6-
internal val kotlinCompletionPlugin: IdeaPluginDescriptorImpl = ijPluginByXml(
6+
internal val kotlinCompletionPlugin: PluginMainDescriptor = ijPluginByXml(
77
"META-INF/language-server/features/kotlin/completion.xml"
88
)

features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/usages/kotlinUsagesIjPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.jetbrains.ls.api.features.impl.common.kotlin.usages
22

3-
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl
3+
import com.intellij.ide.plugins.PluginMainDescriptor
44
import com.jetbrains.ls.api.features.utils.ijPluginByXml
55
import org.jetbrains.kotlin.idea.plugin.common.KotlinPluginCommonClassForClassPath
66
import org.jetbrains.kotlin.idea.searching.kmp.KotlinK2ExpectActualSupport
77

8-
internal val kotlinUsagesIjPlugins: List<IdeaPluginDescriptorImpl> by lazy {
8+
internal val kotlinUsagesIjPlugins: List<PluginMainDescriptor> by lazy {
99
listOf(
1010
ijPluginByXml("META-INF/searching-base.xml", KotlinPluginCommonClassForClassPath::class.java, useFakePluginId = true),
1111
ijPluginByXml("META-INF/language-server/features/kotlin/usages.xml"),

0 commit comments

Comments
 (0)