Move server config to Configuration.kt

Author: daplf

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

@@ -1,5 +1,13 @@
 package org.javacs.kt
 
+import com.google.gson.*
+import org.eclipse.lsp4j.InitializeParams
+import org.javacs.kt.storage.Storage
+import java.lang.reflect.Type
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+
 public data class SnippetsConfiguration(
     /** Whether code completion should return VSCode-style snippets. */
     var enabled: Boolean = true
@@ -35,10 +43,47 @@ public data class ExternalSourcesConfiguration(
     var autoConvertToKotlin: Boolean = true
 )
 
+
+fun parseServerConfiguration(params: InitializeParams): ServerConfiguration? {
+    val gson = GsonBuilder().registerTypeHierarchyAdapter(Path::class.java, GsonPathConverter()).create()
+
+    var storage: Storage? = null
+
+    params.initializationOptions?.let { initializationOptions ->
+        val options = gson.fromJson(initializationOptions as JsonElement, InitializationOptions::class.java)
+
+        options.storagePath?.let { storagePath ->
+            if (Files.isDirectory(storagePath)) {
+                storage = Storage(storagePath)
+            }
+        }
+    }
+
+    return ServerConfiguration(storage)
+}
+
+data class InitializationOptions(val storagePath: Path?)
+
+data class ServerConfiguration(val storage: Storage?)
+
+class GsonPathConverter : JsonDeserializer<Path?> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, type: Type?, context: JsonDeserializationContext?): Path? {
+        return try {
+            Paths.get(json.asString)
+        } catch (ex: Exception) {
+            LOG.printStackTrace(ex)
+            null
+        }
+    }
+}
+
 public data class Configuration(
     val compiler: CompilerConfiguration = CompilerConfiguration(),
     val completion: CompletionConfiguration = CompletionConfiguration(),
     val linting: LintingConfiguration = LintingConfiguration(),
     var indexing: IndexingConfiguration = IndexingConfiguration(),
-    val externalSources: ExternalSourcesConfiguration = ExternalSourcesConfiguration()
+    val externalSources: ExternalSourcesConfiguration = ExternalSourcesConfiguration(),
+    var server: ServerConfiguration? = null
 )

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

@@ -7,8 +7,6 @@ import org.eclipse.lsp4j.services.LanguageClient
 import org.eclipse.lsp4j.services.LanguageClientAware
 import org.eclipse.lsp4j.services.LanguageServer
 import org.javacs.kt.command.ALL_COMMANDS
-import org.javacs.kt.config.ServerConfiguration
-import org.javacs.kt.config.parseServerConfiguration
 import org.javacs.kt.externalsources.ClassPathSourceJarProvider
 import org.javacs.kt.externalsources.JarClassContentProvider
 import org.javacs.kt.progress.LanguageClientProgress
@@ -44,8 +42,6 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
             sourcePath.progressFactory = factory
         }
 
-    private var serverConfiguration: ServerConfiguration? = null
-
     companion object {
         val VERSION: String? = System.getProperty("kotlinLanguageServer.version")
     }
@@ -92,9 +88,9 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
         serverCapabilities.documentRangeFormattingProvider = Either.forLeft(true)
         serverCapabilities.executeCommandProvider = ExecuteCommandOptions(ALL_COMMANDS)
 
-        serverConfiguration = parseServerConfiguration(params)
+        config.server = parseServerConfiguration(params)
 
-        classPath.storage = serverConfiguration?.storage?.getSlice("classpath")
+        classPath.storage = config.server?.storage?.getSlice("classpath")
 
         val clientCapabilities = params.capabilities
         config.completion.snippets.enabled = clientCapabilities?.textDocument?.completion?.completionItem?.snippetSupport ?: false