feature: improve highlighting for dot and comma (#15)

lvce-editor · Jan 15, 2024 · 3449d54 · 3449d54
1 parent 651de81
commit 3449d54
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/src/tokenizeElm.js b/src/tokenizeElm.js
@@ -96,7 +96,7 @@ const RE_LINE_COMMENT = /^\-\-[^\n]*/
 const RE_BLOCK_COMMENT_START = /^\{\-/
 const RE_BLOCK_COMMENT_END = /^\-\}/
 const RE_BLOCK_COMMENT_CONTENT = /^.+(?=\-\})/s
-const RE_PUNCTUATION = /^(?:\(|\)|\[|\]|\||\->)/
+const RE_PUNCTUATION = /^[\(\)\[\]\-\>\.\,\|]+/
 const RE_WORD_ALIAS = /^alias/
 const RE_ANYTHING_UNTIL_END = /^.+/s
 
@@ -141,7 +141,6 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Text
           state = State.TopLevelContent
         } else {
-          part.startsWith('Bool') //?
           throw new Error('no')
         }
         break
@@ -182,6 +181,7 @@ export const tokenizeLine = (line, lineState) => {
             state = State.AfterKeywordModule
             break
           case 'port':
+          case 'as':
             token = TokenType.Keyword
             state = State.TopLevelContent
             break

diff --git a/test/baselines/import-dot.txt b/test/baselines/import-dot.txt
@@ -0,0 +1,9 @@
+KeywordImport
+Whitespace
+VariableName
+Punctuation
+VariableName
+Whitespace
+Keyword
+Whitespace
+VariableName
diff --git a/test/baselines/module.txt b/test/baselines/module.txt
@@ -4,5 +4,4 @@ VariableName
 Whitespace
 KeywordImport
 Whitespace
-Punctuation
-Text
+Punctuation
diff --git a/test/baselines/port-module.txt b/test/baselines/port-module.txt
@@ -6,5 +6,4 @@ VariableName
 Whitespace
 KeywordImport
 Whitespace
-Punctuation
-Text
+Punctuation
diff --git a/test/cases/import-dot.elm b/test/cases/import-dot.elm
@@ -0,0 +1 @@
+import Api.Endpoint as Endpoint