repair outline parsing of comments

ironsheep · Dec 1, 2023 · 4bf9f46 · 4bf9f46
1 parent f0597ca
commit 4bf9f46
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/spin2/server/src/parser/spin1.documentSymbolParser.ts b/spin2/server/src/parser/spin1.documentSymbolParser.ts
@@ -52,14 +52,17 @@ export class Spin1DocumentSymbolParser {
       const line = document.getText(desiredLineRange).replace(/\s+$/, "");
       const lineRange: lsp.Range = { start: { line: i, character: 0 }, end: { line: i, character: line.length - 1 } };
       const trimmedLine = line.trim();
-      const nonCommentLine = this.parseUtils.getRemainderWOutTrailingTicComment(0, line);
+      let nonCommentLine = this.parseUtils.getRemainderWOutTrailingTicComment(0, line);
+      if (nonCommentLine.length == 0) {
+        nonCommentLine = trimmedLine; // all comment, but parser has to see it!
+      }
 
       let linePrefix: string = line;
       let lineHasComment: boolean = false;
       let commentOffset: number = 0;
       let commentLength: number = 0;
 
-      if (nonCommentLine.trim().length == 0) {
+      if (nonCommentLine.trim().length == 0 && !trimmedLine.startsWith("'")) {
         // skip only white-space lines
         continue;
       }

diff --git a/spin2/server/src/parser/spin2.documentSemanticParser.ts b/spin2/server/src/parser/spin2.documentSemanticParser.ts
@@ -42,7 +42,7 @@ export class Spin2DocumentSemanticParser {
 
   private bLogStarted: boolean = false;
   // adjust following true/false to show specific parsing debug
-  private spin2DebugLogEnabled: boolean = true; // WARNING (REMOVE BEFORE FLIGHT)- change to 'false' - disable before commit
+  private spin2DebugLogEnabled: boolean = false; // WARNING (REMOVE BEFORE FLIGHT)- change to 'false' - disable before commit
   private showSpinCode: boolean = true;
   private showPreProc: boolean = true;
   private showCON: boolean = true;

diff --git a/spin2/server/src/parser/spin2.documentSymbolParser.ts b/spin2/server/src/parser/spin2.documentSymbolParser.ts
@@ -49,14 +49,17 @@ export class Spin2DocumentSymbolParser {
       const line = document.getText(desiredLineRange).replace(/\s+$/, "");
       const lineRange: lsp.Range = { start: { line: i, character: 0 }, end: { line: i, character: line.length - 1 } };
       const trimmedLine = line.trim();
-      const nonCommentLine = this.parseUtils.getRemainderWOutTrailingTicComment(0, line);
+      let nonCommentLine = this.parseUtils.getRemainderWOutTrailingTicComment(0, line);
+      if (nonCommentLine.length == 0) {
+        nonCommentLine = trimmedLine; // all comment, but parser has to see it!
+      }
 
       let linePrefix: string = line;
       let lineHasComment: boolean = false;
       let commentOffset: number = 0;
       let commentLength: number = 0;
 
-      if (nonCommentLine.trim().length == 0) {
+      if (nonCommentLine.trim().length == 0 && !trimmedLine.startsWith("'")) {
         // skip only white-space lines
         continue;
       }