Fix for #9: C-style comments

maziac · Nov 21, 2020 · bf6a808 · bf6a808
1 parent cbc2b53
commit bf6a808
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.2
+- Allowed for "//" C-style comments (fix by oxidaan)
+
 ## 1.0.1
 - Added donate button.
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "z80-instruction-set",
     "displayName": "Z80 Instruction Set",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "publisher": "maziac",
     "description": "Provides documentation of the Z80 instructions on hovering.",
     "author": {

diff --git a/src/HoverUtils.ts b/src/HoverUtils.ts
@@ -19,11 +19,18 @@ export function extractInstruction(line: string, index: number): string {
     pos++;
     let rightString = line.substr(pos);
 
-    // Now find end of instruction, i.e. until ";" or ":"
-    let len = 0;
+    // Now find end of instruction, i.e. until ";", "//" or ":"
+    let len=0;
+    let prev='';
     for (const ch of rightString) {
-        if (ch == ';' || ch == ':')
+        if (ch==';' || ch==':')
             break;
+        if (ch=='/' && prev=='/') {
+            // C-style comment "//"       // // is c++ style comment
+            len--;
+            break;
+        }
+        prev=ch;
         len++;
     }
     let rawInstruction = rightString.substr(0, len).trim().toUpperCase();