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
6
6
import com.jetbrains.ls.api.features.commands.LSCommandDescriptorProvider
7
7
import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
8
8
import 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
10
10
import com.jetbrains.ls.api.features.language.matches
11
11
import com.jetbrains.lsp.protocol.TextDocumentIdentifier
12
12
@@ -99,7 +99,7 @@ context(configuration: LSConfiguration)
99
99
inline val allCommandDescriptors: List <LSCommandDescriptor > get() = configuration.allCommandDescriptors
100
100
101
101
fun LSConfiguration (
102
- languageConfigurations : List <LSLanguageConfiguration >,
102
+ languageConfigurations : List <LSConfigurationPiece >,
103
103
): LSConfiguration {
104
104
return LSConfiguration (
105
105
entries = languageConfigurations.flatMap { it.entries },
@@ -109,7 +109,7 @@ fun LSConfiguration(
109
109
}
110
110
111
111
fun LSConfiguration (
112
- vararg languageConfigurations : LSLanguageConfiguration ,
112
+ vararg languageConfigurations : LSConfigurationPiece ,
113
113
): LSConfiguration {
114
114
return LSConfiguration (languageConfigurations.toList())
115
115
}
Original file line number Diff line number Diff line change @@ -4,8 +4,8 @@ package com.jetbrains.ls.api.features.language
4
4
import com.intellij.ide.plugins.PluginMainDescriptor
5
5
import com.jetbrains.ls.api.features.LSConfigurationEntry
6
6
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() ,
11
11
)
Original file line number Diff line number Diff line change @@ -4,10 +4,10 @@ package com.jetbrains.ls.api.features.impl.common.configuration
4
4
import com.jetbrains.ls.api.features.impl.common.api.commonLsApiPlugin
5
5
import com.jetbrains.ls.api.features.impl.common.decompiler.LSDecompileCommandDescriptorProvider
6
6
import 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
8
8
import com.jetbrains.ls.api.features.lsApiPlugin
9
9
10
- val LSCommonConfiguration : LSLanguageConfiguration = LSLanguageConfiguration (
10
+ val LSCommonConfiguration : LSConfigurationPiece = LSConfigurationPiece (
11
11
entries = listOf (
12
12
LSDecompileCommandDescriptorProvider ,
13
13
LSExportWorkspaceCommandDescriptorProvider ,
@@ -16,5 +16,4 @@ val LSCommonConfiguration: LSLanguageConfiguration = LSLanguageConfiguration(
16
16
lsApiPlugin,
17
17
commonLsApiPlugin,
18
18
),
19
- languages = emptyList(),
20
19
)
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
26
26
import com.jetbrains.ls.api.features.impl.common.kotlin.usages.kotlinUsagesIjPlugins
27
27
import com.jetbrains.ls.api.features.impl.common.references.LSReferencesProviderCommonImpl
28
28
import 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
30
30
import com.jetbrains.ls.api.features.utils.ijPluginByXml
31
31
import org.jetbrains.kotlin.idea.base.fir.codeInsight.FirCodeInsightForClassPath
32
32
33
- val LSKotlinLanguageConfiguration : LSLanguageConfiguration = LSLanguageConfiguration (
33
+ val LSKotlinLanguageConfiguration : LSConfigurationPiece = LSConfigurationPiece (
34
34
entries = listOf (
35
35
LSOrganizeImportsCodeActionProviderKotlinImpl ,
36
36
LSCompletionProviderKotlinImpl ,
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ import com.jetbrains.ls.api.core.withServer
12
12
import com.jetbrains.ls.api.features.LSConfiguration
13
13
import com.jetbrains.ls.api.features.impl.common.configuration.LSCommonConfiguration
14
14
import 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
16
16
import com.jetbrains.ls.kotlinLsp.connection.Client
17
17
import com.jetbrains.ls.kotlinLsp.logging.initKotlinLspLogger
18
18
import com.jetbrains.ls.kotlinLsp.requests.core.fileUpdateRequests
@@ -241,10 +241,10 @@ private fun preloadKotlinStdlibWhenRunningFromSources() {
241
241
}
242
242
243
243
interface LanguageConfigurationProvider {
244
- val languageConfiguration: LSLanguageConfiguration
244
+ val languageConfiguration: LSConfigurationPiece
245
245
}
246
246
247
- private fun getAdditionalLanguageConfigurations (): List <LSLanguageConfiguration > {
247
+ private fun getAdditionalLanguageConfigurations (): List <LSConfigurationPiece > {
248
248
return ServiceLoader .load(LanguageConfigurationProvider ::class .java).map {
249
249
it.languageConfiguration
250
250
}
You can’t perform that action at this time.
0 commit comments