Only use embedded db on symbol index (if no storage path is provided)

Author: daplf

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

@@ -21,7 +21,7 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
     private val javaSourcePath = mutableSetOf<Path>()
     private val buildScriptClassPath = mutableSetOf<Path>()
     val classPath = mutableSetOf<ClassPathEntry>()
-    lateinit var db: Database
+    var db: Database? = null
     val outputDirectory: File = Files.createTempDirectory("klsBuildOutput").toFile()
     val javaHome: String? = System.getProperty("java.home", null)
 

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

@@ -44,8 +44,7 @@ public data class ExternalSourcesConfiguration(
 )
 
 
-fun setupServerDatabase(params: InitializeParams): Database {
-    var db: Database? = null
+fun setupServerDatabase(params: InitializeParams): Database? {
     val dbName = "kls_database"
 
     params.initializationOptions?.let { initializationOptions ->
@@ -54,12 +53,12 @@ fun setupServerDatabase(params: InitializeParams): Database {
 
         options.storagePath?.let { storagePath ->
             if (Files.isDirectory(storagePath)) {
-                db = Database.connect("jdbc:sqlite:${Path.of(storagePath.toString(), dbName)}.db")
+                return Database.connect("jdbc:sqlite:${Path.of(storagePath.toString(), dbName)}.db")
             }
         }
     }
 
-    return db ?: Database.connect("jdbc:h2:mem:$dbName;DB_CLOSE_DELAY=-1", "org.h2.Driver")
+    return null
 }
 
 data class InitializationOptions(val storagePath: Path?)

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

@@ -92,7 +92,7 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
 
         val db = setupServerDatabase(params)
 
-        sourcePath.index = SymbolIndex(db)
+        sourcePath.index = if (db != null) SymbolIndex(db) else SymbolIndex()
         classPath.db = db
 
         val clientCapabilities = params.capabilities

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

@@ -80,7 +80,7 @@ class PositionEntity(id: EntityID<Int>) : IntEntity(id) {
 /**
  * A global view of all available symbols across all packages.
  */
-class SymbolIndex(private val db: Database) {
+class SymbolIndex(private val db: Database = Database.connect("jdbc:h2:mem:symbolindex;DB_CLOSE_DELAY=-1", "org.h2.Driver")) {
     var progressFactory: Progress.Factory = Progress.Factory.None
 
     init {

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

@@ -6,14 +6,14 @@ import java.nio.file.Path
 import java.nio.file.PathMatcher
 import java.nio.file.FileSystems
 
-fun defaultClassPathResolver(workspaceRoots: Collection<Path>, db: Database): ClassPathResolver =
-    CachedClassPathResolver(
-        WithStdlibResolver(
-            ShellClassPathResolver.global(workspaceRoots.firstOrNull())
-                .or(workspaceRoots.asSequence().flatMap { workspaceResolvers(it) }.joined)
-        ).or(BackupClassPathResolver),
-        db
-    )
+fun defaultClassPathResolver(workspaceRoots: Collection<Path>, db: Database? = null): ClassPathResolver {
+    val childResolver = WithStdlibResolver(
+        ShellClassPathResolver.global(workspaceRoots.firstOrNull())
+            .or(workspaceRoots.asSequence().flatMap { workspaceResolvers(it) }.joined)
+    ).or(BackupClassPathResolver)
+
+    return if (db != null) CachedClassPathResolver(childResolver, db) else childResolver
+}
 
 /** Searches the workspace for all files that could provide classpath info. */
 private fun workspaceResolvers(workspaceRoot: Path): Sequence<ClassPathResolver> {