@lvce-editor/shared-process 0.11.8 → 0.11.10

package/extensions/builtin.language-basics-shellscript/src/tokenizeShellScript.js

@@ -3,8 +3,12 @@
  */
 export const State = {
   TopLevelContent: 1,
-  InsideString: 2,
+  InsideDoubleQuoteString: 2,
   InsideLineComment: 3,
+  InsideSingleQuoteString: 4,
+  InsideBackTickString: 5,
+  InsideEof: 6,
+  AfterKeywordFunction: 7,
 }
 
 export const StateMap = {
@@ -25,6 +29,10 @@ export const TokenType = {
   VariableName: 8,
   Comment: 885,
   Text: 9,
+  KeywordControl: 10,
+  Function: 11,
+  LanguageConstant: 12,
+  KeywordReturn: 13,
 }
 
 export const TokenMap = {
@@ -38,11 +46,15 @@ export const TokenMap = {
   [TokenType.VariableName]: 'VariableName',
   [TokenType.Comment]: 'Comment',
   [TokenType.Text]: 'Text',
+  [TokenType.KeywordControl]: 'KeywordControl',
+  [TokenType.Function]: 'Function',
+  [TokenType.LanguageConstant]: 'LanguageConstant',
+  [TokenType.KeywordReturn]: 'KeywordReturn',
 }
 
 const RE_LINE_COMMENT = /^#.*/s
 const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>]+/
-const RE_WHITESPACE = /^ +/
+const RE_WHITESPACE = /^\s+/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
 const RE_PROPERTY_NAME = /^[a-zA-Z\-]+\b/
@@ -50,20 +62,31 @@ const RE_COLON = /^:/
 const RE_PROPERTY_VALUE = /^[^;\}]+/
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
+const RE_ANYTHING_SHORT = /^[^\s"']+/
 const RE_ANYTHING = /^.+/s
 const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
 const RE_QUOTE_DOUBLE = /^"/
-const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
+const RE_QUOTE_SINGLE = /^'/
+const RE_QUOTE_BACKTICK = /^`/
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"\\]+/
+const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
+const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`]+/
 const RE_KEYWORD =
-  /^(?:alias|bg|bind|break|builtin|caller|cd|command|compgen|complete|dirs|disown|echo|enable|eval|exec|exit|false|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|read|readonly|set|shift|shopt|source|suspend|test|times|trap|true|type|ulimit|umask|unalias|unset|wait)\b/
-
-const RE_VARIABLE_NAME = /^[a-zA-Z\_\/\-]+/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>]/
-const RE_NUMERIC = /^\d+/
+  /^(?:7z|7za|7zr|alias|apk|apt-get|ar|asciidoctor|awk|basename|bash|bg|bind|blkid|break|brew|brotli|builtin|bunzip|bunzip2|caller|cargo|case|cat|catdoc|cd|chmod|chown|cmp|command|compgen|complete|continue|cp|cryptsetup|curl|curl|cut|cygstart|dde-open|defaults|diff|dirname|dirs|disown|do|docker|done|done|dpkg|du|echo|elif|else|emulate|enable|enlightenment_open|esac|eval|eval_gettext|exec|exit|expr|false|fc|fg|fi|find|for|free|function|fzf|g\+\+|gcc|gcloud|gdbus|getopts|gio|git|gnome-open|grep|grub-mount|gs|gulp|gvfs-open|gzip|hash|head|help|hexdump|history|identity|if|in|install|ip|jobs|kde-open|kfmclient|kill|killall|less|let|lha|local|logout|ls|ls|lunzip|lzip|lzma|makepkg|miniunz|miniunzip|mkdir|mktemp|mount|mpicc|mv|node|npm|npx|open|pacman|pcmanfm|pdftotext|pkg|plutil|popd|prezip-bin|printf|println|ps|pushd|pwd|python3|rar|read|readlink|readonly|return|rm|rpm|rsync|sed|set|sha256sum|shift|shopt|sleep|snap|sort|source|stty|sudo|suspend|tail|tar|tee|test|texi2dvi|then|times|touch|trap|true|tty|tune2fs|type|ulimit|umask|umask|unalias|unarj|unmkinitramfs|unmount|unrar|unset|unwrapdiff|unzip|unzoo|vim|wait|wc|wget|which|while|xargs|xprop|xz|yarn|yum|zip|zoo|zsh|zstd)\b/
+const RE_VARIABLE_NAME = /^[a-zA-Z\_\/\-\$][a-zA-Z\_\/\-\$#\d\-]*/
+const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\!\|\+\&\>\)]/
+const RE_NUMERIC = /^\d+(?=\s|$)/
+const RE_FUNCTION_NAME = /^\w+(?=\s*\()/
+const RE_EOF_START = /^<<\s*([\w\!]+)/
+const RE_EOF_CONTENT = /.*/s
+const RE_STRING_ESCAPE = /^\\./
+const RE_BACKSLASH_AT_END = /^\\$/
 
 export const initialLineState = {
   state: State.TopLevelContent,
   tokens: [],
+  knownFunctionNames: new Set(),
+  stringEnd: '',
 }
 
 /**
@@ -88,6 +111,8 @@ export const tokenizeLine = (line, lineState) => {
   let tokens = []
   let token = TokenType.None
   let state = lineState.state
+  let stringEnd = lineState.stringEnd
+  const knownFunctionNames = new Set(lineState.knownFunctionNames)
   while (index < line.length) {
     const part = line.slice(index)
     switch (state) {
@@ -96,23 +121,252 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_KEYWORD))) {
-          token = TokenType.Keyword
           state = State.TopLevelContent
+          switch (next[0]) {
+            case 'break':
+            case 'case':
+            case 'continue':
+            case 'do':
+            case 'done':
+            case 'elif':
+            case 'else':
+            case 'esac':
+            case 'fi':
+            case 'for':
+            case 'if':
+            case 'in':
+            case 'then':
+            case 'while':
+              token = TokenType.KeywordControl
+              break
+            case '7za':
+            case '7z':
+            case '7za':
+            case '7zr':
+            case 'alias':
+            case 'apk':
+            case 'apt-get':
+            case 'ar':
+            case 'awk':
+            case 'bg':
+            case 'bind':
+            case 'blkid':
+            case 'builtin':
+            case 'bunzip':
+            case 'bunzip2':
+            case 'caller':
+            case 'cargo':
+            case 'cat':
+            case 'catdoc':
+            case 'cd':
+            case 'chmod':
+            case 'chown':
+            case 'cmp':
+            case 'command':
+            case 'compgen':
+            case 'complete':
+            case 'cp':
+            case 'cryptsetup':
+            case 'curl':
+            case 'curl':
+            case 'cut':
+            case 'cygstart':
+            case 'dde-open':
+            case 'diff':
+            case 'dirname':
+            case 'dirs':
+            case 'disown':
+            case 'dpkg':
+            case 'du':
+            case 'echo':
+            case 'emulate':
+            case 'enable':
+            case 'enlightenment_open':
+            case 'eval':
+            case 'eval_gettext':
+            case 'exec':
+            case 'exit':
+            case 'expr':
+            case 'fc':
+            case 'fg':
+            case 'find':
+            case 'free':
+            case 'fzf':
+            case 'g++':
+            case 'gcc':
+            case 'gdbus':
+            case 'getopts':
+            case 'gio':
+            case 'git':
+            case 'gnome-open':
+            case 'grep':
+            case 'grub-mount':
+            case 'gs':
+            case 'gulp':
+            case 'gvfs-open':
+            case 'gzip':
+            case 'hash':
+            case 'head':
+            case 'help':
+            case 'hexdump':
+            case 'history':
+            case 'identity':
+            case 'install':
+            case 'ip':
+            case 'jobs':
+            case 'kde-open':
+            case 'kfmclient':
+            case 'kill':
+            case 'killall':
+            case 'less':
+            case 'lha':
+            case 'logout':
+            case 'ls':
+            case 'ls':
+            case 'lunzip':
+            case 'lzip':
+            case 'lzma':
+            case 'makepkg':
+            case 'miniunz':
+            case 'miniunzip':
+            case 'mkdir':
+            case 'mktemp':
+            case 'mount':
+            case 'mpicc':
+            case 'mv':
+            case 'node':
+            case 'npm':
+            case 'open':
+            case 'pacman':
+            case 'pcmanfm':
+            case 'pdftotext':
+            case 'pkg':
+            case 'popd':
+            case 'prezip-bin':
+            case 'printf':
+            case 'ps':
+            case 'pushd':
+            case 'pwd':
+            case 'rar':
+            case 'read':
+            case 'readlink':
+            case 'rm':
+            case 'rpm':
+            case 'rsync':
+            case 'sed':
+            case 'set':
+            case 'shift':
+            case 'shopt':
+            case 'sleep':
+            case 'snap':
+            case 'sort':
+            case 'source':
+            case 'stty':
+            case 'sudo':
+            case 'suspend':
+            case 'tail':
+            case 'tar':
+            case 'tee':
+            case 'test':
+            case 'texi2dvi':
+            case 'times':
+            case 'touch':
+            case 'trap':
+            case 'tty':
+            case 'tune2fs':
+            case 'type':
+            case 'ulimit':
+            case 'umask':
+            case 'umask':
+            case 'unalias':
+            case 'unarj':
+            case 'unmkinitramfs':
+            case 'unmount':
+            case 'unrar':
+            case 'unset':
+            case 'unwrapdiff':
+            case 'unzip':
+            case 'unzoo':
+            case 'vim':
+            case 'wait':
+            case 'wc':
+            case 'wget':
+            case 'which':
+            case 'xargs':
+            case 'xprop':
+            case 'xz':
+            case 'yarn':
+            case 'yum':
+            case 'zip':
+            case 'zoo':
+            case 'zstd':
+            case 'basename':
+            case 'brew':
+            case 'sha256sum':
+            case 'brotli':
+            case 'zsh':
+            case 'asciidoctor':
+            case 'docker':
+            case 'python3':
+            case 'bash':
+            case 'npx':
+            case 'gcloud':
+            case 'println':
+            case 'plutil':
+            case 'defaults':
+              token = TokenType.Function
+              break
+            case 'true':
+            case 'false':
+              token = TokenType.LanguageConstant
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              break
+            case 'function':
+              token = TokenType.Keyword
+              state = State.AfterKeywordFunction
+              break
+            default:
+              token = TokenType.Keyword
+              break
+          }
+        } else if ((next = part.match(RE_EOF_START))) {
+          token = TokenType.Punctuation
+          state = State.InsideEof
+          stringEnd = next[1]
         } else if ((next = part.match(RE_PUNCTUATION))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_FUNCTION_NAME))) {
+          token = TokenType.Function
+          state = State.TopLevelContent
+          knownFunctionNames.add(next[0])
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
-          token = TokenType.VariableName
+          if (knownFunctionNames.has(next[0])) {
+            token = TokenType.Function
+          } else {
+            token = TokenType.VariableName
+          }
           state = State.TopLevelContent
         } else if ((next = part.match(RE_NUMERIC))) {
           token = TokenType.Numeric
           state = State.TopLevelContent
         } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.PunctuationString
-          state = State.InsideString
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_QUOTE_BACKTICK))) {
+          token = TokenType.Punctuation
+          state = State.InsideBackTickString
         } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING_SHORT))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -121,13 +375,70 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
-      case State.InsideString:
+      case State.InsideDoubleQuoteString:
         if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.PunctuationString
           state = State.TopLevelContent
         } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
           token = TokenType.String
-          state = State.InsideString
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
+          token = TokenType.String
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_BACKSLASH_AT_END))) {
+          token = TokenType.String
+          state = State.InsideDoubleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideSingleQuoteString:
+        if ((next = part.match(RE_QUOTE_SINGLE))) {
+          token = TokenType.PunctuationString
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_BACKSLASH_AT_END))) {
+          token = TokenType.String
+          state = State.InsideSingleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideBackTickString:
+        if ((next = part.match(RE_QUOTE_BACKTICK))) {
+          token = TokenType.PunctuationString
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_STRING_BACKTICK_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideBackTickString
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideEof:
+        if ((next = part.match(stringEnd))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_EOF_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideEof
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.AfterKeywordFunction:
+        if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Function
+          state = State.TopLevelContent
+          knownFunctionNames.add(next[0])
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordFunction
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           throw new Error('no')
         }
@@ -142,5 +453,7 @@ export const tokenizeLine = (line, lineState) => {
   return {
     state,
     tokens,
+    knownFunctionNames,
+    stringEnd,
   }
 }

package/extensions/builtin.language-basics-toml/src/tokenizeToml.js

@@ -5,7 +5,10 @@ export const State = {
   TopLevelContent: 1,
   AfterPropertyName: 3,
   AfterPropertyNameAfterEqualSign: 4,
-  InsideString: 5,
+  InsideDoubleQuoteString: 5,
+  InsideSingleQuoteString: 6,
+  InsideArray: 7,
+  InsideObject: 8,
 }
 
 export const StateMap = {
@@ -84,7 +87,9 @@ const RE_LANGUAGE_CONSTANT = /^(?:true|false)\b/
 const RE_EQUAL_SIGN = /^=/
 const RE_LOCAL_TIME = /\d{2}:\d{2}:\d{2}(?:\.\d+)?/
 const RE_QUOTE_DOUBLE = /^"/
+const RE_QUOTE_SINGLE = /^'/
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
+const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -104,6 +109,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) {
@@ -118,6 +124,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_ANYTHING))) {
+          part
           token = TokenType.Text
           state = State.TopLevelContent
         } else {
@@ -142,28 +149,37 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterPropertyNameAfterEqualSign
         } else if ((next = part.match(RE_LANGUAGE_CONSTANT))) {
           token = TokenType.LanguageConstant
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_LOCAL_TIME))) {
           token = TokenType.Numeric
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_NUMERIC_INTEGER))) {
           token = TokenType.Numeric
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_NUMERIC_FLOAT))) {
           token = TokenType.Numeric
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_NAN))) {
           token = TokenType.Numeric
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_INF))) {
           token = TokenType.Numeric
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.Punctuation
-          state = State.InsideString
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideArray
+        } else if ((next = part.match(RE_CURLY_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideObject
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.PropertyValueString
           state = State.TopLevelContent
@@ -171,19 +187,76 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
-      case State.InsideString:
+      case State.InsideDoubleQuoteString:
         if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.PunctuationString
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
           token = TokenType.String
-          state = State.InsideString
+          state = State.InsideDoubleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideSingleQuoteString:
+        if ((next = part.match(RE_QUOTE_SINGLE))) {
+          token = TokenType.PunctuationString
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideSingleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideArray:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideArray
+        } else if ((next = part.match(RE_SQUARE_CLOSE))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideDoubleQuoteString
+          stack.push(State.InsideArray)
+        } else if ((next = part.match(RE_COMMA))) {
+          token = TokenType.Punctuation
+          state = State.InsideArray
+        } else if ((next = part.match(RE_NUMERIC_INTEGER))) {
+          token = TokenType.Numeric
+          state = State.InsideArray
+        } else {
+          part
+          throw new Error('no')
+        }
+        break
+      case State.InsideObject:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideObject
+        } else if ((next = part.match(RE_PROPERTY_NAME))) {
+          token = TokenType.PropertyName
+          state = State.InsideObject
+        } else if ((next = part.match(RE_EQUAL_SIGN))) {
+          token = TokenType.Punctuation
+          state = State.AfterPropertyNameAfterEqualSign
+          stack.push(State.InsideObject)
+        } else if ((next = part.match(RE_CURLY_CLOSE))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.InsideArray
+          stack.push(State.InsideObject)
+        } else if ((next = part.match(RE_COMMA))) {
+          token = TokenType.Punctuation
+          state = State.InsideObject
         } else {
           throw new Error('no')
         }
         break
       default:
-        console.log({ state, line })
         throw new Error('no')
     }
     const tokenLength = next[0].length
@@ -193,5 +266,6 @@ export const tokenizeLine = (line, lineState) => {
   return {
     state,
     tokens,
+    stack,
   }
 }

package/extensions/builtin.language-basics-xml/extension.json

@@ -68,7 +68,8 @@
         ".xoml",
         ".xpdl",
         ".xsd",
-        ".xul"
+        ".xul",
+        ".tmtheme"
       ],
       "fileNames": [".project"],
       "tokenize": "src/tokenizeXml.js"

package/extensions/builtin.language-basics-xml/src/tokenizeXml.js

@@ -83,6 +83,7 @@ const RE_TAGNAME = /^[!\w\-]+/
 const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
 const RE_WORD = /^[^\s]+/
+const RE_QUESTION_MARK_TAG_NAME = /^\?\w+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -143,6 +144,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_QUESTION_MARK_TAG_NAME))) {
+          token = TokenType.TagName
+          state = State.InsideOpeningTag
         } else if ((next = part.match(RE_ANY_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -205,6 +209,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideDoubleQuoteString
         } else if ((next = part.match(RE_TAG_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent

package/extensions/builtin.language-basics-yaml/src/tokenizeYaml.js

@@ -109,6 +109,7 @@ export const initialLineState = {
   tokens: [],
   indent: '',
   keyOffset: 0,
+  stack: [],
 }
 
 export const hasArrayReturn = true
@@ -137,6 +138,7 @@ export const tokenizeLine = (line, lineState) => {
   let token = TokenType.None
   let state = lineState.state
   let keyOffset = lineState.keyOffset
+  const stack = lineState.stack
   while (index < line.length) {
     const part = line.slice(index)
     switch (state) {
@@ -184,7 +186,7 @@ export const tokenizeLine = (line, lineState) => {
       case State.InsideLineComment:
         if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Comment
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else {
           throw new Error('no')
         }
@@ -245,6 +247,10 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterPipe
+        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideLineComment
+          stack.push(State.AfterPipe)
         } else {
           throw new Error('no')
         }
@@ -387,5 +393,6 @@ export const tokenizeLine = (line, lineState) => {
     state,
     tokens,
     keyOffset,
+    stack,
   }
 }

package/extensions/builtin.theme-cobalt2/color-theme.json

@@ -151,6 +151,10 @@
     {
       "name": "KeywordReturn",
       "foreground": "#FF9D00"
+    },
+    {
+      "name": "KeywordOperator",
+      "foreground": "#FF9D00"
     }
   ]
 }