File tree Expand file tree Collapse file tree 5 files changed +14
-15
lines changed
api.features/src/com/jetbrains/ls/api/features
common/src/com/jetbrains/ls/api/features/impl/common/configuration
kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/configuration
kotlin-lsp/src/com/jetbrains/ls/kotlinLsp Expand file tree Collapse file tree 5 files changed +14
-15
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ import com.jetbrains.ls.api.features.commands.LSCommandDescriptor
66import com.jetbrains.ls.api.features.commands.LSCommandDescriptorProvider
77import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
88import com.jetbrains.ls.api.features.language.LSLanguage
9- import com.jetbrains.ls.api.features.language.LSLanguageConfiguration
9+ import com.jetbrains.ls.api.features.language.LSConfigurationPiece
1010import com.jetbrains.ls.api.features.language.matches
1111import com.jetbrains.lsp.protocol.TextDocumentIdentifier
1212
@@ -99,7 +99,7 @@ context(configuration: LSConfiguration)
9999inline val allCommandDescriptors: List <LSCommandDescriptor > get() = configuration.allCommandDescriptors
100100
101101fun LSConfiguration (
102- languageConfigurations : List <LSLanguageConfiguration >,
102+ languageConfigurations : List <LSConfigurationPiece >,
103103): LSConfiguration {
104104 return LSConfiguration (
105105 entries = languageConfigurations.flatMap { it.entries },
@@ -109,7 +109,7 @@ fun LSConfiguration(
109109}
110110
111111fun LSConfiguration (
112- vararg languageConfigurations : LSLanguageConfiguration ,
112+ vararg languageConfigurations : LSConfigurationPiece ,
113113): LSConfiguration {
114114 return LSConfiguration (languageConfigurations.toList())
115115}
Original file line number Diff line number Diff line change @@ -4,8 +4,8 @@ package com.jetbrains.ls.api.features.language
44import com.intellij.ide.plugins.PluginMainDescriptor
55import com.jetbrains.ls.api.features.LSConfigurationEntry
66
7- class LSLanguageConfiguration (
8- val entries : List <LSConfigurationEntry >,
9- val plugins : List <PluginMainDescriptor >,
10- val languages : List <LSLanguage >,
7+ class LSConfigurationPiece (
8+ val entries : List <LSConfigurationEntry > = emptyList() ,
9+ val plugins : List <PluginMainDescriptor > = emptyList() ,
10+ val languages : List <LSLanguage > = emptyList() ,
1111)
Original file line number Diff line number Diff line change @@ -4,10 +4,10 @@ package com.jetbrains.ls.api.features.impl.common.configuration
44import com.jetbrains.ls.api.features.impl.common.api.commonLsApiPlugin
55import com.jetbrains.ls.api.features.impl.common.decompiler.LSDecompileCommandDescriptorProvider
66import com.jetbrains.ls.api.features.impl.common.workspace.LSExportWorkspaceCommandDescriptorProvider
7- import com.jetbrains.ls.api.features.language.LSLanguageConfiguration
7+ import com.jetbrains.ls.api.features.language.LSConfigurationPiece
88import com.jetbrains.ls.api.features.lsApiPlugin
99
10- val LSCommonConfiguration : LSLanguageConfiguration = LSLanguageConfiguration (
10+ val LSCommonConfiguration : LSConfigurationPiece = LSConfigurationPiece (
1111 entries = listOf (
1212 LSDecompileCommandDescriptorProvider ,
1313 LSExportWorkspaceCommandDescriptorProvider ,
@@ -16,5 +16,4 @@ val LSCommonConfiguration: LSLanguageConfiguration = LSLanguageConfiguration(
1616 lsApiPlugin,
1717 commonLsApiPlugin,
1818 ),
19- languages = emptyList(),
2019)
Original file line number Diff line number Diff line change @@ -26,11 +26,11 @@ import com.jetbrains.ls.api.features.impl.common.kotlin.symbols.LSWorkspaceSymbo
2626import com.jetbrains.ls.api.features.impl.common.kotlin.usages.kotlinUsagesIjPlugins
2727import com.jetbrains.ls.api.features.impl.common.references.LSReferencesProviderCommonImpl
2828import com.jetbrains.ls.api.features.impl.common.rename.LSRenameProviderCommonImpl
29- import com.jetbrains.ls.api.features.language.LSLanguageConfiguration
29+ import com.jetbrains.ls.api.features.language.LSConfigurationPiece
3030import com.jetbrains.ls.api.features.utils.ijPluginByXml
3131import org.jetbrains.kotlin.idea.base.fir.codeInsight.FirCodeInsightForClassPath
3232
33- val LSKotlinLanguageConfiguration : LSLanguageConfiguration = LSLanguageConfiguration (
33+ val LSKotlinLanguageConfiguration : LSConfigurationPiece = LSConfigurationPiece (
3434 entries = listOf (
3535 LSOrganizeImportsCodeActionProviderKotlinImpl ,
3636 LSCompletionProviderKotlinImpl ,
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ import com.jetbrains.ls.api.core.withServer
1212import com.jetbrains.ls.api.features.LSConfiguration
1313import com.jetbrains.ls.api.features.impl.common.configuration.LSCommonConfiguration
1414import com.jetbrains.ls.api.features.impl.common.kotlin.configuration.LSKotlinLanguageConfiguration
15- import com.jetbrains.ls.api.features.language.LSLanguageConfiguration
15+ import com.jetbrains.ls.api.features.language.LSConfigurationPiece
1616import com.jetbrains.ls.kotlinLsp.connection.Client
1717import com.jetbrains.ls.kotlinLsp.logging.initKotlinLspLogger
1818import com.jetbrains.ls.kotlinLsp.requests.core.fileUpdateRequests
@@ -241,10 +241,10 @@ private fun preloadKotlinStdlibWhenRunningFromSources() {
241241}
242242
243243interface LanguageConfigurationProvider {
244- val languageConfiguration: LSLanguageConfiguration
244+ val languageConfiguration: LSConfigurationPiece
245245}
246246
247- private fun getAdditionalLanguageConfigurations (): List <LSLanguageConfiguration > {
247+ private fun getAdditionalLanguageConfigurations (): List <LSConfigurationPiece > {
248248 return ServiceLoader .load(LanguageConfigurationProvider ::class .java).map {
249249 it.languageConfiguration
250250 }
You can’t perform that action at this time.
0 commit comments