Skip to content

Commit b165cb0

Browse files
darthorimarintellij-monorepo-bot
authored andcommitted
[lsp] rename LSLanguageConfiguration to LSConfigurationPiece and add default values to the constructor
as it's not only about languages now and also includes eg. debugger or some common code GitOrigin-RevId: b0042d4ef0fb348bda5f4c82abbd453536e0743c
1 parent b4bb52a commit b165cb0

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.jetbrains.ls.api.features.commands.LSCommandDescriptor
66
import com.jetbrains.ls.api.features.commands.LSCommandDescriptorProvider
77
import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
88
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
1010
import com.jetbrains.ls.api.features.language.matches
1111
import com.jetbrains.lsp.protocol.TextDocumentIdentifier
1212

@@ -99,7 +99,7 @@ context(configuration: LSConfiguration)
9999
inline val allCommandDescriptors: List<LSCommandDescriptor> get() = configuration.allCommandDescriptors
100100

101101
fun 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

111111
fun LSConfiguration(
112-
vararg languageConfigurations: LSLanguageConfiguration,
112+
vararg languageConfigurations: LSConfigurationPiece,
113113
): LSConfiguration {
114114
return LSConfiguration(languageConfigurations.toList())
115115
}

api.features/src/com/jetbrains/ls/api/features/language/LSLanguageConfiguration.kt renamed to api.features/src/com/jetbrains/ls/api/features/language/LSConfigurationPiece.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ package com.jetbrains.ls.api.features.language
44
import com.intellij.ide.plugins.PluginMainDescriptor
55
import 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
)

features-impl/common/src/com/jetbrains/ls/api/features/impl/common/configuration/LSCommonConfiguration.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ package com.jetbrains.ls.api.features.impl.common.configuration
44
import com.jetbrains.ls.api.features.impl.common.api.commonLsApiPlugin
55
import com.jetbrains.ls.api.features.impl.common.decompiler.LSDecompileCommandDescriptorProvider
66
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
88
import 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
)

features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/configuration/LSKotlinLanguageConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import com.jetbrains.ls.api.features.impl.common.kotlin.symbols.LSWorkspaceSymbo
2626
import com.jetbrains.ls.api.features.impl.common.kotlin.usages.kotlinUsagesIjPlugins
2727
import com.jetbrains.ls.api.features.impl.common.references.LSReferencesProviderCommonImpl
2828
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
3030
import com.jetbrains.ls.api.features.utils.ijPluginByXml
3131
import 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,

kotlin-lsp/src/com/jetbrains/ls/kotlinLsp/KotlinLspServer.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.jetbrains.ls.api.core.withServer
1212
import com.jetbrains.ls.api.features.LSConfiguration
1313
import com.jetbrains.ls.api.features.impl.common.configuration.LSCommonConfiguration
1414
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
1616
import com.jetbrains.ls.kotlinLsp.connection.Client
1717
import com.jetbrains.ls.kotlinLsp.logging.initKotlinLspLogger
1818
import com.jetbrains.ls.kotlinLsp.requests.core.fileUpdateRequests
@@ -241,10 +241,10 @@ private fun preloadKotlinStdlibWhenRunningFromSources() {
241241
}
242242

243243
interface 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
}

0 commit comments

Comments
 (0)