Workaround for false positive validation error #214

BBx-Kitchen · Dec 16, 2024 · e9ddf3e · e9ddf3e
1 parent ed26d42
commit e9ddf3e
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 7 deletions.
diff --git a/bbj-vscode/package-lock.json b/bbj-vscode/package-lock.json
diff --git a/bbj-vscode/src/language/bbj-lexer.ts b/bbj-vscode/src/language/bbj-lexer.ts
@@ -7,7 +7,7 @@ export class BbjLexer extends DefaultLexer {
         return super.tokenize(text);
     }
 
-    private prepareLineSplitter(text: string): string {
+    protected prepareLineSplitter(text: string): string {
         const windowsEol = text.includes('\r\n');
         const lines = text.split(/\r?\n/g);
         for (let i = 0; i < lines.length - 1; i++) {

diff --git a/bbj-vscode/src/language/bbj-token-builder.ts b/bbj-vscode/src/language/bbj-token-builder.ts
@@ -72,7 +72,7 @@ export class BBjTokenBuilder extends DefaultTokenBuilder {
             const token: TokenType = {
                 name: terminal.name,
                 // Add more exceptional tokens here if an explicit line break token is needed
-                PATTERN: this.regexPatternFunction(/,(?=(\r?\n|;))/i),
+                PATTERN: this.regexPatternFunction(/,(?=(\r?\n|;))/),
                 LINE_BREAKS: true
             };
             return token;

diff --git a/bbj-vscode/src/language/bbj-validator.ts b/bbj-vscode/src/language/bbj-validator.ts
@@ -229,7 +229,10 @@ export class BBjValidator {
     }
 
     checkSymbolicLabelRef(ele: SymbolicLabelRef, accept: ValidationAcceptor): void {
-        if (ele.$cstNode?.text.search(/\s/) !== -1) {
+        const nodeText = ele.$cstNode?.text;
+        // currently when using ':', see #214, node text may be shifted, that why
+        // we check for the first character to avoid false positives
+        if (nodeText && nodeText.startsWith('*') && nodeText.search(/\s/) !== -1) {
             accept('error', 'Symbolic label reference may not contain whitespace.', { node: ele });
         }
     }

diff --git a/bbj-vscode/test/bbj-test-module.ts b/bbj-vscode/test/bbj-test-module.ts
@@ -5,6 +5,7 @@ import { BBjGeneratedModule, BBjGeneratedSharedModule } from "../src/language/ge
 import { registerValidationChecks } from "../src/language/bbj-validator.js";
 import { JavaInteropService } from "../src/language/java-interop.js";
 import { JavaClass, JavaMethod } from "../src/language/generated/ast.js";
+import { BbjLexer } from "../src/language/bbj-lexer.js";
 
 export function createBBjTestServices(context: DefaultSharedModuleContext): {
     shared: LangiumSharedServices,
@@ -27,11 +28,20 @@ export function createBBjTestServices(context: DefaultSharedModuleContext): {
 }
 
 export const BBjTestModule: Module<BBjServices, PartialLangiumServices & DeepPartial<BBjAddedServices>> = {
+    parser: {
+        Lexer: (services) => new TestableBBjLexer(services)
+    },
     java: {
         JavaInteropService: (services) => new JavaInteropTestService(services)
     }
 }
 
+export class TestableBBjLexer extends BbjLexer {
+    public prepareLineSplitter(text: string): string {
+        return super.prepareLineSplitter(text)
+    }
+}
+
 class JavaInteropTestService extends JavaInteropService {
     protected readonly index: () => IndexManager;
     private indexed: boolean = false;

diff --git a/bbj-vscode/test/lexer.test.ts b/bbj-vscode/test/lexer.test.ts
@@ -1,6 +1,6 @@
 import { EmptyFileSystem } from "langium";
 import { expandToString } from "langium/generate";
-import { createBBjTestServices } from "./bbj-test-module.js";
+import { createBBjTestServices, TestableBBjLexer } from "./bbj-test-module.js";
 import { describe, test, expect } from "vitest";
 
 const services = createBBjTestServices(EmptyFileSystem);
@@ -29,4 +29,24 @@ describe('Lexer tests', () => {
         expect(result.tokens[2].startOffset).toBe(afterIndex);
     });
 
+    test('Joins split lines preserve offset with empty line', () => {
+        const text = `
+if sys = "1" then
+: goto *NEXT
+: goto *BREAK
+PRINT "After"
+
+`;
+        const expectedSplitJoin = `
+if sys = "1" then goto *NEXT goto *BREAK  
+
+
+PRINT "After"
+
+
+`;
+        const tokenizedText = (lexer as TestableBBjLexer).prepareLineSplitter(text);
+        expect(tokenizedText.length).toBe(expectedSplitJoin.length);
+        expect(tokenizedText).toBe(expectedSplitJoin);
+    });
 });
diff --git a/bbj-vscode/test/parser.test.ts b/bbj-vscode/test/parser.test.ts
@@ -1859,7 +1859,7 @@ describe('Parser Tests', () => {
         expectNoValidationErrors(result);
     });
 
-    test.skip('Switch-Default with semicolon', async () => {
+    test('Switch-Default with semicolon', async () => {
         const result = await parse(`
             LET t = 123
             SWITCH t; CASE 1; PRINT "1"; BREAK; CASE 2; PRINT "2"; BREAK; CASE DEFAULT; PRINT "default"; SWEND