@lvce-editor/shared-process 0.15.12 → 0.15.13

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

@@ -0,0 +1,5 @@
+{
+  "comments": {
+    "lineComment": "#"
+  }
+}

package/extensions/builtin.language-basics-cpp/src/tokenizeCpp.js

@@ -32,6 +32,15 @@ export const TokenType = {
   Include: 222,
   Type: 555,
   Macro: 71,
+  KeywordImport: 215,
+  KeywordControl: 881,
+  KeywordModifier: 882,
+  KeywordReturn: 883,
+  KeywordNew: 884,
+  FunctionName: 885,
+  KeywordThis: 886,
+  KeywordOperator: 887,
+  LanguageConstant: 888,
 }
 
 export const TokenMap = {
@@ -46,6 +55,16 @@ export const TokenMap = {
   [TokenType.String]: 'String',
   [TokenType.Type]: 'Type',
   [TokenType.Macro]: 'Macro',
+  [TokenType.Numeric]: 'Numeric',
+  [TokenType.KeywordImport]: 'KeywordImport',
+  [TokenType.KeywordControl]: 'KeywordControl',
+  [TokenType.KeywordModifier]: 'KeywordModifier',
+  [TokenType.KeywordReturn]: 'KeywordReturn',
+  [TokenType.KeywordNew]: 'KeywordNew',
+  [TokenType.FunctionName]: 'Function',
+  [TokenType.KeywordThis]: 'KeywordThis',
+  [TokenType.KeywordOperator]: 'KeywordOperator',
+  [TokenType.LanguageConstant]: 'LanguageConstant',
 }
 
 const RE_WHITESPACE = /^\s+/
@@ -78,7 +97,7 @@ const RE_ROUND_CLOSE = /^\)/
 const RE_DOT = /^\./
 const RE_EQUAL_SIGN = /^=/
 const RE_SINGLE_QUOTE = /^'/
-const RE_PUNCTUATION = /^[\(\)=\+\-><\.,\/\*\^\[\]\{\}\|:]/
+const RE_PUNCTUATION = /^[\(\)=\+\-><\.,\/\*\^\[\]\{\}\|:\;\&\!\~]/
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_START_OF_FUNCTION = /^( )*\(/
 const RE_COLON_COLON = /^::/
@@ -127,7 +146,39 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_KEYWORD))) {
-          token = TokenType.Keyword
+          switch (next[0]) {
+            case 'true':
+            case 'false':
+            case 'null':
+              token = TokenType.LanguageConstant
+              break
+            case 'switch':
+            case 'default':
+            case 'case':
+            case 'else':
+            case 'if':
+            case 'break':
+            case 'throw':
+            case 'for':
+            case 'try':
+            case 'catch':
+            case 'continue':
+            case 'while':
+              token = TokenType.KeywordControl
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              break
+            case 'new':
+              token = TokenType.KeywordNew
+              break
+            case 'this':
+              token = TokenType.KeywordThis
+              break
+            default:
+              token = TokenType.Keyword
+              break
+          }
           state = State.TopLevelContent
         } else if ((next = part.match(RE_TYPE))) {
           token = TokenType.Type
@@ -164,6 +215,9 @@ 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_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent

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

@@ -1,6 +1,5 @@
 # Language Basics Elixir
 
-
 ## Contributing
 
 ```sh

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

@@ -6,7 +6,8 @@
     {
       "id": "java",
       "extensions": [".java"],
-      "tokenize": "src/tokenizeJava.js"
+      "tokenize": "src/tokenizeJava.js",
+      "configuration": "./languageConfiguration.json"
     }
   ]
 }

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

@@ -0,0 +1,31 @@
+{
+  "comments": {
+    "lineComment": "//",
+    "blockComment": ["/*", "*/"]
+  },
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    { "open": "\"", "close": "\"", "notIn": ["string"] },
+    { "open": "'", "close": "'", "notIn": ["string"] },
+    { "open": "/**", "close": " */", "notIn": ["string"] }
+  ],
+  "surroundingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    ["\"", "\""],
+    ["'", "'"],
+    ["<", ">"]
+  ],
+  "indentationRules": {
+    "increaseIndentPattern": "^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$",
+    "decreaseIndentPattern": "^((?!.*?\\/\\*).*\\*/)?\\s*[\\)\\}\\]].*$"
+  }
+}

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

@@ -6,7 +6,7 @@ const State = {
   TopLevelContent: 1,
   InsideSingleQuoteString: 2,
   InsideDoubleQuoteString: 3,
-  AfterKeywordClass: 4,
+  AfterKeywordBeforeClass: 4,
   InsideBlockComment: 5,
 }
 
@@ -125,8 +125,9 @@ export const tokenizeLine = (line, lineState) => {
               token = TokenType.KeywordThis
               break
             case 'class':
+            case 'extends':
               token = TokenType.Keyword
-              state = State.AfterKeywordClass
+              state = State.AfterKeywordBeforeClass
               break
             default:
               token = TokenType.Keyword
@@ -192,10 +193,10 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
-      case State.AfterKeywordClass:
+      case State.AfterKeywordBeforeClass:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
-          state = State.AfterKeywordClass
+          state = State.AfterKeywordBeforeClass
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.Class
           state = State.TopLevelContent

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

@@ -0,0 +1,40 @@
+{
+  "comments": {
+    "lineComment": "//",
+    "blockComment": ["/*", "*/"]
+  },
+  "brackets": [
+    ["${", "}"],
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    { "open": "{", "close": "}" },
+    { "open": "[", "close": "]" },
+    { "open": "(", "close": ")" },
+    { "open": "'", "close": "'", "notIn": ["string", "comment"] },
+    { "open": "\"", "close": "\"", "notIn": ["string"] },
+    { "open": "`", "close": "`", "notIn": ["string", "comment"] },
+    { "open": "/**", "close": " */", "notIn": ["string"] }
+  ],
+  "surroundingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    ["'", "'"],
+    ["\"", "\""],
+    ["`", "`"]
+  ],
+  "indentationRules": {
+    "decreaseIndentPattern": {
+      "pattern": "^((?!.*?/\\*).*\\*/)?\\s*[\\}\\]].*$"
+    },
+    "increaseIndentPattern": {
+      "pattern": "^((?!//).)*(\\{([^}\"'`/]*|(\\t|[ ])*//.*)|\\([^)\"'`/]*|\\[[^\\]\"'`/]*)$"
+    },
+    "unIndentedLinePattern": {
+      "pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*[ ]\\*([ ]([^\\*]|\\*(?!/))*)?$"
+    }
+  }
+}

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

@@ -216,6 +216,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'delete':
             case 'typeof':
             case 'in':
+            case 'instanceof':
               token = TokenType.KeywordOperator
               break
             case 'function':

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

@@ -6,6 +6,7 @@
     {
       "id": "python",
       "extensions": [".py"],
+      "fileNames": ["SCsub"],
       "configuration": "./languageConfiguration.json",
       "tokenize": "src/tokenizePython.js",
       "firstLine": "^#!\\s*/?.*\\bpython[0-9.-]*\\b"

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

@@ -9,6 +9,7 @@ export const State = {
   InsideBackTickString: 5,
   InsideEof: 6,
   AfterKeywordFunction: 7,
+  AfterFunctionName: 8,
 }
 
 export const StateMap = {
@@ -62,17 +63,18 @@ const RE_COLON = /^:/
 const RE_PROPERTY_VALUE = /^[^;\}]+/
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
-const RE_ANYTHING_SHORT = /^[^\s"']+/
+const RE_ANYTHING_SHORT = /^[^\s"'\\]+/
 const RE_ANYTHING = /^.+/s
 const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
 const RE_QUOTE_DOUBLE = /^"/
+const RE_ESCAPED = /^\\./
 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 =
-  /^(?:7z|7za|7zr|alias|anacron|apk|apt-get|ar|asciidoctor|awk|base64|basename|bash|bg|bind|blkid|break|brew|brotli|builtin|bunzip|bunzip2|caller|cargo|case|cat|catdoc|cd|chmod|chown|circleci|clear|cmp|command|compgen|complete|continue|cp|cryptsetup|curl|curl|cut|cygstart|dde-open|defaults|diff|dirname|dirs|disown|do|docker|done|done|dpkg-trigger|dpkg|du|echo|egrep|elif|else|emulate|enable|enlightenment_open|esac|eval|eval_gettext|exec|exit|expr|false|fc|fg|fi|find|for|free|function|fzf|g\+\+|gatsby|gcc|gcloud|gdbus|getopts|gio|git|gnome-open|grep|grub-mount|gs|gulp|gvfs-open|gzip|hash|head|help|hexdump|history|identity|if|ifconfig|in|install-plugin|install|ip|jobs|jq|kbd_mode|kde-open|kdialog|kfmclient|kill|killall|less|let|lha|ln|loadkeys|local|logout|ls|ls|lunzip|lzip|lzma|makepkg|miniunz|miniunzip|mkdir|mktemp|mount|mpicc|mv|node|npm|npx|open|pacman|pcmanfm|pdftotext|pkg|plutil|pnpm|popd|prezip-bin|printf|println|ps|pushd|pwd|python3|rar|read|readlink|readonly|return|rm|route|rpm|rsync|sed|set|setfont|sh|sha256sum|shift|shopt|sleep|snap|sort|source|sponge|start-stop-daemon|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|update-alternatives|vim|wait|wc|wget|which|while|wp|xargs|xprop|xz|yarn|yum|zenity|zip|zoo|zsh|zstd)\b/
+  /^(?:7z|7za|7zr|alias|anacron|apk|apt-get|ar|asciidoctor|awk|base64|basename|bash|bg|bind|blkid|break|brew|brotli|builtin|bunzip|bunzip2|caller|cargo|case|cat|catdoc|cd|chmod|chown|circleci|clear|cmp|command|compgen|complete|continue|cp|cryptsetup|curl|curl|cut|cygstart|dde-open|defaults|deno|diff|dirname|dirs|disown|do|docker|done|done|dpkg-trigger|dpkg|du|echo|egrep|elif|else|emulate|enable|enlightenment_open|esac|eval|eval_gettext|exec|exit|expr|false|fc|fg|fi|find|for|free|function|fuzzponent|fzf|g\+\+|gatsby|gcc|gcloud|gdbus|getopts|gio|git|gnome-open|google-chrome-beta|google-chrome|grep|groupadd|grub-mount|gs|gulp|gvfs-open|gzip|hash|hdiutil|head|help|hexdump|history|identity|if|ifconfig|in|install-plugin|install|ip|jobs|jq|kbd_mode|kde-open|kdialog|kfmclient|kill|killall|ldconfig|less|let|lha|ln|loadkeys|local|logout|ls|ls|lunzip|lzip|lzma|makepkg|miniunz|miniunzip|mkdir|mktemp|mount|mpicc|mv|node|nohup|npm|npx|open|pacman|pcmanfm|pdftotext|pkg|plutil|pnpm|popd|prezip-bin|printf|println|ps|pushd|pwd|python3|rar|read|readlink|readonly|realpath|return|rm|route|rpm|rsync|sed|set|setfont|sh|sha256sum|shift|shopt|sleep|snap|sort|source|sponge|start-stop-daemon|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|update-alternatives|update-desktop-database|update-mime-database|useradd|vim|wait|wc|wget|which|while|wp|xargs|xprop|xz|yarn|yum|zenity|zip|zoo|zsh|zstd)\b/
 const RE_VARIABLE_NAME = /^[a-zA-Z\_\/\-\$][a-zA-Z\_\/\-\$#\d\-]*/
 const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\!\|\+\&\>\)]/
 const RE_NUMERIC = /^\d+(?=\s|$)/
@@ -87,6 +89,7 @@ export const initialLineState = {
   tokens: [],
   knownFunctionNames: new Set(),
   stringEnd: '',
+  stack: [],
 }
 
 /**
@@ -112,6 +115,7 @@ export const tokenizeLine = (line, lineState) => {
   let token = TokenType.None
   let state = lineState.state
   let stringEnd = lineState.stringEnd
+  const stack = [...lineState.stack]
   const knownFunctionNames = new Set(lineState.knownFunctionNames)
   while (index < line.length) {
     const part = line.slice(index)
@@ -182,6 +186,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'cygstart':
             case 'dde-open':
             case 'defaults':
+            case 'deno':
             case 'diff':
             case 'dirname':
             case 'dirs':
@@ -204,6 +209,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'fg':
             case 'find':
             case 'free':
+            case 'fuzzponent':
             case 'fzf':
             case 'g++':
             case 'gatsby':
@@ -214,13 +220,17 @@ export const tokenizeLine = (line, lineState) => {
             case 'gio':
             case 'git':
             case 'gnome-open':
+            case 'google-chrome':
+            case 'google-chrome-beta':
             case 'grep':
+            case 'groupadd':
             case 'grub-mount':
             case 'gs':
             case 'gulp':
             case 'gvfs-open':
             case 'gzip':
             case 'hash':
+            case 'hdiutil':
             case 'head':
             case 'help':
             case 'hexdump':
@@ -231,12 +241,14 @@ export const tokenizeLine = (line, lineState) => {
             case 'install-plugin':
             case 'ip':
             case 'jobs':
+            case 'jq':
             case 'kbd_mode':
             case 'kde-open':
             case 'kdialog':
             case 'kfmclient':
             case 'kill':
             case 'killall':
+            case 'ldconfig':
             case 'less':
             case 'lha':
             case 'ln':
@@ -256,6 +268,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'mpicc':
             case 'mv':
             case 'node':
+            case 'nohup':
             case 'npm':
             case 'npx':
             case 'open':
@@ -276,6 +289,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'rar':
             case 'read':
             case 'readlink':
+            case 'realpath':
             case 'rm':
             case 'route':
             case 'rpm':
@@ -291,6 +305,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'snap':
             case 'sort':
             case 'source':
+            case 'sponge':
             case 'start-stop-daemon':
             case 'stty':
             case 'sudo':
@@ -319,6 +334,9 @@ export const tokenizeLine = (line, lineState) => {
             case 'unzip':
             case 'unzoo':
             case 'update-alternatives':
+            case 'update-desktop-database':
+            case 'update-mime-database':
+            case 'useradd':
             case 'vim':
             case 'wait':
             case 'wc':
@@ -335,9 +353,8 @@ export const tokenizeLine = (line, lineState) => {
             case 'zoo':
             case 'zsh':
             case 'zstd':
-            case 'jq':
-            case 'sponge':
               token = TokenType.Function
+              state = State.AfterFunctionName
               break
             case 'true':
             case 'false':
@@ -401,7 +418,7 @@ export const tokenizeLine = (line, lineState) => {
       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.InsideDoubleQuoteString
@@ -418,7 +435,7 @@ export const tokenizeLine = (line, lineState) => {
       case State.InsideSingleQuoteString:
         if ((next = part.match(RE_QUOTE_SINGLE))) {
           token = TokenType.PunctuationString
-          state = State.TopLevelContent
+          state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_STRING_SINGLE_QUOTE_CONTENT))) {
           token = TokenType.String
           state = State.InsideSingleQuoteString
@@ -466,6 +483,55 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterFunctionName:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterFunctionName
+        } 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.AfterFunctionName
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          if (knownFunctionNames.has(next[0])) {
+            token = TokenType.Function
+          } else {
+            token = TokenType.VariableName
+          }
+          state = State.AfterFunctionName
+        } else if ((next = part.match(RE_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.AfterFunctionName
+        } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          token = TokenType.PunctuationString
+          state = State.InsideDoubleQuoteString
+          stack.push(State.AfterFunctionName)
+        } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+          stack.push(State.AfterFunctionName)
+        } 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_ESCAPED))) {
+          token = TokenType.Text
+          state = State.AfterFunctionName
+        } else if ((next = part.match(RE_ANYTHING_SHORT))) {
+          token = TokenType.Text
+          state = State.AfterFunctionName
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.AfterFunctionName
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
       default:
         throw new Error('no')
     }
@@ -473,10 +539,14 @@ export const tokenizeLine = (line, lineState) => {
     index += tokenLength
     tokens.push(token, tokenLength)
   }
+  if (state === State.AfterFunctionName) {
+    state = State.TopLevelContent
+  }
   return {
     state,
     tokens,
     knownFunctionNames,
     stringEnd,
+    stack,
   }
 }

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

@@ -92,6 +92,10 @@
       "name": "CssSelector",
       "foreground": "#D19A66"
     },
+    {
+      "name": "CssSelectorId",
+      "foreground": "#61AFEF"
+    },
     {
       "name": "CssPropertyName",
       "foreground": "#ABB2BF"

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

@@ -196,6 +196,14 @@
     {
       "name": "MarkdownLinkUrl",
       "foreground": "#55B4D4"
+    },
+    {
+      "name": "KeywordAsync",
+      "foreground": "#FA8D3E"
+    },
+    {
+      "name": "KeywordAwait",
+      "foreground": "#FA8D3E"
     }
   ]
 }

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

@@ -179,6 +179,18 @@
     {
       "name": "KeywordNew",
       "foreground": "#FF9D00"
+    },
+    {
+      "name": "CssVariableName",
+      "foreground": "#9effff"
+    },
+    {
+      "name": "KeywordAsync",
+      "foreground": "#FFC600"
+    },
+    {
+      "name": "KeywordAwait",
+      "foreground": "#FF9D00"
     }
   ]
 }

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

@@ -194,6 +194,14 @@
       "name": "KeywordModifier",
       "foreground": "#AB9B67"
     },
+    {
+      "name": "KeywordAsync",
+      "foreground": "#AB9B67"
+    },
+    {
+      "name": "KeywordAwait",
+      "foreground": "#C5A46F"
+    },
     {
       "name": "Class",
       "foreground": "#E6CE64"

package/package.json

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