Skip to content

Commit f820c26

Browse files
committed
Resolve other deprecation warnings
1 parent ebc9cfb commit f820c26

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,7 @@ class KotlinTextDocumentService(
135135
val code = extractRange(params.textDocument.content, params.range)
136136
listOf(TextEdit(
137137
params.range,
138-
formatKotlinCode(
139-
code,
140-
isScript = params.textDocument.isKotlinScript,
141-
options = params.options
142-
)
138+
formatKotlinCode(code, params.options)
143139
))
144140
}
145141

@@ -210,11 +206,7 @@ class KotlinTextDocumentService(
210206
LOG.info("Formatting {}", describeURI(params.textDocument.uri))
211207
listOf(TextEdit(
212208
Range(Position(0, 0), position(code, code.length)),
213-
formatKotlinCode(
214-
code,
215-
isScript = params.textDocument.isKotlinScript,
216-
options = params.options
217-
)
209+
formatKotlinCode(code, params.options)
218210
))
219211
}
220212

server/src/main/kotlin/org/javacs/kt/completion/Completions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private fun extractPropertyName(d: DeclarationDescriptor): String {
222222
val match = Regex("(get|set)?((?:(?:is)|[A-Z])\\w*)").matchEntire(d.name.identifier)!!
223223
val upper = match.groups[2]!!.value
224224

225-
return upper[0].toLowerCase() + upper.substring(1)
225+
return upper[0].lowercaseChar() + upper.substring(1)
226226
}
227227

228228
private fun isGetter(d: DeclarationDescriptor): Boolean =

server/src/main/kotlin/org/javacs/kt/formatting/Formatter.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import org.eclipse.lsp4j.FormattingOptions
66

77
fun formatKotlinCode(
88
code: String,
9-
isScript: Boolean = false,
109
options: FormattingOptions = FormattingOptions(4, true)
1110
): String = format(KtfmtOptions(
1211
style = KtfmtOptions.Style.GOOGLE,

server/src/main/kotlin/org/javacs/kt/j2k/JavaTypeConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object JavaTypeConverter : PsiTypeVisitor<String>() {
1010

1111
override fun visitPrimitiveType(primitiveType: PsiPrimitiveType): String = when (primitiveType.canonicalText) {
1212
"void" -> "Unit"
13-
else -> primitiveType.canonicalText.capitalize()
13+
else -> primitiveType.canonicalText.replaceFirstChar { it.uppercaseChar() }
1414
}
1515

1616
override fun visitArrayType(arrayType: PsiArrayType): String = when (try {

0 commit comments

Comments
 (0)