@lvce-editor/shared-process 0.10.3 → 0.10.5

package/config/defaultSettings.json

@@ -29,7 +29,8 @@
   "workbench.iconTheme": "vscode-icons",
   "workbench.activityBar.visible": true,
   "workbench.sideBar.visible": true,
-  "workbench.saveStateOnVisibilityChange": false,
+  "workbench.sideBarLocation": "right",
+  "workbench.saveStateOnVisibilityChange": true,
 
   "workspace.defaultWorkspace": "fetch:///playground",
 

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

@@ -75,8 +75,8 @@ export const TokenMap = {
 }
 
 const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>\+\~\_%]+/
-const RE_SELECTOR_ID = /^#\w+/
-const RE_WHITESPACE = /^ +/
+const RE_SELECTOR_ID = /^#[\w\-\_]+/
+const RE_WHITESPACE = /^\s+/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
 const RE_PROPERTY_NAME = /^[a-zA-Z\-]+\b/

package/extensions/builtin.language-basics-html/src/tokenizeHtml.js

@@ -84,6 +84,7 @@ const RE_TAGNAME = /^[!\w]+/
 const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
 const RE_WORD = /^[^\s]+/
+const RE_ATTRIBUTE_VALUE_UNQUOTED=/^[^<>]+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -249,7 +250,11 @@ 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_ATTRIBUTE_VALUE_UNQUOTED))){
+          token=TokenType.String
+          state=State.InsideOpeningTag
         } else {
+          part
           throw new Error('no')
         }
         break

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

@@ -7,7 +7,8 @@
       "id": "javascript",
       "extensions": [".js", ".es6", ".mjs", ".cjs", ".pac"],
       "tokenize": "src/tokenizeJavaScript.js",
-      "configuration": "./languageConfiguration.json"
+      "configuration": "./languageConfiguration.json",
+      "firstLine": "^#!.*\\bnode"
     }
   ]
 }

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

@@ -48,6 +48,7 @@ export const TokenType = {
   KeywordModifier: 882,
   KeywordReturn: 883,
   KeywordNew: 884,
+  FunctionName: 885,
 }
 
 export const TokenMap = {
@@ -73,6 +74,7 @@ export const TokenMap = {
   [TokenType.KeywordModifier]: 'KeywordModifier',
   [TokenType.KeywordReturn]: 'KeywordReturn',
   [TokenType.KeywordNew]: 'KeywordNew',
+  [TokenType.FunctionName]: 'Function',
 }
 
 const RE_KEYWORD =
@@ -102,20 +104,23 @@ const RE_ROUND_CLOSE = /^\)/
 const RE_DOT = /^\./
 const RE_EQUAL_SIGN = /^=/
 const RE_SINGLE_QUOTE = /^'/
-const RE_PUNCTUATION = /^[\(\)=\+\-><\.:;\{\}\[\]!,&\|\^\?\*%]/
+const RE_PUNCTUATION = /^[\(\)=\+\-><\.:;\{\}\[\]!,&\|\^\?\*%~]/
 const RE_SLASH = /^\//
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_WHITESPACE = /^\s+/
 const RE_QUOTE_SINGLE = /^'/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_QUOTE_BACKTICK = /^`/
-const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
-const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
+const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^'\\]+/
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"\\]+/
 const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`]+/
+const RE_STRING_ESCAPE = /^\\./
+const RE_SHEBANG = /^#!.*/
+const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\(|\=\s*function|\=\s*\())/
 
 // copied from https://github.com/PrismJS/prism/blob/master/components/prism-javascript.js#L57
 const RE_REGEX =
-  /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*\]|\\.|[^/\\\[\r\n])+\/[dgimyus]{0,7}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/
+  /^((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*\]|\\.|[^/\\\[\r\n])+\/[dgimyus]{0,7}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -179,6 +184,9 @@ export const tokenizeLine = (line, lineState) => {
               break
           }
           state = State.TopLevelContent
+        } 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
@@ -215,9 +223,10 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_NUMERIC_OCTAL))) {
           token = TokenType.Numeric
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_SHEBANG))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
         } else {
-          line.slice(0, index) //?
-          part //?
           throw new Error('no')
         }
         break
@@ -262,6 +271,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
           token = TokenType.String
           state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
+          token = TokenType.String
+          state = State.InsideSingleQuoteString
         } else {
           throw new Error('no')
         }
@@ -273,6 +285,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
           token = TokenType.String
           state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
+          token = TokenType.String
+          state = State.InsideDoubleQuoteString
         } else {
           throw new Error('no')
         }

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

@@ -28,7 +28,10 @@
         ".babelrc",
         ".prettierrc",
         ".sublime-project",
-        ".code-snippets"
+        ".code-snippets",
+        ".tour",
+        ".heapsnapshot",
+        ".code-workspace"
       ],
       "fileNames": [
         "composer.lock",
@@ -37,7 +40,8 @@
         ".imgbotconfig",
         ".stylelintrc",
         ".parcelrc",
-        ".publishrc"
+        ".publishrc",
+        ".whitesource"
       ],
       "tokenize": "src/tokenizeJson.js"
     }

package/extensions/builtin.language-basics-json/src/tokenizeJson.js

@@ -91,7 +91,7 @@ const RE_SQUARE_CLOSE = /^\]/
 const RE_LINE_COMMENT = /^\/\/.*/
 const RE_ANYTHING = /^.+/s
 const RE_NUMERIC =
-  /^((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b/
+  /^((0(x|X)[0-9a-fA-F]*)|(\-?([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b/
 const RE_TEXT = /^[^\s\{\}\[\]]+/
 // const RE_ESCAPED_QUOTE = /^\\"/
 // const RE_BACK_SLASH = /^\\/
@@ -282,6 +282,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_COMMA))) {
           token = TokenType.Punctuation
           state = State.AfterCurlyOpen
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.AfterCurlyOpen
         } else {
           part //?
           throw new Error('no')

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

@@ -5,7 +5,7 @@
   "languages": [
     {
       "id": "markdown",
-      "extensions": [".md"],
+      "extensions": [".md", ".markdown"],
       "tokenize": "src/tokenizeMarkdown.js"
     }
   ]

package/extensions/builtin.language-basics-markdown/src/tokenizeMarkdown.js

@@ -305,6 +305,9 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WORD))) {
           token = TokenType.String
           state = State.AfterTripleBackTickAfterLanguageId
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterTripleBackTick
         } else {
           throw new Error('no')
         }

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

@@ -5,7 +5,49 @@
   "languages": [
     {
       "id": "shellscript",
-      "extensions": [".sh"],
+      "extensions": [
+        ".sh",
+        ".bash",
+        ".bashrc",
+        ".bash_aliases",
+        ".bash_profile",
+        ".bash_login",
+        ".ebuild",
+        ".profile",
+        ".bash_logout",
+        ".xprofile",
+        ".xsession",
+        ".xsessionrc",
+        ".Xsession",
+        ".zsh",
+        ".zshrc",
+        ".zprofile",
+        ".zlogin",
+        ".zlogout",
+        ".zshenv",
+        ".zsh-theme",
+        ".fish",
+        ".ksh",
+        ".csh",
+        ".cshrc",
+        ".tcshrc",
+        ".yashrc",
+        ".yash_profile"
+      ],
+      "fileNames": [
+        "APKBUILD",
+        "PKGBUILD",
+        ".envrc",
+        ".hushlogin",
+        "zshrc",
+        "zshenv",
+        "zlogin",
+        "zprofile",
+        "zlogout",
+        "bashrc_Apple_Terminal",
+        "zshrc_Apple_Terminal"
+      ],
+      "firstLine": "^#!.*\\b(bash|fish|zsh|sh|ksh|dtksh|pdksh|mksh|ash|dash|yash|sh|csh|jcsh|tcsh|itcsh).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-",
       "tokenize": "src/tokenizeShellScript.js"
     }
   ]

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

@@ -50,7 +50,7 @@ const RE_COLON = /^:/
 const RE_PROPERTY_VALUE = /^[^;\}]+/
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
-const RE_ANYTHING = /^.*/s
+const RE_ANYTHING = /^.+/s
 const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/

package/extensions/builtin.language-basics-svelte/README.md

@@ -0,0 +1,14 @@
+# Language Basics Svelte
+
+## Contributing
+
+```sh
+git clone git@github.com:lvce-editor/language-basics-svelte.git &&
+cd language-basics-svelte &&
+npm ci &&
+npm test
+```
+
+## Gitpod
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/lvce-editor/language-basics-svelte)

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

@@ -0,0 +1,13 @@
+{
+  "id": "builtin.language-basics-svelte",
+  "version": "0.0.0-dev",
+  "name": "Language Basics Svelte",
+  "description": "Provides syntax highlighting and bracket matching in Svelte files.",
+  "languages": [
+    {
+      "id": "svelte",
+      "extensions": [".svelte"],
+      "tokenize": "src/tokenizeSvelte.js"
+    }
+  ]
+}

package/extensions/builtin.language-basics-svelte/src/tokenizeSvelte.js

@@ -0,0 +1,310 @@
+/**
+ * @enum number
+ */
+const State = {
+  TopLevelContent: 1,
+  AfterOpeningAngleBracket: 2,
+  InsideOpeningTag: 3,
+  InsideOpeningTagAndHasSeenWhitespace: 4,
+  AfterClosingTagAngleBrackets: 5,
+  AfterClosingTagName: 6,
+  AfterAttributeName: 7,
+  AfterAttributeEqualSign: 8,
+  InsideAttributeDoubleQuote: 9,
+  InsideBlockComment: 10,
+  None: 11,
+  InsideDoubleQuoteString: 12,
+  InsideSingleQuoteString: 13,
+}
+
+export const StateMap = {}
+
+/**
+ * @enum number
+ */
+export const TokenType = {
+  None: 99999999,
+  Numeric: 30,
+  String: 50,
+  Whitespace: 0,
+  Comment: 60,
+  Text: 117,
+  PunctuationTag: 228,
+  TagName: 118,
+  AttributeName: 119,
+  Punctuation: 10,
+  Error: 141,
+  PunctuationString: 11,
+  NewLine: 891,
+}
+
+export const TokenMap = {
+  [TokenType.None]: 'None',
+  [TokenType.Numeric]: 'Numeric',
+  [TokenType.String]: 'String',
+  [TokenType.Whitespace]: 'Whitespace',
+  [TokenType.Comment]: 'Comment',
+  [TokenType.Text]: 'Text',
+  [TokenType.PunctuationTag]: 'PunctuationTag',
+  [TokenType.TagName]: 'TagName',
+  [TokenType.AttributeName]: 'AttributeName',
+  [TokenType.Punctuation]: 'Punctuation',
+  [TokenType.Error]: 'Error',
+  [TokenType.PunctuationString]: 'PunctuationString',
+}
+
+const RE_ANGLE_BRACKET_CLOSE = /^>/
+const RE_ANGLE_BRACKET_ONLY = /^</
+const RE_ANGLE_BRACKET_OPEN = /^</
+const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?!\s)/
+const RE_ANY_TEXT = /^[^\n]+/
+const RE_ATTRIBUTE_NAME = /^[a-zA-Z\d\-]+/
+const RE_BLOCK_COMMENT_CONTENT_1 = /^.+?(?=-->)/s
+const RE_BLOCK_COMMENT_CONTENT_2 = /^.+$/s
+const RE_BLOCK_COMMENT_END = /^-->/
+const RE_BLOCK_COMMENT_START = /^<!--/
+const RE_DASH_DASH = /^\-\-/
+const RE_DOUBLE_QUOTE = /^"/
+const RE_EQUAL_SIGN = /^=/
+const RE_EXCLAMATION_MARK = /^!/
+const RE_INVALID_INSIDE_ClOSING_TAG = /^[^a-zA-Z>]/
+const RE_INVALID_INSIDE_OPENING_TAG = /^[^a-zA-Z>]/
+const RE_NEWLINE = /^\n/
+const RE_NEWLINE_WHITESPACE = /^\n\s*/
+const RE_NOT_TAGNAME = /^[^a-zA-Z\d]+/
+const RE_PUNCTUATION = /^[<;'".,]/
+const RE_PUNCTUATION_SELF_CLOSING = /^\/>/
+const RE_SELF_CLOSING = /^\/>/
+const RE_SINGLE_QUOTE = /^'/
+const RE_SLASH = /^\//
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
+const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
+const RE_TAG_TEXT = /^[^\s>]+/
+const RE_TAGNAME = /^[!\w]+/
+const RE_TEXT = /^[^<>\n]+/
+const RE_WHITESPACE = /^\s+/
+const RE_WORD = /^[^\s]+/
+const RE_ATTRIBUTE_VALUE_UNQUOTED = /^[^<>]+/
+
+export const initialLineState = {
+  state: State.TopLevelContent,
+}
+
+/**
+ *
+ * @param {any} lineStateA
+ * @param {any} lineStateB
+ * @returns
+ */
+export const isLineStateEqual = (lineStateA, lineStateB) => {
+  return lineStateA.state === lineStateB.state
+}
+
+export const hasArrayReturn = true
+
+/**
+ *
+ * @param {string} line
+ * @param {any} lineState
+ * @returns
+ */
+export const tokenizeLine = (line, lineState) => {
+  let next = null
+  let index = 0
+  let tokens = []
+  let token = TokenType.None
+  let state = lineState.state
+  while (index < line.length) {
+    const part = line.slice(index)
+    switch (state) {
+      case State.TopLevelContent:
+        if ((next = part.match(RE_ANGLE_BRACKET_OPEN_TAG))) {
+          token = TokenType.PunctuationTag
+          state = State.AfterOpeningAngleBracket
+        } else if ((next = part.match(RE_TEXT))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANGLE_BRACKET_OPEN))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.AfterOpeningAngleBracket:
+        if ((next = part.match(RE_TAGNAME))) {
+          token = TokenType.TagName
+          state = State.InsideOpeningTag
+        } else if ((next = part.match(RE_SLASH))) {
+          token = TokenType.PunctuationTag
+          state = State.AfterClosingTagAngleBrackets
+        } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
+          token = TokenType.PunctuationTag
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANY_TEXT))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.InsideOpeningTag:
+        if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
+          token = TokenType.PunctuationTag
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_EXCLAMATION_MARK))) {
+          token = TokenType.PunctuationTag
+          state = State.InsideOpeningTag
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideOpeningTagAndHasSeenWhitespace
+        } else if ((next = part.match(RE_DASH_DASH))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_TAG_TEXT))) {
+          token = TokenType.Text
+          state = State.InsideOpeningTag
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.AfterClosingTagAngleBrackets:
+        if ((next = part.match(RE_TAGNAME))) {
+          token = TokenType.TagName
+          state = State.AfterClosingTagName
+        } else if ((next = part.match(RE_ANY_TEXT))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.AfterClosingTagName:
+        if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
+          token = TokenType.PunctuationTag
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_TEXT))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideOpeningTagAndHasSeenWhitespace:
+        if ((next = part.match(RE_ATTRIBUTE_NAME))) {
+          token = TokenType.AttributeName
+          state = State.AfterAttributeName
+        } else if ((next = part.match(RE_SELF_CLOSING))) {
+          token = TokenType.PunctuationTag
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
+          token = TokenType.PunctuationTag
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_TAG_TEXT))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.AfterAttributeName:
+        if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
+          token = TokenType.PunctuationTag
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_EQUAL_SIGN))) {
+          token = TokenType.Punctuation
+          state = State.AfterAttributeEqualSign
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_TAG_TEXT))) {
+          token = TokenType.Text
+          state = State.InsideOpeningTag
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideOpeningTagAndHasSeenWhitespace
+        } else {
+          // TODO check quotation mark
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.AfterAttributeEqualSign:
+        if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
+          token = TokenType.PunctuationTag
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ATTRIBUTE_VALUE_UNQUOTED))) {
+          token = TokenType.String
+          state = State.InsideOpeningTag
+        } else {
+          part
+          throw new Error('no')
+        }
+        break
+      case State.InsideDoubleQuoteString:
+        if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideOpeningTag
+        } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideDoubleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideSingleQuoteString:
+        if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideOpeningTag
+        } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideSingleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideBlockComment:
+        part
+        if ((next = part.match(RE_BLOCK_COMMENT_CONTENT_1))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_BLOCK_COMMENT_END))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_CONTENT_2))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else {
+          throw new Error('no')
+        }
+        break
+      default:
+        state
+        throw new Error('no')
+    }
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
+  }
+  return {
+    state,
+    tokens,
+  }
+}

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

@@ -12,7 +12,8 @@ export const State = {
   InsideMultiLineString: 8,
   InsideMultiLineStringAfterWhitespace: 9,
   AfterPropertyValue: 10,
-  InsidePropertyNameString: 11,
+  InsidePropertyNameStringSingleQuoted: 11,
+  InsidePropertyNameStringDoubleQuoted: 12,
 }
 
 export const StateMap = {
@@ -65,7 +66,7 @@ const RE_LINE_COMMENT_START = /^#/
 const RE_WHITESPACE = /^ +/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
-const RE_PROPERTY_NAME = /^[\:@\/\\a-zA-Z\-\_\d\.]+(?=\s*:(\s+|$))/
+const RE_PROPERTY_NAME = /^[\p{L}\p{P}\p{S}.\d]+(?=\s*:(\s+|$))/u
 const RE_PROPERTY_NAME_2 =
   /^[\:@\/\\a-zA-Z\-\_\d\.\s]*[@\/\\a-zA-Z\-\_\d\.](?=\s*:(\s+|$))/
 const RE_PROPERTY_VALUE_1 = /^[^&].*(?=\s+#)/s
@@ -73,7 +74,7 @@ const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
 const RE_ANYTHING = /^.+/s
 const RE_ANYTHING_BUT_COMMENT = /^[^#]+/
-const RE_NUMERIC = /^(([0-9]+\.?[0-9]*)|(\.[0-9]+))(?=\s|$)/
+const RE_NUMERIC = /^(([0-9]+\.?[0-9]*)|(\.[0-9]+))(?=\s*$|\s+#|\s*[\[\]\{\}])/
 const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
 const RE_BLOCK_COMMENT_START = /^\/\*/
 const RE_BLOCK_COMMENT_END = /^\*\//
@@ -96,7 +97,9 @@ const RE_WORDS = /^[\w\s]*\w/
 const RE_MULTI_LINE_STRING_START = /^(?:\||>\-|>)/
 const RE_KEY_PRE = /^\s*(\-\s*)?/
 const RE_SINGLE_QUOTE = /^'/
+const RE_DOUBLE_QUOTE = /^"/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_ALIAS = /^\*.+/
 const RE_ANCHOR = /^\&.+/
 const RE_MERGE_KEY = /^<<\:(?=\s)/
@@ -150,6 +153,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_DASH))) {
           token = TokenType.Punctuation
           state = State.AfterDash
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsidePropertyNameStringSingleQuoted
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsidePropertyNameStringDoubleQuoted
         } else if ((next = part.match(RE_PROPERTY_NAME))) {
           token = TokenType.YamlPropertyName
           state = State.AfterPropertyName
@@ -162,9 +171,6 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_WORDS))) {
           token = TokenType.Text
           state = State.TopLevelContent
-        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
-          token = TokenType.Punctuation
-          state = State.InsidePropertyNameString
         } else if ((next = part.match(RE_MERGE_KEY))) {
           token = TokenType.Punctuation
           state = State.AfterPropertyNameAfterColon
@@ -172,7 +178,6 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Text
           state = State.TopLevelContent
         } else {
-          part //?
           throw new Error('no')
         }
         break
@@ -277,6 +282,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_DASH))) {
           token = TokenType.Punctuation
           state = State.AfterDash
+        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsidePropertyNameStringSingleQuoted
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsidePropertyNameStringDoubleQuoted
         } else if ((next = part.match(RE_PROPERTY_NAME))) {
           token = TokenType.YamlPropertyName
           state = State.AfterPropertyName
@@ -292,21 +303,29 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_LINE_COMMENT_START))) {
           token = TokenType.Comment
           state = State.InsideLineComment
-        } else if ((next = part.match(RE_SINGLE_QUOTE))) {
-          token = TokenType.Punctuation
-          state = State.InsidePropertyNameString
         } else {
           part
           throw new Error('no')
         }
         break
-      case State.InsidePropertyNameString:
+      case State.InsidePropertyNameStringSingleQuoted:
         if ((next = part.match(RE_SINGLE_QUOTE))) {
           token = TokenType.Punctuation
           state = State.AfterPropertyName
         } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
           token = TokenType.String
-          state = State.InsidePropertyNameString
+          state = State.InsidePropertyNameStringSingleQuoted
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsidePropertyNameStringDoubleQuoted:
+        if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.AfterPropertyName
+        } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsidePropertyNameStringDoubleQuoted
         } else {
           throw new Error('no')
         }

package/extensions/builtin.theme-atom-one-dark/color-theme.json

@@ -160,6 +160,18 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#98C379"
+    },
+    {
+      "name": "Function",
+      "foreground": "#61AFEF"
+    },
+    {
+      "name": "KeywordControl",
+      "foreground": "#C678DD"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#E06C75"
     }
   ]
 }

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

@@ -177,6 +177,10 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#86B300"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#55B4D4"
     }
   ]
 }

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

@@ -143,6 +143,14 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#A5FF90"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#FB94FF"
+    },
+    {
+      "name": "KeywordReturn",
+      "foreground": "#FF9D00"
     }
   ]
 }

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

@@ -1,7 +1,8 @@
 {
   "id": "builtin.theme-cobalt2",
   "name": "Cobalt 2 Theme",
-  "description": "🔥 Official theme by Wes Bos.",
+  "description": "Theme based on the the Official Cobalt2 theme by Wes Bos.",
+  "icon": "images/logo.png",
   "colorThemes": [
     {
       "id": "cobalt2",

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

@@ -180,6 +180,14 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#A9B665"
+    },
+    {
+      "name": "Function",
+      "foreground": "#A9B665"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#D3869B"
     }
   ]
 }

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

@@ -17,7 +17,7 @@
     "ContextMenuForeground": "rgb(238, 255, 255)",
 
     "EditorBackGround": "",
-    "EditorScrollBarBackground": "",
+    "EditorScrollBarBackground": "rgba(238, 255, 255, 0.13)",
     "EditorCursorBackground": "#ffcc00",
     "EditorSelectionBackground": "rgba(128, 203, 196, 0.13)",
 
@@ -117,7 +117,7 @@
     },
     {
       "name": "VariableName",
-      "foreground": "#f07178"
+      "foreground": "#EEFFFF"
     },
     {
       "name": "Macro",
@@ -157,7 +157,7 @@
     },
     {
       "name": "LanguageConstant",
-      "foreground": "#F78C6C"
+      "foreground": "#89DDFF"
     },
     {
       "name": "Heading",
@@ -170,6 +170,14 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#C3E88D"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#89DDFF"
+    },
+    {
+      "name": "KeywordReturn",
+      "foreground": "#89DDFF"
     }
   ]
 }

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

@@ -17,7 +17,7 @@
     "MenuBackground": "rgb(30, 31, 28)",
 
     "EditorBackGround": "",
-    "EditorScrollBarBackground": "",
+    "EditorScrollBarBackground": "rgba(121, 121, 121, 0.4)",
     "EditorCursorBackground": "white",
     "EditorSelectionBackground": "rgba(135, 139, 145, 0.25)",
 
@@ -130,6 +130,22 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#E6DB74"
+    },
+    {
+      "name": "Function",
+      "foreground": "#A6E22E"
+    },
+    {
+      "name": "Keyword",
+      "foreground": "#66D9EF"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#FD971F"
+    },
+    {
+      "name": "KeywordControl",
+      "foreground": "#F92672"
     }
   ]
 }

package/extensions/builtin.theme-noctis-uva/color-theme.json

@@ -118,7 +118,7 @@
     },
     {
       "name": "VariableName",
-      "foreground": "#16a3b6"
+      "foreground": "#E4B781"
     },
     {
       "name": "JsonPropertyName",
@@ -163,6 +163,22 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#49E9A6"
+    },
+    {
+      "name": "Function",
+      "foreground": "#16A3B6"
+    },
+    {
+      "name": "KeywordNew",
+      "foreground": "#DF769B"
+    },
+    {
+      "name": "KeywordControl",
+      "foreground": "#DF769B"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#E66533"
     }
   ]
 }

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

@@ -172,6 +172,26 @@
     {
       "name": "YamlPropertyValueString",
       "foreground": "#BFC7D5"
+    },
+    {
+      "name": "Function",
+      "foreground": "#82AAFF"
+    },
+    {
+      "name": "KeywordThis",
+      "foreground": "#FF5370"
+    },
+    {
+      "name": "KeywordNew",
+      "foreground": "#C792EA"
+    },
+    {
+      "name": "KeywordControl",
+      "foreground": "#89DDFF"
+    },
+    {
+      "name": "KeywordReturn",
+      "foreground": "#89DDFF"
     }
   ]
 }

package/index.js

@@ -5,9 +5,12 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 
 export const sharedProcessPath = join(__dirname, 'src', 'sharedProcessMain.js')
 
-export const exportStatic = async () => {
+export const exportStatic = async ({ extensionPath = process.cwd() } = {}) => {
   const fn = await import('./src/parts/ExportStatic/ExportStatic.js')
   const root = process.cwd()
+  if (extensionPath !== root) {
+    extensionPath = join(root, extensionPath)
+  }
   const pathPrefix = process.env.PATH_PREFIX || ''
-  await fn.exportStatic({ root, pathPrefix })
+  await fn.exportStatic({ root, pathPrefix, extensionPath })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -20,11 +20,11 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.10.3",
-    "@lvce-editor/pty-host": "0.10.3",
+    "@lvce-editor/extension-host": "0.10.5",
+    "@lvce-editor/pty-host": "0.10.5",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
-    "exit-hook": "^3.1.0",
+    "exit-hook": "^3.1.1",
     "got": "^12.5.2",
     "is-object": "^1.0.2",
     "lines-and-columns": "^2.0.3",

package/src/parts/ExportStatic/ExportStatic.js

@@ -405,7 +405,12 @@ const getId = (object) => {
   return object.id
 }
 
-const addExtensionThemes = async ({ root, extensionJson, commitHash }) => {
+const addExtensionThemes = async ({
+  root,
+  extensionPath,
+  extensionJson,
+  commitHash,
+}) => {
   const colorThemes = extensionJson.colorThemes || []
   if (colorThemes.length === 0) {
     return
@@ -416,7 +421,7 @@ const addExtensionThemes = async ({ root, extensionJson, commitHash }) => {
       Path.join(root, 'dist', commitHash, 'extensions', `builtin.theme-${id}`)
     )
     await FileSystem.copy(
-      Path.join(root, path),
+      Path.join(extensionPath, path),
       Path.join(root, 'dist', commitHash, 'themes', `${id}.json`)
     )
     await replace(
@@ -436,7 +441,7 @@ const addExtensionThemes = async ({ root, extensionJson, commitHash }) => {
       )
     )
     await FileSystem.copyFile(
-      Path.join(root, 'extension.json'),
+      Path.join(extensionPath, 'extension.json'),
       Path.join(
         root,
         'dist',
@@ -447,7 +452,7 @@ const addExtensionThemes = async ({ root, extensionJson, commitHash }) => {
       )
     )
     await FileSystem.copyFile(
-      Path.join(root, 'color-theme.json'),
+      Path.join(extensionPath, 'color-theme.json'),
       Path.join(
         root,
         'dist',
@@ -496,6 +501,7 @@ const toPlaygroundFile = (file) => {
 
 const addExtensionLanguages = async ({
   root,
+  extensionPath,
   extensionJson,
   commitHash,
   pathPrefix,
@@ -516,11 +522,11 @@ const addExtensionLanguages = async ({
     Path.join(root, 'dist', commitHash, 'extensions', extensionId, 'README.md')
   )
   await FileSystem.copy(
-    Path.join(root, 'src'),
+    Path.join(extensionPath, 'src'),
     Path.join(root, 'dist', commitHash, 'extensions', extensionId, 'src')
   )
   await FileSystem.copyFile(
-    Path.join(root, 'extension.json'),
+    Path.join(extensionPath, 'extension.json'),
     Path.join(
       root,
       'dist',
@@ -545,23 +551,67 @@ const addExtensionLanguages = async ({
     Path.join(root, 'dist', commitHash, 'config', 'languages.json'),
     mergedLanguages
   )
-  await FileSystem.remove(Path.join(root, 'dist', commitHash, 'playground'))
-  await FileSystem.copy(
-    Path.join(root, 'test', 'cases'),
-    Path.join(root, 'dist', commitHash, 'playground')
-  )
+  if (await FileSystem.exists(Path.join(extensionPath, 'test', 'cases'))) {
+    await FileSystem.remove(Path.join(root, 'dist', commitHash, 'playground'))
+    await FileSystem.copy(
+      Path.join(extensionPath, 'test', 'cases'),
+      Path.join(root, 'dist', commitHash, 'playground')
+    )
+    const testFiles = await FileSystem.readDir(
+      Path.join(extensionPath, 'test', 'cases')
+    )
+    const fileMap = testFiles.map(toPlaygroundFile)
+    await JsonFile.writeJson(
+      Path.join(root, 'dist', commitHash, 'config', 'fileMap.json'),
+      fileMap
+    )
+  }
+}
 
-  const testFiles = await FileSystem.readDir(Path.join(root, 'test', 'cases'))
-  const fileMap = testFiles.map(toPlaygroundFile)
+const addExtensionWebExtension = async ({
+  root,
+  extensionPath,
+  commitHash,
+  extensionJson,
+  pathPrefix,
+}) => {
+  if (!extensionJson.browser) {
+    return
+  }
+  const webExtensions = [
+    {
+      ...extensionJson,
+      isWeb: true,
+      path: `${pathPrefix}/${commitHash}/extensions/${extensionJson.id}`,
+    },
+  ]
   await JsonFile.writeJson(
-    Path.join(root, 'dist', commitHash, 'config', 'fileMap.json'),
-    fileMap
+    Path.join(root, 'dist', commitHash, 'config', 'webExtensions.json'),
+    webExtensions
   )
+  for (const dirent of ['src', 'extension.json']) {
+    await FileSystem.copy(
+      Path.join(extensionPath, dirent),
+      Path.join(
+        root,
+        'dist',
+        commitHash,
+        'extensions',
+        extensionJson.id,
+        dirent
+      )
+    )
+  }
 }
 
-const addExtension = async ({ root, commitHash, pathPrefix }) => {
+const addExtension = async ({
+  root,
+  extensionPath,
+  commitHash,
+  pathPrefix,
+}) => {
   const extensionJson = await readExtensionManifest(
-    Path.join(root, 'extension.json')
+    Path.join(extensionPath, 'extension.json')
   )
   const name = extensionJson.name || extensionJson.id || ''
   const description = extensionJson.description || ''
@@ -574,9 +624,18 @@ const addExtension = async ({ root, commitHash, pathPrefix }) => {
     root,
     commitHash,
     extensionJson,
+    extensionPath,
   })
   await addExtensionLanguages({
     root,
+    extensionPath,
+    commitHash,
+    extensionJson,
+    pathPrefix,
+  })
+  await addExtensionWebExtension({
+    root,
+    extensionPath,
     commitHash,
     extensionJson,
     pathPrefix,
@@ -585,12 +644,12 @@ const addExtension = async ({ root, commitHash, pathPrefix }) => {
 
 /**
  *
- * @param {{root:string, pathPrefix:string  }} param0
+ * @param {{root:string, pathPrefix:string , extensionPath:string  }} param0
  */
-export const exportStatic = async ({ root, pathPrefix }) => {
+export const exportStatic = async ({ root, pathPrefix, extensionPath }) => {
   if (pathPrefix === 'auto') {
     const extensionJson = await readExtensionManifest(
-      Path.join(root, 'extension.json')
+      Path.join(extensionPath, 'extension.json')
     )
     const id = extensionJson.id
     const [author, name] = id.split('.')
@@ -619,9 +678,10 @@ export const exportStatic = async ({ root, pathPrefix }) => {
 
   console.time('addExtension')
   await addExtension({
-    root,
+    extensionPath,
     commitHash,
     pathPrefix,
+    root,
   })
   console.timeEnd('addExtension')
 }

package/src/parts/Socket/Socket.js

@@ -70,6 +70,9 @@ const handleMessage = async (event) => {
             code: /* UnexpectedError */ -32001,
             // @ts-ignore
             message: error.toString(),
+            data: {
+              code: error.code,
+            },
           },
         })
       }

package/extensions/builtin.language-basics-html/languageConfiguration.json

@@ -1,66 +0,0 @@
-{
-  "comments": {
-    "blockComment": ["<!--", "-->"]
-  },
-  "brackets": [
-    ["<!--", "-->"],
-    ["<", ">"],
-    ["{", "}"],
-    ["(", ")"]
-  ],
-  "autoClosingPairs": [
-    { "open": "{", "close": "}" },
-    { "open": "[", "close": "]" },
-    { "open": "(", "close": ")" },
-    { "open": "'", "close": "'" },
-    { "open": "\"", "close": "\"" },
-    { "open": "<!--", "close": "-->", "notIn": ["comment", "string"] }
-  ],
-  "surroundingPairs": [
-    { "open": "'", "close": "'" },
-    { "open": "\"", "close": "\"" },
-    { "open": "{", "close": "}" },
-    { "open": "[", "close": "]" },
-    { "open": "(", "close": ")" },
-    { "open": "<", "close": ">" }
-  ],
-  "colorizedBracketPairs": [
-    ["{", "}"],
-    ["(", ")"]
-  ],
-  "folding": {
-    "markers": {
-      "start": "^\\s*<!--\\s*#region\\b.*-->",
-      "end": "^\\s*<!--\\s*#endregion\\b.*-->"
-    }
-  },
-  "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\$\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\s]+)",
-  "onEnterRules": [
-    {
-      "beforeText": {
-        "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w-.\\d]*)([^/>]*(?!\\/)>)[^<]*$",
-        "flags": "i"
-      },
-      "afterText": {
-        "pattern": "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>",
-        "flags": "i"
-      },
-      "action": {
-        "indent": "indentOutdent"
-      }
-    },
-    {
-      "beforeText": {
-        "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))(\\w[\\w\\d]*)([^/>]*(?!\\/)>)[^<]*$",
-        "flags": "i"
-      },
-      "action": {
-        "indent": "indent"
-      }
-    }
-  ],
-  "indentationRules": {
-    "increaseIndentPattern": "<(?!\\?|(?:area|base|br|col|frame|hr|html|img|input|keygen|link|menuitem|meta|param|source|track|wbr)\\b|[^>]*\\/>)([-_\\.A-Za-z0-9]+)(?=\\s|>)\\b[^>]*>(?!.*<\\/\\1>)|<!--(?!.*-->)|\\{[^}\"']*$",
-    "decreaseIndentPattern": "^\\s*(<\\/(?!html)[-_\\.A-Za-z0-9]+\\b[^>]*>|-->|\\})"
-  }
-}