feature: improve highlighting for structs (#9)

lvce-editor · Jul 28, 2023 · efde08c · efde08c
1 parent be81d89
commit efde08c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/tokenizeWgsl.js b/src/tokenizeWgsl.js
@@ -4,6 +4,7 @@
 export const State = {
   TopLevelContent: 1,
   AfterKeywordDeclaration: 2,
+  AfterKeywordStruct: 3,
 }
 
 /**
@@ -153,6 +154,10 @@ export const tokenizeLine = (line, lineState) => {
               token = TokenType.Type
               state = State.TopLevelContent
               break
+            case 'struct':
+              token = TokenType.Keyword
+              state = State.AfterKeywordStruct
+              break
             default:
               token = TokenType.Keyword
               state = State.TopLevelContent
@@ -189,6 +194,23 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterKeywordStruct:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordStruct
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Type
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Unknown
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
       default:
         throw new Error('no')
     }

diff --git a/test/baselines/struct.txt b/test/baselines/struct.txt
@@ -1,6 +1,6 @@
 Keyword
 Whitespace
-VariableName
+Type
 Whitespace
 Punctuation
 NewLine

diff --git a/test/baselines/vscode-wgsl-test.txt b/test/baselines/vscode-wgsl-test.txt
@@ -1,6 +1,6 @@
 Keyword
 Whitespace
-VariableName
+Type
 Whitespace
 Punctuation
 NewLine
@@ -54,7 +54,7 @@ NewLine
 NewLine
 Keyword
 Whitespace
-VariableName
+Type
 Whitespace
 Punctuation
 NewLine
@@ -80,7 +80,7 @@ NewLine
 NewLine
 Keyword
 Whitespace
-VariableName
+Type
 Punctuation
 NewLine
 Whitespace
@@ -153,7 +153,7 @@ NewLine
 NewLine
 Keyword
 Whitespace
-VariableName
+Type
 Whitespace
 Punctuation
 NewLine