Only accept config under "effekt" key (#1050)

Unifies the server side with
effekt-lang/effekt-vscode#91. I think we should
wait with merging this at least until a new release of the VSCode
extension has been made. We could also have a longer transition period,
since there is urgency to stop accepting configuration not nested under
an `"effekt"` key.

Author: timsueberkrueb

effekt/jvm/src/main/scala/effekt/Server.scala

@@ -501,18 +501,15 @@ class Server(config: EffektConfig, compileOnChange: Boolean=false) extends Langu
   //
 
   def didChangeConfiguration(params: DidChangeConfigurationParams): Unit = {
-    // The configuration can be sent as a flat JSON object `{ "showIR": "core", ... }` or
-    // nested under an "effekt" key `{ "effekt": { "showIR": "core", ... } }`
-    // The former is sent by the VSCode extension for `initializationOptions`,
-    // the latter by newer extension versions for `workspace/didChangeConfiguration`.
+    // The configuration arrives as a JSON object nested under the "effekt" key
+    // `{ "effekt": { "showIR": "core", ... } }`
     val newSettings = params.getSettings.asInstanceOf[JsonElement]
     // When the settings come via `initializationOptions`, they can be null as per the LSP spec.
     if (newSettings.isJsonNull) {
       this.settings = null;
       return;
     }
     val newSettingsObj = newSettings.getAsJsonObject
-    this.settings = newSettingsObj;
     val effektSection = newSettingsObj.get("effekt")
     if (effektSection != null) {
       this.settings = effektSection

effekt/jvm/src/test/scala/effekt/LSPTests.scala

@@ -419,7 +419,7 @@ class LSPTests extends FunSuite {
       server.getTextDocumentService().didOpen(didOpenParams)
 
       val configParams = new DidChangeConfigurationParams()
-      val settings: JsonElement = JsonParser.parseString("""{"showExplanations": true}""")
+      val settings: JsonElement = JsonParser.parseString("""{"effekt": {"showExplanations": true}}""")
       configParams.setSettings(settings)
       server.getWorkspaceService().didChangeConfiguration(configParams)
 
@@ -1179,7 +1179,7 @@ class LSPTests extends FunSuite {
         raw"""def main() = <>""".textDocument
       val textDoc = new TextDocumentItem("file://path/to/test.effekt", "effekt", 0, source.getText)
       val initializeParams = new InitializeParams()
-      val initializationOptions = """{"showIR": "source"}"""
+      val initializationOptions = """{"effekt": {"showIR": "source"}}"""
       initializeParams.setInitializationOptions(JsonParser.parseString(initializationOptions))
       server.initialize(initializeParams).get()
 
@@ -1270,7 +1270,7 @@ class LSPTests extends FunSuite {
              |"""
       val textDoc = new TextDocumentItem("file://path/to/test.effekt", "effekt", 0, source.stripMargin)
       val initializeParams = new InitializeParams()
-      val initializationOptions = """{"showIR": "source"}"""
+      val initializationOptions = """{"effekt": {"showIR": "source"}}"""
       initializeParams.setInitializationOptions(JsonParser.parseString(initializationOptions))
       server.initialize(initializeParams).get()
 
@@ -1326,7 +1326,7 @@ class LSPTests extends FunSuite {
              |def bar(x: String): Int = <{ <> }> // a hole within a hole
              |""".textDocument
       val initializeParams = new InitializeParams()
-      val initializationOptions = """{"showHoles": true}"""
+      val initializationOptions = """{"effekt": {"showHoles": true}}"""
       initializeParams.setInitializationOptions(JsonParser.parseString(initializationOptions))
       server.initialize(initializeParams).get()
 
@@ -1394,7 +1394,7 @@ class LSPTests extends FunSuite {
              |""".stripMargin)
 
       val initializeParams = new InitializeParams()
-      val initializationOptions = """{"showHoles": true}"""
+      val initializationOptions = """{"effekt": {"showHoles": true}}"""
       initializeParams.setInitializationOptions(JsonParser.parseString(initializationOptions))
       server.initialize(initializeParams).get()
 
@@ -1419,7 +1419,7 @@ class LSPTests extends FunSuite {
              |""".textDocument
 
       val initializeParams = new InitializeParams()
-      val initializationOptions = """{"showHoles": true}"""
+      val initializationOptions = """{"effekt": {"showHoles": true}}"""
       initializeParams.setInitializationOptions(JsonParser.parseString(initializationOptions))
       server.initialize(initializeParams).get()
 
@@ -1485,7 +1485,7 @@ class LSPTests extends FunSuite {
              |""".textDocument
 
       val initializeParams = new InitializeParams()
-      val initializationOptions = """{"showHoles": true}"""
+      val initializationOptions = """{"effekt": {"showHoles": true}}"""
       initializeParams.setInitializationOptions(JsonParser.parseString(initializationOptions))
       server.initialize(initializeParams).get()