@lvce-editor/shared-process 0.16.22 → 0.17.0

package/extensions/builtin.language-basics-css/src/tokenizeCss.js

@@ -56,6 +56,7 @@ export const TokenType = {
   String: 891,
   KeywordImport: 892,
   CssSelectorClass: 893,
+  CssPseudoSelector: 894,
 }
 
 export const TokenMap = {
@@ -83,18 +84,20 @@ export const TokenMap = {
   [TokenType.String]: 'String',
   [TokenType.KeywordImport]: 'KeywordImport',
   [TokenType.CssSelectorClass]: 'CssSelectorClass',
+  [TokenType.CssPseudoSelector]: 'CssPseudoSelector',
 }
 
-const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>\+\~\_%\\]+/
-const RE_SELECTOR_ID = /^#[\w\-\_]+/
-const RE_SELECTOR_CLASS = /^\.[\w\-\_]+/
+const RE_SELECTOR_ELEMENT = /^[a-zA-Z\d\->+~_%\\\p{L}]+/u
+const RE_SELECTOR_ID = /^#[\w\-\_\\]+/
+const RE_PSEUDO_SELECTOR = /^:[\p{L}\-]+/u
+const RE_SELECTOR_CLASS = /^\.[\w\-_\p{L}\p{Emoji_Presentation}]+/u
 const RE_WHITESPACE = /^\s+/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
 const RE_PROPERTY_NAME = /^[a-zA-Z\-\w]+/
 const RE_COLON = /^:/
-const RE_PROPERTY_VALUE = /^[^;\}\/]+/
-const RE_PROPERTY_VALUE_SHORT = /^[^;\}\s\)\/]+/
+const RE_PROPERTY_VALUE = /^[^;\}\/\(]+/
+const RE_PROPERTY_VALUE_SHORT = /^[^;\}\s\)\/\*\(]+/
 const RE_PROPERTY_VALUE_INSIDE_FUNCTION = /^[^\}\s\)]+/
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
@@ -110,7 +113,7 @@ const RE_PSEUDO_SELECTOR_CONTENT = /^[^\)]+/
 const RE_SQUARE_OPEN = /^\[/
 const RE_SQUARE_CLOSE = /^\]/
 const RE_ATTRIBUTE_SELECTOR_CONTENT = /^[^\]]+/
-const RE_QUERY = /^@[a-z\-]+/
+const RE_QUERY = /^@[a-zA-Z\w\-\d\_]+/
 const RE_STAR = /^\*/
 const RE_QUERY_NAME = /^[a-zA-Z\w\-\d\_]+/
 const RE_QUERY_CONTENT = /^[^\)]+/
@@ -162,7 +165,7 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_SELECTOR_CLASS))) {
           token = TokenType.CssSelectorClass
           state = State.AfterSelector
-        } else if ((next = part.match(RE_SELECTOR))) {
+        } else if ((next = part.match(RE_SELECTOR_ELEMENT))) {
           token = TokenType.CssSelector
           state = State.AfterSelector
         } else if ((next = part.match(RE_SELECTOR_ID))) {
@@ -171,6 +174,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_PSEUDO_SELECTOR))) {
+          token = TokenType.CssPseudoSelector
+          state = State.AfterSelector
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.CurlyOpen
           state = State.InsideSelector
@@ -181,7 +187,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.InsideAttributeSelector
         } else if ((next = part.match(RE_QUERY))) {
-          switch (next[0]) {
+          switch (next[0].toLocaleLowerCase()) {
             case '@font-face':
             case '@-ms-viewport':
             case '@-o-viewport':
@@ -226,7 +232,7 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SELECTOR_CLASS))) {
           token = TokenType.CssSelectorClass
           state = State.AfterSelector
-        } else if ((next = part.match(RE_SELECTOR))) {
+        } else if ((next = part.match(RE_SELECTOR_ELEMENT))) {
           token = TokenType.CssSelector
           state = State.AfterSelector
         } else if ((next = part.match(RE_SELECTOR_ID))) {
@@ -247,9 +253,19 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_VERTICAL_LINE))) {
           token = TokenType.Punctuation
           state = State.AfterSelector
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else if ((next = part.match(RE_SLASH))) {
           token = TokenType.Punctuation
           state = State.AfterSelector
+        } else if ((next = part.match(RE_SEMICOLON))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_PSEUDO_SELECTOR))) {
+          token = TokenType.CssPseudoSelector
+          state = State.AfterSelector
         } else if ((next = part.match(RE_ANYTHING_BUT_CURLY))) {
           token = TokenType.Unknown
           state = State.AfterSelector
@@ -293,6 +309,12 @@ export const tokenizeLine = (line, lineState) => {
           stack.push(state)
           token = TokenType.Comment
           state = State.InsideBlockComment
+        } else if ((next = part.match(RE_SEMICOLON))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_CLOSE_BRACE))) {
+          token = TokenType.Text
+          state = stack.pop() || State.TopLevelContent
         } else {
           part
           throw new Error('no')
@@ -305,6 +327,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.Punctuation
           state = State.InsideSelector
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else {
           throw new Error('no')
         }
@@ -341,6 +367,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_QUERY))) {
           token = TokenType.Query
           state = State.AfterQuery
+        } else if ((next = part.match(RE_SEMICOLON))) {
+          token = TokenType.Punctuation
+          state = State.InsideSelector
         } else if ((next = part.match(RE_ANYTHING_UNTIL_CLOSE_BRACE))) {
           token = TokenType.Unknown
           state = State.InsideSelector
@@ -416,6 +445,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_SLASH))) {
           token = TokenType.Punctuation
           state = State.AfterPropertyNameAfterColon
+        } else if ((next = part.match(RE_ROUND_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.AfterFunctionNameInsideArguments
         } else {
           part
           throw new Error('no')
@@ -496,9 +528,16 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else if ((next = part.match(RE_SLASH))) {
           token = TokenType.Punctuation
           state = State.AfterFunctionName
+        } else if ((next = part.match(RE_STAR))) {
+          token = TokenType.Punctuation
+          state = State.AfterFunctionName
         } else {
           part
           throw new Error('no')
@@ -572,7 +611,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_FUNCTION))) {
+          stack.push(state)
+          token = TokenType.FuntionName
+          state = State.AfterFunctionName
         } else {
+          part
           throw new Error('no')
         }
         break
@@ -598,6 +642,9 @@ export const tokenizeLine = (line, lineState) => {
   if (state === State.AfterPropertyName) {
     state = State.InsideSelector
   }
+  if (state === State.AfterKeywordImport) {
+    state = State.TopLevelContent
+  }
   return {
     state,
     tokens,

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

@@ -15,7 +15,9 @@
         ".env.development",
         ".env.production",
         ".env.dev",
-        ".env.sample"
+        ".env.sample",
+        ".env.dist",
+        ".env.test"
       ],
       "configuration": "./languageConfiguration.json",
       "tokenize": "src/tokenizeDotenv.js"

package/extensions/builtin.language-basics-java/src/tokenizeJava.js

@@ -29,7 +29,9 @@ export const TokenType = {
   KeywordThis: 12,
   Class: 13,
   Comment: 14,
+  Text: 117,
   FunctionName: 885,
+  KeywordImport: 215,
 }
 
 export const TokenMap = {
@@ -49,6 +51,8 @@ export const TokenMap = {
   [TokenType.Class]: 'Class',
   [TokenType.Comment]: 'Comment',
   [TokenType.FunctionName]: 'Function',
+  [TokenType.Text]: 'Text',
+  [TokenType.KeywordImport]: 'KeywordImport',
 }
 
 export const initialLineState = {
@@ -77,6 +81,7 @@ const RE_CURLY_OPEN = /^\{/
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_SLASH = /^\//
 const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\())/
+const RE_ANYTHING = /^.+/u
 
 export const hasArrayReturn = true
 
@@ -128,6 +133,8 @@ export const tokenizeLine = (line, lineState) => {
             case 'extends':
               token = TokenType.Keyword
               state = State.AfterKeywordBeforeClass
+            case 'import':
+              token = TokenType.KeywordImport
               break
             default:
               token = TokenType.Keyword
@@ -166,6 +173,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ATTRIBUTE))) {
           token = TokenType.Attribute
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           part //?
           throw new Error('no')

package/extensions/builtin.language-basics-javascript/src/tokenizeJavaScript.js

@@ -22,6 +22,7 @@ const State = {
   InsideBacktickString: 17,
   AfterPropertyDot: 18,
   AfterKeywordClass: 19,
+  AfterKeywordVariableDeclaration: 20,
 }
 
 /**
@@ -55,6 +56,7 @@ export const TokenType = {
   KeywordOperator: 887,
   KeywordFunction: 889,
   Class: 890,
+  KeywordVoid: 891,
 }
 
 export const TokenMap = {
@@ -84,6 +86,7 @@ export const TokenMap = {
   [TokenType.KeywordThis]: 'KeywordThis',
   [TokenType.KeywordOperator]: 'KeywordOperator',
   [TokenType.KeywordFunction]: 'KeywordFunction',
+  [TokenType.KeywordVoid]: 'KeywordVoid',
   [TokenType.Class]: 'Class',
 }
 
@@ -129,7 +132,7 @@ const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`\\\$]+/
 const RE_STRING_ESCAPE = /^\\./
 const RE_SHEBANG = /^#!.*/
 const RE_FUNCTION_CALL_NAME =
-  /^[\w]+(?=\s*(\(|\=\s*(?:async\s*)?function|\=\s*(?:async\s*)?\())/
+  /^[\w\$]+(?=\s*(\(|\=\s*(?:async\s*)?function|\=\s*(?:async\s*)?\())/
 
 const RE_DECORATOR = /^@\w+/
 const RE_BACKSLASH = /^\\/
@@ -144,7 +147,10 @@ const RE_REGEX =
 const RE_VARIABLE_NAME_SPECIAL = /\p{L}/u
 const RE_VARIABLE_NAME_SPECIAL_2 = /./u
 const RE_BUILTIN_CLASS =
-  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob|HTMLElement)\b/
+  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob|HTMLElement|HTMLFormElement)\b/
+
+const RE_PROPERTY_NAME = /^[a-z]\w*(?=\s*\:)/
+const RE_PROPERTY_NAME_FUNCTION = /^[a-z]\w*(?=\s*\()/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -176,6 +182,71 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_PROPERTY_NAME_FUNCTION))) {
+          switch (next[0]) {
+            case 'function':
+              token = TokenType.KeywordFunction
+              state = State.TopLevelContent
+              break
+            case 'async':
+              token = TokenType.KeywordModifier
+              state = State.TopLevelContent
+              break
+            case 'await':
+              token = TokenType.KeywordModifier
+              state = State.TopLevelContent
+              break
+            case 'as':
+            case 'switch':
+            case 'default':
+            case 'case':
+            case 'else':
+            case 'if':
+            case 'break':
+            case 'throw':
+            case 'for':
+            case 'try':
+            case 'catch':
+            case 'finally':
+            case 'continue':
+            case 'while':
+              token = TokenType.KeywordControl
+              state = State.TopLevelContent
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              state = State.TopLevelContent
+              break
+            case 'new':
+              token = TokenType.KeywordNew
+              state = State.TopLevelContent
+              break
+            case 'this':
+              token = TokenType.KeywordThis
+              state = State.TopLevelContent
+              break
+            case 'import':
+            case 'export':
+            case 'from':
+              token = TokenType.KeywordImport
+              state = State.TopLevelContent
+              break
+            case 'constructor':
+            case 'super':
+              token = TokenType.Keyword
+              state = State.TopLevelContent
+              break
+            default:
+              token = TokenType.FunctionName
+              state = State.TopLevelContent
+              break
+          }
+        } else if ((next = part.match(RE_PROPERTY_NAME))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+          if (part === 'default:') {
+            token = TokenType.KeywordControl
+          }
         } else if ((next = part.match(RE_KEYWORD))) {
           switch (next[0]) {
             case 'true':
@@ -257,6 +328,16 @@ export const tokenizeLine = (line, lineState) => {
               token = TokenType.Keyword
               state = State.AfterKeywordClass
               break
+            case 'var':
+            case 'let':
+            case 'const':
+              token = TokenType.Keyword
+              state = State.AfterKeywordVariableDeclaration
+              break
+            case 'void':
+              token = TokenType.KeywordVoid
+              state = State.TopLevelContent
+              break
             default:
               token = TokenType.Keyword
               state = State.TopLevelContent
@@ -478,6 +559,39 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterKeywordVariableDeclaration:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordVariableDeclaration
+        } else if ((next = part.match(RE_FUNCTION_CALL_NAME))) {
+          token = TokenType.FunctionName
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_CURLY_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.AfterKeywordVariableDeclaration
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_PUNCTUATION))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME_SPECIAL))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_VARIABLE_NAME_SPECIAL_2))) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
+        } else {
+          throw new Error(`no`)
+        }
+        break
       default:
         state
         throw new Error('no')

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

@@ -51,7 +51,8 @@
         ".nycrc",
         "manifest.webapp",
         ".alexrc",
-        ".yarn-integrity"
+        ".yarn-integrity",
+        ".tsbuildinfo"
       ],
       "tokenize": "src/tokenizeJson.js"
     }

package/extensions/builtin.language-basics-typescript/src/tokenizeTypeScript.js

@@ -6,7 +6,7 @@ const State = {
   TopLevelContent: 1,
   InsideSingleQuoteString: 2,
   InsideDoubleQuoteString: 3,
-  AfterKeywordDeclaration: 4,
+  AfterKeywordVariableDeclaration: 4,
   BeforeValue: 5,
   AfterKeywordTypeDeclaration: 8,
   BeforeType: 9,
@@ -120,7 +120,7 @@ export const initialLineState = {
 
 const RE_LINE_COMMENT = /^\/\/[^\n]*/
 const RE_KEYWORD =
-  /^(?:yield|with|while|void|var|undefined|typeof|type|true|try|throw|this|static|switch|super|readonly|return|public|protected|private|package|null|new|let|interface|instanceof|in|import|implements|if|function|for|finally|from|false|extends|export|enum|else|do|delete|default|debugger|declare|continue|const|constructor|class|catch|case|break|await|async|abstract)\b/
+  /^(?:yield|with|while|void|var|undefined|typeof|type|true|try|throw|this|static|switch|super|readonly|return|public|protected|private|package|null|new|let|interface|instanceof|in|import|implements|if|function|for|finally|from|false|extends|export|enum|else|do|delete|default|debugger|declare|continue|const|constructor|class|catch|case|break|await|async|accessor|abstract)\b/
 
 const RE_WHITESPACE = /^\s+/
 const RE_VARIABLE_NAME = /^[\#\$a-zA-Z\_][\$a-zA-Z\_\d]*/
@@ -155,7 +155,7 @@ const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
 const RE_KEYWORD_CLASS_PROPERTY_MODIFIER =
-  /^(?:override|public|protected|private|readonly)\b/
+  /^(?:override|public|protected|private|readonly|accessor)\b/
 
 const RE_VERTICAL_LINE = /^\|/
 const RE_ROUND_OPEN = /^\(/
@@ -178,6 +178,7 @@ const RE_ANGLE_CLOSE = /^>/
 const RE_OPERATOR = /^[!\*\?\.\:\|\%\&\^@]/
 const RE_METHOD_NAME = /^[\w\d]+(?=\s*(\(|\:\s*function|\:\s*\())/
 const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\(|\=\s*function|\=\s*\())/
+
 const RE_NUMERIC_2 =
   /^(?:(?:[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)(n)?\B)|(?:(\.)[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(n)?\b(?!\.))|(?:0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b)|(?:0(?:b|B)[01][01_]*(n)?\b)|(?:0(?:o|O)?[0-7][0-7_]*(n)?\b))/ // 1.1E+3
 const RE_NUMERIC_HEX = /0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b/
@@ -195,7 +196,7 @@ const RE_KEYWORD_READONLY = /^readonly\b/
 const RE_SHEBANG = /^\#\!\/.*/
 const RE_SPREAD = /^\.\.\./
 const RE_BUILTIN_CLASS =
-  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob)\b/
+  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|Headers|Response|Request|Buffer|MessagePort|FileHandle|X509Certificate|Blob|HTMLElement|MutationRecord|HTMLVideoElement)\b/
 
 const RE_KEYWORD_NEW = /^new\b/
 const RE_KEYWORD_IMPLEMENTS = /^implements\b/
@@ -279,7 +280,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'const':
             case 'var':
               token = TokenType.Keyword
-              state = State.AfterKeywordDeclaration
+              state = State.AfterKeywordVariableDeclaration
               break
             case 'type':
               token = TokenType.Keyword
@@ -340,6 +341,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_BUILTIN_CLASS))) {
           token = TokenType.Class
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_FUNCTION_CALL_NAME))) {
+          token = TokenType.Function
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.TopLevelContent
@@ -418,10 +422,10 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
-      case State.AfterKeywordDeclaration:
+      case State.AfterKeywordVariableDeclaration:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
-          state = State.AfterKeywordDeclaration
+          state = State.AfterKeywordVariableDeclaration
         } else if ((next = part.match(RE_COLON))) {
           token = TokenType.Punctuation
           state = State.BeforeType
@@ -434,9 +438,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_KEYWORD_OF))) {
           token = TokenType.KeywordOperator
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_FUNCTION_CALL_NAME))) {
+          token = TokenType.FunctionName
+          state = State.AfterKeywordVariableDeclaration
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
-          state = State.AfterKeywordDeclaration
+          state = State.AfterKeywordVariableDeclaration
         } else if ((next = part.match(RE_EQUAL))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
@@ -451,10 +458,10 @@ export const tokenizeLine = (line, lineState) => {
           state = State.TopLevelContent
         } else if ((next = part.match(RE_COMMA))) {
           token = TokenType.Punctuation
-          state = State.AfterKeywordDeclaration
+          state = State.AfterKeywordVariableDeclaration
         } else if ((next = part.match(RE_PUNCTUATION))) {
           token = TokenType.Punctuation
-          state = State.AfterKeywordDeclaration
+          state = State.AfterKeywordVariableDeclaration
         } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
@@ -693,7 +700,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterType
         } else if ((next = part.match(RE_EQUAL))) {
           token = TokenType.Punctuation
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_QUESTION_MARK_COLON))) {
           token = TokenType.Punctuation
           state = State.BeforeType
@@ -742,6 +749,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_AMPERSAND))) {
           token = TokenType.Punctuation
           state = State.BeforeType
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else if ((next = part.match(RE_ANYTHING_BUT_SEMICOLON_UNTIL_END))) {
           token = TokenType.Text
           state = State.AfterType
@@ -811,7 +822,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'const':
             case 'var':
               token = TokenType.Keyword
-              state = State.AfterKeywordDeclaration
+              state = State.AfterKeywordVariableDeclaration
               break
             case 'type':
               token = TokenType.Keyword
@@ -1077,6 +1088,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_EQUAL))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -1105,7 +1120,6 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.BeforeType
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
-          stack
           token = TokenType.Punctuation
           state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_SEMICOLON))) {
@@ -1146,6 +1160,10 @@ export const tokenizeLine = (line, lineState) => {
           stack.push(state)
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_ROUND_OPEN))) {
+          stack.push(State.AfterMethodParameters)
+          token = TokenType.Punctuation
+          state = State.InsideMethodParameters
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -1174,7 +1192,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.InsideObjectDestructuringAfterValue
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
-          state = State.AfterKeywordDeclaration
+          state = State.AfterKeywordVariableDeclaration
         } else if ((next = part.match(RE_COLON))) {
           token = TokenType.Punctuation
           state = State.InsideObjectDestructuringAfterValue
@@ -1201,6 +1219,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.Type
           state = State.AfterInterfaceName
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else {
           throw new Error('no')
         }
@@ -1254,6 +1276,9 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.InsideSingleQuoteString
           stack.push(State.InsideTypeObject)
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.InsideTypeObject
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -1353,6 +1378,8 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterMethodParameters
         } else if ((next = part.match(RE_ARROW))) {
           token = TokenType.Punctuation
+          // TODO depending on whether this is a type function
+          // this can be either a type or a value
           state = State.BeforeType
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Punctuation
@@ -1442,7 +1469,7 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
           stack.push(state)
           token = TokenType.Comment
-          state = State.AfterInterfaceName
+          state = State.InsideBlockComment
         } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
           token = TokenType.Text
           state = stack.pop() || State.TopLevelContent
@@ -1534,6 +1561,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_DOT))) {
           token = TokenType.Punctuation
           state = State.AfterPropertyDot
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
         } else {
           throw new Error('no')
         }

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

@@ -73,7 +73,9 @@
         ".mm",
         ".tmDragCommand",
         ".tmCommand",
-        ".natvis"
+        ".natvis",
+        ".xcscheme",
+        ".xcsettings"
       ],
       "fileNames": [".project", "resources.grd"],
       "tokenize": "src/tokenizeXml.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.16.22",
+  "version": "0.17.0",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.22.5",
-    "@lvce-editor/extension-host": "0.16.22",
-    "@lvce-editor/extension-host-helper-process": "0.16.22",
-    "@lvce-editor/pty-host": "0.16.22",
+    "@lvce-editor/extension-host": "0.17.0",
+    "@lvce-editor/extension-host-helper-process": "0.17.0",
+    "@lvce-editor/pty-host": "0.17.0",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",

package/src/parts/ExtensionLink/ExtensionLink.js

@@ -34,6 +34,9 @@ export const link = async (path) => {
     const to = Path.join(linkedExtensionsPath, manifest.id)
     await SymLink.createSymLink(path, to)
   } catch (error) {
+    if (error && error.code === ErrorCodes.E_MANIFEST_NOT_FOUND) {
+      throw new VError(`Failed to link extension: Extension manifest not found '${error.path}'`)
+    }
     if (error && error.code === ErrorCodes.EEXIST) {
       return linkFallBack(path)
     }

package/src/parts/ExtensionManifest/ExtensionManifest.js

@@ -1,25 +1,16 @@
 import isObject from 'is-object'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
+import * as InferExtensionId from '../InferExtensionId/InferExtensionId.js'
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as ReadJson from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
-import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import { VError } from '../VError/VError.js'
 
-const RE_EXTENSION_FRAGMENT = /.+(\/|\\)(.+)$/
-
-const inferExtensionId = (absolutePath) => {
-  const match = absolutePath.match(RE_EXTENSION_FRAGMENT)
-  if (match) {
-    return match[2]
-  }
-  return ''
-}
-
 // TODO json parsing and error handling should happen in renderer process
 export const get = async (path) => {
+  const absolutePath = Path.join(path, 'extension.json')
   try {
-    const absolutePath = Path.join(path, 'extension.json')
     const json = await ReadJson.readJson(absolutePath)
     if (!isObject(json)) {
       // TODO should include stack of extension json file here
@@ -31,7 +22,7 @@ export const get = async (path) => {
       status: ExtensionManifestStatus.Resolved,
     }
   } catch (error) {
-    const id = inferExtensionId(path)
+    const id = InferExtensionId.inferExtensionId(path)
     const enhancedError = new VError(error, `Failed to load extension manifest for ${id}`)
     if (IsEnoentError.isEnoentError(error)) {
       try {
@@ -48,6 +39,8 @@ export const get = async (path) => {
         }
       } catch {}
       // @ts-ignore
+      enhancedError.path = absolutePath
+      // @ts-ignore
       enhancedError.code = ErrorCodes.E_MANIFEST_NOT_FOUND
     } else {
       // @ts-ignore

package/src/parts/InferExtensionId/InferExtensionId.js

@@ -0,0 +1,9 @@
+const RE_EXTENSION_FRAGMENT = /.+(\/|\\)(.+)$/
+
+export const inferExtensionId = (absolutePath) => {
+  const match = absolutePath.match(RE_EXTENSION_FRAGMENT)
+  if (match) {
+    return match[2]
+  }
+  return ''
+}

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.16.22'
+export const version = '0.17.0'
 
-export const commit = '84da26e'
+export const commit = '4a17b31'
 
-export const date = '2023-07-30T16:05:29.000Z'
+export const date = '2023-08-05T17:17:49.000Z'
 
 export const getVersion = () => {
   return version