Merge branch 'updatedeps' into lintfix

Author: Decodetalkers

detekt.yml

@@ -24,6 +24,8 @@ exceptions:
       - NumberFormatException
       - ParseException
       - MissingPropertyException
+  TooGenericExceptionCaught:
+    active: false
 
 naming:
   excludes: *standardExcludes

gradle/libs.versions.toml

@@ -1,9 +1,10 @@
 [versions]
 kotlinVersion = "2.1.0"
-lsp4jVersion = "0.21.2"
-exposedVersion = "0.37.3"
+lsp4jVersion = "0.23.1"
+exposedVersion = "0.58.0"
 jmhVersion = "1.20"
-guavaVersion = "33.3.0-jre"
+slf4j = "2.0.16"
+guavaVersion = "33.4.0-jre"
 
 [libraries]
 org-jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinVersion" }
@@ -41,12 +42,17 @@ com-beust-jcommander = { module = "com.beust:jcommander", version = "1.78" }
 org-openjdk-jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmhVersion" }
 org-openjdk-jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmhVersion" }
 
-org-xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.41.2.1" }
+org-xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.48.0.0" }
 
 # buildSrc
-org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",version.ref = "kotlinVersion" }
+org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
+
+# this is used to remove the error info in console log
+org-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+org-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
+
 
 [plugins]
-com-github-jk1-tcdeps = { id = "com.github.jk1.tcdeps", version = "1.2" }
-com-jaredsburrows-license = { id = "com.jaredsburrows.license", version = "0.8.42" }
+com-github-jk1-tcdeps = { id = "com.github.jk1.tcdeps", version = "1.6.2" }
+com-jaredsburrows-license = { id = "com.jaredsburrows.license", version = "0.9.8" }
 io-gitlab-arturbosch-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" }

server/build.gradle.kts

@@ -44,6 +44,10 @@ dependencies {
     implementation(libs.org.eclipse.lsp4j.lsp4j)
     implementation(libs.org.eclipse.lsp4j.jsonrpc)
 
+    // used to clear the error during console log
+    implementation(libs.org.slf4j.api)
+    implementation(libs.org.slf4j.simple)
+
     implementation(kotlin("compiler"))
     implementation(kotlin("scripting-compiler"))
     implementation(kotlin("scripting-jvm-host-unshaded"))

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

@@ -124,10 +124,7 @@ class KotlinLanguageServer(
             serverCapabilities.renameProvider = Either.forRight(RenameOptions(false))
         }
 
-        @Suppress("DEPRECATION")
         val folders = params.workspaceFolders?.takeIf { it.isNotEmpty() }
-            ?: params.rootUri?.let(::WorkspaceFolder)?.let(::listOf)
-            ?: params.rootPath?.let(Paths::get)?.toUri()?.toString()?.let(::WorkspaceFolder)?.let(::listOf)
             ?: listOf()
 
         val progress = params.workDoneToken?.let { LanguageClientProgress("Workspace folders", it, client) }

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

@@ -15,6 +15,7 @@ import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.*
 import kotlin.sequences.Sequence
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 
 private const val MAX_FQNAME_LENGTH = 255
 private const val MAX_SHORT_NAME_LENGTH = 80
@@ -110,7 +111,7 @@ class SymbolIndex(
                     addDeclarations(allDescriptors(module, exclusions))
 
                     val finished = System.currentTimeMillis()
-                    val count = Symbols.slice(Symbols.fqName.count()).selectAll().first()[Symbols.fqName.count()]
+                    val count = Symbols.selectAll().first()[Symbols.fqName.count()]
                     LOG.info("Updated full symbol index in ${finished - started} ms! (${count} symbol(s))")
                 }
             } catch (e: Exception) {
@@ -133,7 +134,7 @@ class SymbolIndex(
                 addDeclarations(add)
 
                 val finished = System.currentTimeMillis()
-                val count = Symbols.slice(Symbols.fqName.count()).selectAll().first()[Symbols.fqName.count()]
+                val count = Symbols.selectAll().first()[Symbols.fqName.count()]
                 LOG.info("Updated symbol index in ${finished - started} ms! (${count} symbol(s))")
             }
         } catch (e: Exception) {

shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt

@@ -116,7 +116,13 @@ internal class CachedClassPathResolver(
         LOG.info("Cached classpath is outdated or not found. Resolving again")
 
         val newClasspath = wrapped.classpath
-        updateClasspathCache(newClasspath, false)
+        // We need to make sure the cache resolve won't throw error here, make deps can be loaded successfully
+        try {
+            // in old exposed this will throw error, but I do not know if it will throw again, so I catch here
+            updateClasspathCache(newClasspath, false)
+        } catch (e: Exception) {
+            LOG.warn("Something error during update database, error: ${e.message}")
+        }
 
         return newClasspath
     }