use AbstractMermaidTokenBuilder in sankey token builder

Yokozuna59 · Feb 13, 2024 · 56c643d · 56c643d
1 parent 4d035ed
commit 56c643d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/packages/parser/src/language/sankey/tokenBuilder.ts b/packages/parser/src/language/sankey/tokenBuilder.ts
@@ -1,10 +1,14 @@
 import type { GrammarAST, Stream, TokenBuilderOptions } from 'langium';
-import { DefaultTokenBuilder } from 'langium';
 import type { TokenType } from 'chevrotain';
 
+import { AbstractMermaidTokenBuilder } from '../common/index.js';
 import { matchSankeyLinkNode } from './matcher.js';
 
-export class SankeyTokenBuilder extends DefaultTokenBuilder {
+export class SankeyTokenBuilder extends AbstractMermaidTokenBuilder {
+  public constructor() {
+    super(['sankey-beta']);
+  }
+
   protected override buildTerminalTokens(rules: Stream<GrammarAST.AbstractRule>): TokenType[] {
     const tokenTypes: TokenType[] = super.buildTerminalTokens(rules);
     tokenTypes.forEach((tokenType: TokenType): void => {
@@ -18,18 +22,4 @@ export class SankeyTokenBuilder extends DefaultTokenBuilder {
     });
     return tokenTypes;
   }
-
-  protected override buildKeywordTokens(
-    rules: Stream<GrammarAST.AbstractRule>,
-    terminalTokens: TokenType[],
-    options?: TokenBuilderOptions
-  ): TokenType[] {
-    const tokenTypes: TokenType[] = super.buildKeywordTokens(rules, terminalTokens, options);
-    tokenTypes.forEach((tokenType: TokenType): void => {
-      if (tokenType.name === 'sankey-beta' && tokenType.PATTERN !== undefined) {
-        tokenType.PATTERN = new RegExp(tokenType.PATTERN.toString() + '(?!\\S)');
-      }
-    });
-    return tokenTypes;
-  }
 }
diff --git a/packages/parser/src/language/sankey/valueConverter.ts b/packages/parser/src/language/sankey/valueConverter.ts
@@ -23,6 +23,7 @@ export class SankeyValueConverter extends AbstractMermaidValueConverter {
     if (match === null) {
       return undefined;
     }
+
     // source and target with double quote and value
     if (match[1] !== undefined) {
       if (rule.name === 'SANKEY_LINK_VALUE') {