From 7cfcf5222c528c27475dc5f6b538aefb3707967d Mon Sep 17 00:00:00 2001
From: Daan Vanden Bosch <daan.v.d.bosch@gmail.com>
Date: Thu, 8 Aug 2019 11:02:06 +0200
Subject: [PATCH] Script editor now supports line comments.

---
 FEATURES.md                                   |  3 +++
 src/scripting/AssemblyLexer.ts                | 21 ++++++++++++++++++-
 .../quest_editor/AssemblyEditorComponent.tsx  |  5 ++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/FEATURES.md b/FEATURES.md
index 15845c08..7916a33c 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -19,6 +19,8 @@ Features that are in ***bold italics*** are planned and not yet implemented.
   - Save as dialog to choose name
 - Support for .qst (BB, ***GC***, ***PC***, ***DC***)
 - ***Notify user when and why quest saving fails***
+- Custom text-based format
+  - Usable with SCM tools
 
 ## Undo/Redo
 
@@ -111,6 +113,7 @@ Features that are in ***bold italics*** are planned and not yet implemented.
 - ***Show instruction documentation on hover over***
 - ***Show reserved register usage on hover over***
 - ***When saving, ask user whether to really save when asm contains errors***
+- ***Theme selection***
 
 ## Enemy Waves
 
diff --git a/src/scripting/AssemblyLexer.ts b/src/scripting/AssemblyLexer.ts
index e7c08ca8..71b14934 100644
--- a/src/scripting/AssemblyLexer.ts
+++ b/src/scripting/AssemblyLexer.ts
@@ -143,6 +143,16 @@ export class AssemblyLexer {
             const char = this.peek();
             let token: Token;
 
+            if ("/" === char) {
+                this.skip();
+
+                if ("/" === this.peek()) {
+                    break;
+                } else {
+                    this.back();
+                }
+            }
+
             if (/\s/.test(char)) {
                 this.skip();
                 continue;
@@ -380,8 +390,17 @@ export class AssemblyLexer {
         this.mark();
 
         while (this.has_next()) {
-            if (/[\s,]/.test(this.peek())) {
+            const char = this.peek();
+
+            if (/[\s,]/.test(char)) {
                 break;
+            } else if ("/" === char) {
+                this.skip();
+
+                if (this.peek() === "/") {
+                    this.back();
+                    break;
+                }
             } else {
                 this.skip();
             }
diff --git a/src/ui/quest_editor/AssemblyEditorComponent.tsx b/src/ui/quest_editor/AssemblyEditorComponent.tsx
index 1839ced7..78a4652e 100644
--- a/src/ui/quest_editor/AssemblyEditorComponent.tsx
+++ b/src/ui/quest_editor/AssemblyEditorComponent.tsx
@@ -36,7 +36,7 @@ const ASM_SYNTAX: languages.IMonarchLanguage = {
             // Whitespace.
             [/[ \t\r\n]+/, "white"],
             // [/\/\*/, "comment", "@comment"],
-            // [/\/\/.*$/, "comment"],
+            [/\/\/.*$/, "comment"],
 
             // Delimiters.
             [/,/, "delimiter"],
@@ -113,6 +113,9 @@ languages.setLanguageConfiguration("psoasm", {
     },
     autoClosingPairs: [{ open: '"', close: '"' }],
     surroundingPairs: [{ open: '"', close: '"' }],
+    comments: {
+        lineComment: "//",
+    },
 });
 
 editor.defineTheme("phantasmal-world", {