@lvce-editor/shared-process 0.15.4 → 0.15.6

package/extensions/builtin.language-basics-dart/src/tokenizeDart.js

@@ -39,6 +39,8 @@ export const initialLineState = {
   state: State.TopLevelContent,
 }
 
+export const hasArrayReturn = true
+
 const RE_KEYWORD =
   /^(?:abstract|as|assert|async|await|break|case|catch|class|const|continue|covariant|default|deferred|do|dynamic|else|enum|export|extends|extension|external|factory|false|final|finally|for|Function|get|hide|if|implements|import|in|interface|is|late|library|mixin|new|null|on|operator|part|required|rethrow|return|set|show|static|super|switch|sync|this|throw|true|try|typedef|var|void|while|with|yield)\b/
 const RE_WHITESPACE = /^\s+/
@@ -119,11 +121,9 @@ export const tokenizeLine = (line, lineState) => {
         state
         throw new Error('no')
     }
-    index += next[0].length
-    tokens.push({
-      type: token,
-      length: next[0].length,
-    })
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
   }
   return {
     state,

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

@@ -29,6 +29,7 @@ export const TokenType = {
   KeywordThis: 12,
   Class: 13,
   Comment: 14,
+  FunctionName: 885,
 }
 
 export const TokenMap = {
@@ -47,6 +48,7 @@ export const TokenMap = {
   [TokenType.KeywordThis]: 'KeywordThis',
   [TokenType.Class]: 'Class',
   [TokenType.Comment]: 'Comment',
+  [TokenType.FunctionName]: 'Function',
 }
 
 export const initialLineState = {
@@ -57,8 +59,8 @@ 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 = /^[:,;\{\}\[\]\.=\(\)>]/
+const RE_VARIABLE_NAME = /^[a-zA-Z\_\$]+/
+const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>\|\-\*\+\:\<\>]/
 const RE_QUOTE_SINGLE = /^'/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
@@ -74,6 +76,7 @@ const RE_BLOCK_COMMENT_END = /^\*\//
 const RE_CURLY_OPEN = /^\{/
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_SLASH = /^\//
+const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\())/
 
 export const hasArrayReturn = true
 
@@ -129,6 +132,9 @@ export const tokenizeLine = (line, lineState) => {
               token = TokenType.Keyword
               break
           }
+        } else if ((next = part.match(RE_FUNCTION_CALL_NAME))) {
+          token = TokenType.FunctionName
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_SLASH))) {
           if ((next = part.match(RE_BLOCK_COMMENT_START))) {
             token = TokenType.Comment

package/extensions/builtin.language-basics-julia/src/tokenizeJulia.js

@@ -52,6 +52,8 @@ export const initialLineState = {
   state: State.TopLevelContent,
 }
 
+export const hasArrayReturn = true
+
 const RE_KEYWORD =
   /^(?:baremodule|begin|break|catch|ccall|const|continue|do|else|elseif|end|export|false|finally|for|function|global|if|import|in|isa|let|local|macro|module|quote|return|true|try|using|where|while)\b/
 const RE_WHITESPACE = /^\s+/
@@ -168,19 +170,12 @@ export const tokenizeLine = (line, lineState) => {
         state
         throw new Error('no')
     }
-    index += next[0].length
-    tokens.push({
-      type: token,
-      length: next[0].length,
-    })
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
   }
   return {
     state,
     tokens,
   }
 }
-
-tokenizeLine(
-  `abs(mandelbrot(complex(x, y))) < 2 ? print("*") : print(" ")`,
-  initialLineState
-)

package/extensions/builtin.language-basics-kotlin/src/tokenizeKotlin.js

@@ -60,6 +60,8 @@ export const initialLineState = {
   tokens: [],
 }
 
+export const hasArrayReturn = true
+
 export const isEqualLineState = (lineStateA, lineStateB) => {
   return lineStateA.state === lineStateB.state
 }
@@ -114,11 +116,9 @@ export const tokenizeLine = (line, lineState) => {
       default:
         throw new Error('no')
     }
-    index += next[0].length
-    tokens.push({
-      type: token,
-      length: next[0].length,
-    })
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
   }
   return {
     state,

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

@@ -15,6 +15,9 @@ const State = {
   None: 11,
   InsideDoubleQuoteString: 12,
   InsideSingleQuoteString: 13,
+  InsideScriptContent: 14,
+  InsideStyleContent: 15,
+  InsideStartTagBeforeAngleBracket: 16,
 }
 
 export const StateMap = {}
@@ -36,6 +39,7 @@ export const TokenType = {
   Error: 141,
   PunctuationString: 11,
   NewLine: 891,
+  Embedded: 999,
 }
 
 export const TokenMap = {
@@ -51,6 +55,7 @@ export const TokenMap = {
   [TokenType.Punctuation]: 'Punctuation',
   [TokenType.Error]: 'Error',
   [TokenType.PunctuationString]: 'PunctuationString',
+  [TokenType.Embedded]: 'Embedded',
 }
 
 const RE_ANGLE_BRACKET_CLOSE = /^>/
@@ -85,9 +90,20 @@ const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
 const RE_WORD = /^[^\s]+/
 const RE_ATTRIBUTE_VALUE_UNQUOTED = /^[^<>]+/
+const RE_SCRIPT_CONTENT = /^..*?(?=(?:<\/script)|$)/s
+const RE_SCRIPT_CONTENT_END = /^<\/script/
+const RE_STYLE_CONTENT = /^..*?(?=(?:<\/(?:style|head))|$)/s
+const RE_STYLE_CONTENT_END = /^<\/style/
+const RE_STYLE_CONTENT_END_2 = /^<\/head/
 
 export const initialLineState = {
   state: State.TopLevelContent,
+  tag: '',
+  stack: [],
+  embeddedLanguage: '',
+  embeddedLanguageStart: 0,
+  embeddedLanguageEnd: 0,
+  embeddedState: undefined,
 }
 
 /**
@@ -102,6 +118,44 @@ export const isLineStateEqual = (lineStateA, lineStateB) => {
 
 export const hasArrayReturn = true
 
+const getEmbeddedScriptLanguageId = () => {
+  return 'javascript'
+}
+
+const getEmbeddedStyleLanguageId = () => {
+  return 'css'
+}
+
+/**
+ * @param {string} tag
+ */
+const getEmbeddedLangageId = (tag) => {
+  switch (tag) {
+    case 'script':
+      return getEmbeddedScriptLanguageId()
+    case 'style':
+      return getEmbeddedStyleLanguageId()
+    default:
+      return ''
+  }
+}
+
+/**
+ *
+ * @param {string} tag
+ * @returns
+ */
+const getEmbeddedContentState = (tag) => {
+  switch (tag) {
+    case 'script':
+      return State.InsideScriptContent
+    case 'style':
+      return State.InsideStyleContent
+    default:
+      return State.TopLevelContent
+  }
+}
+
 /**
  *
  * @param {string} line
@@ -114,6 +168,10 @@ export const tokenizeLine = (line, lineState) => {
   let tokens = []
   let token = TokenType.None
   let state = lineState.state
+  let tag = lineState.tag
+  let embeddedLanguage = lineState.embeddedLanguage
+  let embeddedLanguageStart = lineState.embeddedLanguageStart
+  let embeddedLanguageEnd = lineState.embeddedLanguageEnd
   while (index < line.length) {
     const part = line.slice(index)
     switch (state) {
@@ -139,6 +197,7 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_TAGNAME))) {
           token = TokenType.TagName
           state = State.InsideOpeningTag
+          tag = next[0]
         } else if ((next = part.match(RE_SLASH))) {
           token = TokenType.PunctuationTag
           state = State.AfterClosingTagAngleBrackets
@@ -157,6 +216,12 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          if (embeddedLanguageId) {
+            state = getEmbeddedContentState(tag)
+            embeddedLanguage = embeddedLanguageId
+            embeddedLanguageStart = index + next[0].length
+          }
         } else if ((next = part.match(RE_EXCLAMATION_MARK))) {
           token = TokenType.PunctuationTag
           state = State.InsideOpeningTag
@@ -207,6 +272,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          if (embeddedLanguageId) {
+            state = getEmbeddedContentState(tag)
+            embeddedLanguage = embeddedLanguageId
+            embeddedLanguageStart = index + next[0].length
+          }
         } else if ((next = part.match(RE_TAG_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -219,6 +290,12 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          if (embeddedLanguageId) {
+            state = getEmbeddedContentState(tag)
+            embeddedLanguage = embeddedLanguageId
+            embeddedLanguageStart = index + next[0].length
+          }
         } else if ((next = part.match(RE_EQUAL_SIGN))) {
           token = TokenType.Punctuation
           state = State.AfterAttributeEqualSign
@@ -295,6 +372,43 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.InsideScriptContent:
+        if ((next = part.match(RE_SCRIPT_CONTENT_END))) {
+          token = TokenType.TagName
+          state = State.AfterClosingTagName
+          tokens.push(TokenType.PunctuationTag, 2, TokenType.TagName, 6)
+          index += next[0].length
+          embeddedLanguage = ''
+          continue
+        } else if ((next = part.match(RE_SCRIPT_CONTENT))) {
+          token = TokenType.Embedded
+          state = State.InsideScriptContent
+          embeddedLanguageStart = index
+          embeddedLanguageEnd = index + next[0].length
+        } else {
+          part
+          throw new Error('no')
+        }
+        break
+      case State.InsideStyleContent:
+        if ((next = part.match(RE_STYLE_CONTENT_END) || part.match(RE_STYLE_CONTENT_END_2))) {
+          token = TokenType.TagName
+          state = State.AfterClosingTagName
+          tokens.push(TokenType.PunctuationTag, 2, TokenType.TagName, next[0].length - 1)
+          embeddedLanguageEnd = index
+          index += next[0].length
+          embeddedLanguage = ''
+          continue
+        } else if ((next = part.match(RE_STYLE_CONTENT))) {
+          token = TokenType.Embedded
+          state = State.InsideStyleContent
+          embeddedLanguageStart = index
+          embeddedLanguageEnd = index + next[0].length
+        } else {
+          part
+          throw new Error('no')
+        }
+        break
       default:
         state
         throw new Error('no')
@@ -306,5 +420,9 @@ export const tokenizeLine = (line, lineState) => {
   return {
     state,
     tokens,
+    tag,
+    embeddedLanguage,
+    embeddedLanguageStart,
+    embeddedLanguageEnd,
   }
 }

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

@@ -94,6 +94,10 @@
       "name": "CssSelector",
       "foreground": "#BEB558"
     },
+    {
+      "name": "CssSelectorClass",
+      "foreground": "#B8CA9C"
+    },
     {
       "name": "CssSelectorId",
       "foreground": "#BE7C81"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.15.4",
+  "version": "0.15.6",
   "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.4",
-    "@lvce-editor/extension-host-helper-process": "0.15.4",
-    "@lvce-editor/pty-host": "0.15.4",
+    "@lvce-editor/extension-host": "0.15.6",
+    "@lvce-editor/extension-host-helper-process": "0.15.6",
+    "@lvce-editor/pty-host": "0.15.6",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",