From e543f3bbc702ae07c3c3a34a9e06a9314112b58b Mon Sep 17 00:00:00 2001
From: Marcin Mielniczuk <marmistrz.dev@zoho.eu>
Date: Sun, 17 Jun 2018 14:09:09 +0200
Subject: [PATCH 1/2] Add the configuration options used by the plugin

Before that change, VS Code would complain about unknown configuration
options if those options were added to `settings.json`.
---
 scala/package.json | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scala/package.json b/scala/package.json
index 8459a7b..5d03fb1 100644
--- a/scala/package.json
+++ b/scala/package.json
@@ -103,7 +103,24 @@
                 "title": "scalariformFormat",
                 "category": "sbt"
             }
-        ]
+        ],
+        "configuration": {
+            "type": "object",
+            "title": "Scala Language Server configuration",
+            "properties": {
+                "scalaLanguageServer.heapSize": {
+                    "type": "string",
+                    "default": "768M",
+                    "description": "Sets the heap size used by the Scala language server, for example `512M` or `4G`. The default is probably insufficient for larger projects and may be the cause for the language server being unresponsive."
+                },
+                "scalaLanguageServer.logLevel": {
+                    "type": "string",
+                    "default": "DEBUG",
+                    "enum": ["DEBUG", "ERROR", "INFO", "WARN"],
+                    "description": "Sets the log level on the server."
+                }
+            }
+        }
     },
     "scripts": {
         "vscode:prepublish": "curl -L -o coursier https://github.com/alexarchambault/coursier/raw/991b60ddbcb7d781c17a463f7af980f2dd888d4b/coursier && tsc -p ./",

From ca12d4c533426a1d14ffba08d42c6c010bfd0403 Mon Sep 17 00:00:00 2001
From: Marcin Mielniczuk <marmistrz.dev@zoho.eu>
Date: Sun, 17 Jun 2018 14:50:37 +0200
Subject: [PATCH 2/2] Fix Scala.tmLanguage

---
 scala/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scala/package.json b/scala/package.json
index 5d03fb1..3d8588d 100644
--- a/scala/package.json
+++ b/scala/package.json
@@ -48,7 +48,7 @@
             {
                 "language": "scala",
                 "scopeName": "source.scala",
-                "path": "./syntaxes/Scala.tmLanguage"
+                "path": "./syntaxes/scala.tmLanguage"
             }
         ],
         "snippets": [