feature: improve highlighting for exported variable names with quotes (…

…#45)
lvce-editor · Feb 20, 2024 · ef0da5c · ef0da5c
1 parent b80ea1a
commit ef0da5c
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -24,8 +24,7 @@
   },
   "test-tokenize": {
     "skip": [
-      "dotenv-multiline",
-      "php-dotenv-exported"
+      "dotenv-multiline"
     ]
   }
 }
diff --git a/src/tokenizeDotenv.js b/src/tokenizeDotenv.js
@@ -99,6 +99,7 @@ const RE_EVERYTHING = /^./
 
 export const initialLineState = {
   state: State.TopLevelContent,
+  stack: [],
 }
 
 export const hasArrayReturn = true
@@ -112,6 +113,7 @@ export const tokenizeLine = (line, lineState) => {
   let tokens = []
   let token = TokenType.None
   let state = lineState.state
+  let stack = [...lineState.stack]
   while (index < line.length) {
     const part = line.slice(index)
     switch (state) {
@@ -139,15 +141,33 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterKeywordAndHasSeenWhitespace
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          stack.push(State.AfterVariableName)
+          token = TokenType.PunctuationString
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          stack.push(State.AfterVariableName)
+          token = TokenType.PunctuationString
+          state = State.InsideSingleQuoteString
         } else {
-          line
           throw new Error('no')
         }
         break
       case State.AfterKeywordAndHasSeenWhitespace:
         if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.AfterVariableName
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          stack.push(State.AfterVariableName)
+          token = TokenType.PunctuationString
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          stack.push(State.AfterVariableName)
+          token = TokenType.PunctuationString
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordAndHasSeenWhitespace
         } else {
           throw new Error('no')
         }
@@ -169,7 +189,7 @@ export const tokenizeLine = (line, lineState) => {
       case State.InsideDoubleQuoteString:
         if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.PunctuationString
-          state = State.AfterVariableValue
+          state = stack.pop() || State.AfterVariableValue
         } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
           token = TokenType.VariableValueString
           state = State.InsideDoubleQuoteString
@@ -316,5 +336,6 @@ export const tokenizeLine = (line, lineState) => {
   return {
     state,
     tokens,
+    stack,
   }
 }
diff --git a/test/baselines/double-quoted-export.txt b/test/baselines/double-quoted-export.txt
@@ -0,0 +1,9 @@
+KeywordExport
+Whitespace
+PunctuationString
+String
+PunctuationString
+Whitespace
+Punctuation
+Whitespace
+Numeric
diff --git a/test/baselines/php-dotenv-exported.txt b/test/baselines/php-dotenv-exported.txt
@@ -0,0 +1,52 @@
+KeywordExport
+Whitespace
+JsonPropertyName
+Punctuation
+PunctuationString
+String
+PunctuationString
+NewLine
+KeywordExport
+Whitespace
+JsonPropertyName
+Whitespace
+Punctuation
+Whitespace
+PunctuationString
+String
+PunctuationString
+NewLine
+KeywordExport
+Whitespace
+JsonPropertyName
+Punctuation
+PunctuationString
+String
+PunctuationString
+NewLine
+KeywordExport
+Whitespace
+PunctuationString
+String
+PunctuationString
+Whitespace
+Punctuation
+Whitespace
+Numeric
+NewLine
+KeywordExport
+Whitespace
+PunctuationString
+String
+Punctuation
+Whitespace
+Error
+NewLine
+NewLine
+KeywordExport
+Whitespace
+JsonPropertyName
+Punctuation
+PunctuationString
+PunctuationString
+NewLine
diff --git a/test/cases/double-quoted-export.env b/test/cases/double-quoted-export.env
@@ -0,0 +1 @@
+export "EDQUOTED" = 123