@lvce-editor/shared-process 0.14.4 → 0.14.6

package/extensions/builtin.language-basics-coffeescript/src/tokenizeCoffeeScript.js

@@ -60,7 +60,7 @@ export const TokenMap = {
 const RE_LINE_COMMENT = /^#[^\n]*/
 const RE_WHITESPACE = /^\s+/
 const RE_VARIABLE_NAME = /^[\@a-zA-Z\_\$][a-zA-Z\_\/\-\$#\d\-]*/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\!\|\+\&\>\)\?]/
+const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)<>\!\|\+\&\>\)\?\-]/
 const RE_NUMERIC =
   /^((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b/
 const RE_STRING_ESCAPE = /^\\./

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

@@ -88,7 +88,7 @@ const RE_SELECTOR_ID = /^#[\w\-\_]+/
 const RE_WHITESPACE = /^\s+/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
-const RE_PROPERTY_NAME = /^[a-zA-Z\-\w]+\b/
+const RE_PROPERTY_NAME = /^[a-zA-Z\-\w]+/
 const RE_COLON = /^:/
 const RE_PROPERTY_VALUE = /^[^;\}]+/
 const RE_PROPERTY_VALUE_SHORT = /^[^;\}\s\)]+/
@@ -329,6 +329,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterPropertyName
+        } else if ((next = part.match(RE_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.AfterPropertyNameAfterColon
         } else if ((next = part.match(RE_ANYTHING_UNTIL_CLOSE_BRACE))) {
           token = TokenType.Unknown
           state = State.InsideSelector

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

@@ -6,21 +6,29 @@ const State = {
   TopLevelContent: 1,
   InsideSingleQuoteString: 2,
   InsideDoubleQuoteString: 3,
+  AfterKeywordClass: 4,
+  InsideBlockComment: 5,
 }
 
 /**
  * @enum number
  */
 export const TokenType = {
-  None: 99999999,
-  Keyword: 951,
   Whitespace: 0,
-  NewLine: 771,
-  VariableName: 2,
-  Punctuation: 3,
-  String: 4,
-  Numeric: 5,
-  Attribute: 6,
+  None: 1,
+  Keyword: 2,
+  NewLine: 3,
+  VariableName: 4,
+  Punctuation: 5,
+  String: 6,
+  Numeric: 7,
+  Attribute: 8,
+  KeywordControl: 9,
+  KeywordReturn: 10,
+  KeywordNew: 11,
+  KeywordThis: 12,
+  Class: 13,
+  Comment: 14,
 }
 
 export const TokenMap = {
@@ -33,6 +41,12 @@ export const TokenMap = {
   [TokenType.String]: 'String',
   [TokenType.Numeric]: 'Numeric',
   [TokenType.Attribute]: 'Attribute',
+  [TokenType.KeywordControl]: 'KeywordControl',
+  [TokenType.KeywordReturn]: 'KeywordReturn',
+  [TokenType.KeywordNew]: 'KeywordNew',
+  [TokenType.KeywordThis]: 'KeywordThis',
+  [TokenType.Class]: 'Class',
+  [TokenType.Comment]: 'Comment',
 }
 
 export const initialLineState = {
@@ -41,6 +55,7 @@ export const initialLineState = {
 
 const RE_KEYWORD =
   /^(?:_|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|try|void|volatile|while)\b/
+
 const RE_WHITESPACE = /^\s+/
 const RE_VARIABLE_NAME = /^[a-zA-Z]+/
 const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>]/
@@ -51,7 +66,14 @@ const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_NUMERIC = /^\d+/
 const RE_TRIPLE_DOUBLE_QUOTE = /^"""/
 const RE_STRING_TRIPLE_CONTENT = /^.+?(?="""|$)/s
+const RE_LINE_COMMENT = /^\/\/[^\n]*/
 const RE_ATTRIBUTE = /^@\w+/
+const RE_BLOCK_COMMENT_START = /^\/\*/
+const RE_BLOCK_COMMENT_CONTENT = /^.+?(?=\*\/)/
+const RE_BLOCK_COMMENT_END = /^\*\//
+const RE_CURLY_OPEN = /^\{/
+const RE_ANYTHING_UNTIL_END = /^.+/s
+const RE_SLASH = /^\//
 
 export const hasArrayReturn = true
 
@@ -73,8 +95,52 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_KEYWORD))) {
-          token = TokenType.Keyword
-          state = State.TopLevelContent
+          switch (next[0]) {
+            case '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
+              break
+            case 'return':
+              token = TokenType.KeywordReturn
+              break
+            case 'new':
+              token = TokenType.KeywordNew
+              break
+            case 'this':
+              token = TokenType.KeywordThis
+              break
+            case 'class':
+              token = TokenType.Keyword
+              state = State.AfterKeywordClass
+              break
+            default:
+              token = TokenType.Keyword
+              break
+          }
+        } else if ((next = part.match(RE_SLASH))) {
+          if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+            token = TokenType.Comment
+            state = State.InsideBlockComment
+          } else if ((next = part.match(RE_LINE_COMMENT))) {
+            token = TokenType.Comment
+            state = State.TopLevelContent
+          } else {
+            next = part.match(RE_SLASH)
+            token = TokenType.Punctuation
+            state = State.TopLevelContent
+          }
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.TopLevelContent
@@ -120,6 +186,40 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterKeywordClass:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordClass
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Class
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_CURLY_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.InsideBlockComment:
+        if ((next = part.match(RE_BLOCK_COMMENT_END))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_CONTENT))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_ANYTHING_UNTIL_END))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else {
+          throw new Error('no')
+        }
+        break
       default:
         state
         throw new Error('no')

package/extensions/builtin.language-basics-ruby/src/tokenizeRuby.js

@@ -31,6 +31,7 @@ export const TokenType = {
   KeywordReturn: 12,
   Regex: 13,
   KeywordImport: 14,
+  FunctionName: 15,
 }
 
 export const TokenMap = {
@@ -48,6 +49,7 @@ export const TokenMap = {
   [TokenType.KeywordReturn]: 'KeywordReturn',
   [TokenType.Regex]: 'Regex',
   [TokenType.KeywordImport]: 'KeywordImport',
+  [TokenType.FunctionName]: 'Function',
 }
 
 const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>]+/
@@ -78,6 +80,7 @@ const RE_EOF_CONTENT = /.*/s
 // const RE_REGEX = /^\/.+/
 const RE_REGEX = /^\/.*\//
 const RE_STRING_ESCAPE = /^\\./
+const RE_FUNCTION_CALL_NAME = /^[\w]+(?=(\s+(\"|\w|\-))|\(|!)/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -121,6 +124,7 @@ export const tokenizeLine = (line, lineState) => {
             case 'then':
             case 'while':
             case 'end':
+            case 'def':
             case 'begin':
             case 'rescue':
             case 'unless':
@@ -146,6 +150,9 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.InsideEof
           stringEnd = next[1]
+        } else if ((next = part.match(RE_FUNCTION_CALL_NAME))) {
+          token = TokenType.FunctionName
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_REGEX))) {
           token = TokenType.Regex
           state = State.TopLevelContent

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

@@ -9,7 +9,10 @@
     "BadgeForeground": "rgb(215, 218, 224)",
 
     "CompletionListBackground": "#21252b",
+    "CompletionListForeground": "#abb2bf",
+    "CompletionListBorder": "transparent",
     "CompletionListItemActiveBackground": "#2c313a",
+    "CompletionListItemActiveForeground": "#d7dae0",
 
     "ContextMenuBackground": "rgb(53, 59, 69)",
 

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

@@ -11,6 +11,7 @@
     "CompletionListBackground": "#15232d",
     "CompletionListItemActiveBackground": "#193549",
     "CompletionListItemHoverBackground": "#193549",
+    "CompletionListItemActiveForeground": "#aaaaaa",
     "CompletionListBorder": "#15232d",
 
     "ContextMenuBackground": "#122738",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.14.4",
+  "version": "0.14.6",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -16,17 +16,17 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.18.6",
-    "@lvce-editor/extension-host": "0.14.4",
-    "@lvce-editor/extension-host-helper-process": "0.14.4",
-    "@lvce-editor/pty-host": "0.14.4",
+    "@babel/code-frame": "^7.21.4",
+    "@lvce-editor/extension-host": "0.14.6",
+    "@lvce-editor/extension-host-helper-process": "0.14.6",
+    "@lvce-editor/pty-host": "0.14.6",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",
     "got": "^12.6.0",
     "is-object": "^1.0.2",
     "lines-and-columns": "^2.0.3",
-    "open": "^9.0.0",
+    "open": "^9.1.0",
     "p-queue": "^7.3.4",
     "parse-json": "^6.0.2",
     "symlink-dir": "^5.1.1",