Skip to content

Commit f231b42

Browse files
committed
feat: bump deps and add missed deps
this will made save to cache won't error again
1 parent dc24041 commit f231b42

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

gradle/libs.versions.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlinVersion = "2.1.0"
33
lsp4jVersion = "0.21.2"
4-
exposedVersion = "0.37.3"
4+
exposedVersion = "0.58.0"
55
jmhVersion = "1.37"
66
guavaVersion = "33.4.0-jre"
77
fernFlowerVersion = "243.22562.218"
@@ -42,12 +42,18 @@ com-beust-jcommander = { module = "com.beust:jcommander", version = "1.82" }
4242
org-openjdk-jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmhVersion" }
4343
org-openjdk-jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmhVersion" }
4444

45-
org-xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.41.2.1" }
45+
org-xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.48.0.0" }
4646

4747
# buildSrc
48-
org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",version.ref = "kotlinVersion" }
48+
org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
49+
50+
# this is used to remove the error info in console log
51+
org-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
52+
org-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
53+
4954

5055
[plugins]
5156
com-github-jk1-tcdeps = { id = "com.github.jk1.tcdeps", version = "1.6.2" }
52-
com-jaredsburrows-license = { id = "com.jaredsburrows.license", version = "0.8.42" }
57+
58+
com-jaredsburrows-license = { id = "com.jaredsburrows.license", version = "0.9.8" }
5359
io-gitlab-arturbosch-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" }

server/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ dependencies {
4040
implementation(libs.org.eclipse.lsp4j.lsp4j)
4141
implementation(libs.org.eclipse.lsp4j.jsonrpc)
4242

43+
// used to clear the error during console log
44+
implementation(libs.org.slf4j.api)
45+
implementation(libs.org.slf4j.simple)
46+
4347
implementation(kotlin("compiler"))
4448
implementation(kotlin("scripting-compiler"))
4549
implementation(kotlin("scripting-jvm-host-unshaded"))

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,15 @@ class KotlinLanguageServer(
100100
val clientCapabilities = params.capabilities
101101
config.completion.snippets.enabled = clientCapabilities?.textDocument?.completion?.completionItem?.snippetSupport ?: false
102102

103-
if (clientCapabilities?.window?.workDoneProgress ?: false) {
103+
if (clientCapabilities?.window?.workDoneProgress == true) {
104104
progressFactory = LanguageClientProgress.Factory(client)
105105
}
106106

107-
if (clientCapabilities?.textDocument?.rename?.prepareSupport ?: false) {
107+
if (clientCapabilities?.textDocument?.rename?.prepareSupport == true) {
108108
serverCapabilities.renameProvider = Either.forRight(RenameOptions(false))
109109
}
110110

111-
@Suppress("DEPRECATION")
112111
val folders = params.workspaceFolders?.takeIf { it.isNotEmpty() }
113-
?: params.rootUri?.let(::WorkspaceFolder)?.let(::listOf)
114-
?: params.rootPath?.let(Paths::get)?.toUri()?.toString()?.let(::WorkspaceFolder)?.let(::listOf)
115112
?: listOf()
116113

117114
val progress = params.workDoneToken?.let { LanguageClientProgress("Workspace folders", it, client) }

server/src/main/kotlin/org/javacs/kt/index/SymbolIndex.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.jetbrains.exposed.dao.id.EntityID
1515
import org.jetbrains.exposed.dao.id.IntIdTable
1616
import org.jetbrains.exposed.sql.*
1717
import kotlin.sequences.Sequence
18+
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
1819

1920
private const val MAX_FQNAME_LENGTH = 255
2021
private const val MAX_SHORT_NAME_LENGTH = 80
@@ -110,7 +111,7 @@ class SymbolIndex(
110111
addDeclarations(allDescriptors(module, exclusions))
111112

112113
val finished = System.currentTimeMillis()
113-
val count = Symbols.slice(Symbols.fqName.count()).selectAll().first()[Symbols.fqName.count()]
114+
val count = Symbols.selectAll().first()[Symbols.fqName.count()]
114115
LOG.info("Updated full symbol index in ${finished - started} ms! (${count} symbol(s))")
115116
}
116117
} catch (e: Exception) {
@@ -133,7 +134,7 @@ class SymbolIndex(
133134
addDeclarations(add)
134135

135136
val finished = System.currentTimeMillis()
136-
val count = Symbols.slice(Symbols.fqName.count()).selectAll().first()[Symbols.fqName.count()]
137+
val count = Symbols.selectAll().first()[Symbols.fqName.count()]
137138
LOG.info("Updated symbol index in ${finished - started} ms! (${count} symbol(s))")
138139
}
139140
} catch (e: Exception) {

0 commit comments

Comments
 (0)