From c1a7356c396c5013fb5a67e0c0b60d1c6f765a5a Mon Sep 17 00:00:00 2001
From: Tyler Wilding <xTVaser@users.noreply.github.com>
Date: Mon, 22 Aug 2022 18:59:18 -0400
Subject: [PATCH] Fix comments not being tokenized properly if the "head" of a
 form, show LSP version (#66)

---
 src/lsp/main.ts                        | 4 ++--
 syntaxes/opengoal-goos.tmLanguage.json | 5 ++++-
 syntaxes/opengoal.tmLanguage.json      | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/lsp/main.ts b/src/lsp/main.ts
index aa9a875..4c063be 100644
--- a/src/lsp/main.ts
+++ b/src/lsp/main.ts
@@ -42,7 +42,7 @@ function updateStatus(status: LspStatus, extraInfo?: string) {
       break;
     case "started":
       lspStatusItem.text = "$(circle-filled) OpenGOAL LSP Ready";
-      lspStatusItem.tooltip = "LSP Active";
+      lspStatusItem.tooltip = `LSP Active - ${extraInfo}`;
       lspStatusItem.command = "opengoal.lsp.showLspStartedMenu";
       break;
     case "downloading":
@@ -196,7 +196,7 @@ async function startClient(): Promise<void> {
     updateStatus("starting");
     await client.start();
     activeClient = client;
-    updateStatus("started");
+    updateStatus("started", path.basename(opengoalLspPath));
   } catch (error) {
     console.error("opengoal-lsp:", error);
     updateStatus("error");
diff --git a/syntaxes/opengoal-goos.tmLanguage.json b/syntaxes/opengoal-goos.tmLanguage.json
index c299a74..fc02049 100644
--- a/syntaxes/opengoal-goos.tmLanguage.json
+++ b/syntaxes/opengoal-goos.tmLanguage.json
@@ -202,6 +202,9 @@
             }
           ]
         },
+        {
+          "include": "#comment"
+        },
         {
           "include": "#keyfn"
         },
@@ -263,7 +266,7 @@
       "name": "meta.var.opengoal-ir"
     },
     "readerMacros": {
-      "match": "('|,@|`|,)",
+      "match": "('|,@|`|,|&->)",
       "name": "keyword.operator.opengoal-ir"
     }
   }
diff --git a/syntaxes/opengoal.tmLanguage.json b/syntaxes/opengoal.tmLanguage.json
index 7563973..75f6eef 100644
--- a/syntaxes/opengoal.tmLanguage.json
+++ b/syntaxes/opengoal.tmLanguage.json
@@ -202,6 +202,9 @@
             }
           ]
         },
+        {
+          "include": "#comment"
+        },
         {
           "include": "#keyfn"
         },
@@ -263,7 +266,7 @@
       "name": "meta.var.opengoal"
     },
     "readerMacros": {
-      "match": "('|,@|`|,)",
+      "match": "('|,@|`|,|&->)",
       "name": "keyword.operator.opengoal"
     }
   }