Skip to content

Commit 63dc8af

Browse files
committed
Rename linting configuration to diagnostics
1 parent 80fc538 commit 63dc8af

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

server/src/main/kotlin/org/javacs/kt/Configuration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public data class CompletionConfiguration(
2020
val snippets: SnippetsConfiguration = SnippetsConfiguration()
2121
)
2222

23-
public data class LintingConfiguration(
23+
public data class DiagnosticsConfiguration(
2424
/** The time interval between subsequent lints in ms. */
2525
var debounceTime: Long = 250L
2626
)
@@ -85,7 +85,7 @@ class GsonPathConverter : JsonDeserializer<Path?> {
8585
public data class Configuration(
8686
val compiler: CompilerConfiguration = CompilerConfiguration(),
8787
val completion: CompletionConfiguration = CompletionConfiguration(),
88-
val linting: LintingConfiguration = LintingConfiguration(),
88+
val diagnostics: DiagnosticsConfiguration = DiagnosticsConfiguration(),
8989
var indexing: IndexingConfiguration = IndexingConfiguration(),
9090
val externalSources: ExternalSourcesConfiguration = ExternalSourcesConfiguration(),
9191
val hints: InlayHintsConfiguration = InlayHintsConfiguration()

server/src/main/kotlin/org/javacs/kt/KotlinTextDocumentService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class KotlinTextDocumentService(
4646
private lateinit var client: LanguageClient
4747
private val async = AsyncExecutor()
4848

49-
var debounceLint = Debouncer(Duration.ofMillis(config.linting.debounceTime))
49+
var debounceLint = Debouncer(Duration.ofMillis(config.diagnostics.debounceTime))
5050
val lintTodo = mutableSetOf<URI>()
5151
var lintCount = 0
5252

@@ -267,7 +267,7 @@ class KotlinTextDocumentService(
267267
}
268268

269269
public fun updateDebouncer() {
270-
debounceLint = Debouncer(Duration.ofMillis(config.linting.debounceTime))
270+
debounceLint = Debouncer(Duration.ofMillis(config.diagnostics.debounceTime))
271271
}
272272

273273
fun lintAll() {

server/src/main/kotlin/org/javacs/kt/KotlinWorkspaceService.kt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class KotlinWorkspaceService(
8585
settings?.get("kotlin")?.asJsonObject?.apply {
8686
// Update deprecated configuration keys
8787
get("debounceTime")?.asLong?.let {
88-
config.linting.debounceTime = it
88+
config.diagnostics.debounceTime = it
8989
docService.updateDebouncer()
9090
}
9191
get("snippetsEnabled")?.asBoolean?.let { config.completion.snippets.enabled = it }
@@ -110,12 +110,16 @@ class KotlinWorkspaceService(
110110
get("chainedHints")?.asBoolean?.let { hints.chainedHints = it }
111111
}
112112

113-
// Update linter options
114-
get("linting")?.asJsonObject?.apply {
115-
val linting = config.linting
116-
get("debounceTime")?.asLong?.let {
117-
linting.debounceTime = it
118-
docService.updateDebouncer()
113+
// Update diagnostics options
114+
// Note that the 'linting' key is deprecated and only kept
115+
// for backwards compatibility.
116+
for (diagnosticsKey in listOf("linting", "diagnostics")) {
117+
get(diagnosticsKey)?.asJsonObject?.apply {
118+
val diagnostics = config.diagnostics
119+
get("debounceTime")?.asLong?.let {
120+
diagnostics.debounceTime = it
121+
docService.updateDebouncer()
122+
}
119123
}
120124
}
121125

0 commit comments

Comments
 (0)