Skip to content

Commit 7b05be0

Browse files
committed
Rename config object to inlayHints for consistency
1 parent 1b546ee commit 7b05be0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,5 @@ public data class Configuration(
101101
val scripts: ScriptsConfiguration = ScriptsConfiguration(),
102102
val indexing: IndexingConfiguration = IndexingConfiguration(),
103103
val externalSources: ExternalSourcesConfiguration = ExternalSourcesConfiguration(),
104-
val hints: InlayHintsConfiguration = InlayHintsConfiguration()
104+
val inlayHints: InlayHintsConfiguration = InlayHintsConfiguration()
105105
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class KotlinTextDocumentService(
9898

9999
override fun inlayHint(params: InlayHintParams): CompletableFuture<List<InlayHint>> = async.compute {
100100
val (file, _) = recover(params.textDocument.uri, params.range.start, Recompile.ALWAYS)
101-
provideHints(file, config.hints)
101+
provideHints(file, config.inlayHints)
102102
}
103103

104104
override fun hover(position: HoverParams): CompletableFuture<Hover?> = async.compute {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ class KotlinWorkspaceService(
105105

106106
// Update options for inlay hints
107107
get("inlayHints")?.asJsonObject?.apply {
108-
val hints = config.hints
109-
get("typeHints")?.asBoolean?.let { hints.typeHints = it }
110-
get("parameterHints")?.asBoolean?.let { hints.parameterHints = it }
111-
get("chainedHints")?.asBoolean?.let { hints.chainedHints = it }
108+
val inlayHints = config.inlayHints
109+
get("typeHints")?.asBoolean?.let { inlayHints.typeHints = it }
110+
get("parameterHints")?.asBoolean?.let { inlayHints.parameterHints = it }
111+
get("chainedHints")?.asBoolean?.let { inlayHints.chainedHints = it }
112112
}
113113

114114
// Update diagnostics options

server/src/test/kotlin/org/javacs/kt/LanguageServerTestFixture.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ abstract class LanguageServerTestFixture(
4545
uri = workspaceRoot.toUri().toString()
4646
})
4747

48-
languageServer.config.hints.apply {
49-
this.typeHints = true
50-
this.parameterHints = true
51-
this.chainedHints = true
48+
languageServer.config.inlayHints.apply {
49+
typeHints = true
50+
parameterHints = true
51+
chainedHints = true
5252
}
5353
languageServer.sourcePath.indexEnabled = false
5454
languageServer.connect(this)

0 commit comments

Comments
 (0)