@lvce-editor/shared-process 0.4.0 → 0.4.1

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

@@ -1,4 +1,4 @@
-# Language Basics CSS
+# Language Basics Css
 
 ## Contributing
 

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

@@ -104,12 +104,19 @@ export const initialLineState = {
   stack: [],
 }
 
+/**
+ * @param {any} lineStateA
+ * @param {any} lineStateB
+ */
 export const isEqualLineState = (lineStateA, lineStateB) => {
   return lineStateA.state === lineStateB.state
 }
 
+export const hasArrayReturn = true
+
 /**
  * @param {string} line
+ * @param {any} lineState
  */
 export const tokenizeLine = (line, lineState) => {
   let next = null
@@ -349,11 +356,9 @@ export const tokenizeLine = (line, lineState) => {
         console.log({ state, line })
         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-desktop/src/tokenizeDesktop.js

@@ -1,33 +1,122 @@
+/**
+ * @enum number
+ */
+export const State = {
+  TopLevelContent: 1,
+  InsideLineComment: 2,
+}
+
+export const StateMap = {
+  [State.TopLevelContent]: 'TopLevelContent',
+  [State.InsideLineComment]: 'InsideLineComment',
+}
+
 /**
  * @enum number
  */
 export const TokenType = {
-  Text: 0,
-  NewLine: 1,
+  CssSelector: 1,
+  Whitespace: 2,
+  None: 57,
+  Unknown: 881,
+  NewLine: 884,
+  Comment: 885,
+  Query: 886,
+  Text: 887,
 }
 
 export const TokenMap = {
+  [TokenType.CssSelector]: 'CssSelector',
+  [TokenType.Whitespace]: 'Whitespace',
+  [TokenType.None]: 'None',
+  [TokenType.Unknown]: 'Unknown',
+  [TokenType.NewLine]: 'NewLine',
+  [TokenType.Comment]: 'Comment',
+  [TokenType.Query]: 'Query',
   [TokenType.Text]: 'Text',
 }
 
+const RE_LINE_COMMENT_START = /^#/
+const RE_WHITESPACE = /^ +/
+const RE_CURLY_OPEN = /^\{/
+const RE_CURLY_CLOSE = /^\}/
+const RE_PROPERTY_NAME = /^[a-zA-Z\-]+\b/
+const RE_COLON = /^:/
+const RE_PROPERTY_VALUE = /^[^;\}]+/
+const RE_SEMICOLON = /^;/
+const RE_COMMA = /^,/
+const RE_ANYTHING = /^.*/
+const RE_NUMERIC = /^(([0-9]+\.?[0-9]*)|(\.[0-9]+))/
+const RE_ANYTHING_UNTIL_CLOSE_BRACE = /^[^\}]+/
+const RE_BLOCK_COMMENT_START = /^\/\*/
+const RE_BLOCK_COMMENT_END = /^\*\//
+const RE_BLOCK_COMMENT_CONTENT = /^.+?(?=\*\/|$)/s
+const RE_ROUND_OPEN = /^\(/
+const RE_ROUND_CLOSE = /^\)/
+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_STAR = /^\*/
+const RE_QUERY_NAME = /^[a-z\-]+/
+const RE_QUERY_CONTENT = /^[^\)]+/
+const RE_COMBINATOR = /^[\+\>\~]/
+
 export const initialLineState = {
-  state: 1,
+  state: State.TopLevelContent,
+  tokens: [],
+  stack: [],
 }
 
+export const hasArrayReturn = true
+
+/**
+ * @param {string} line
+ * @param {any} lineState
+ */
 export const tokenizeLine = (line, lineState) => {
-  if (line.length === 0) {
-    return {
-      state: 1,
-      tokens: [],
+  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_LINE_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideLineComment
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      case State.InsideLineComment:
+        if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
+      default:
+        console.log({ state, line })
+        throw new Error('no')
     }
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
   }
   return {
-    state: 1,
-    tokens: [
-      {
-        type: TokenType.Text,
-        length: line.length,
-      },
-    ],
+    state,
+    tokens,
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "id": "builtin.language-basics-docker",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "name": "Language Basics Docker",
   "description": "Provides syntax highlighting and bracket matching in Dockerfile files.",
   "languages": [

package/extensions/builtin.language-basics-docker/src/tokenizeDockerfile.js

@@ -44,6 +44,8 @@ const RE_ANYTHING = /^.*/
 const RE_KEYWORD =
   /^(?:ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\b/
 
+export const hasArrayReturnValue = true
+
 /**
  * @param {string} line
  * @param {any} lineState

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

@@ -98,6 +98,8 @@ export const isLineStateEqual = (lineStateA, lineStateB) => {
   return lineStateA.state === lineStateB.state
 }
 
+export const hasArrayReturn = true
+
 /**
  *
  * @param {string} line
@@ -287,11 +289,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-yaml/src/tokenizeYaml.js

@@ -6,6 +6,7 @@ export const State = {
   InsideLineComment: 2,
   AfterPropertyName: 3,
   AfterPropertyNameAfterColon: 4,
+  AfterDash: 5,
 }
 
 export const StateMap = {
@@ -45,14 +46,14 @@ export const TokenMap = {
   [TokenType.Unknown]: 'Unknown',
   [TokenType.Whitespace]: 'Whitespace',
   [TokenType.Punctuation]: 'Punctuation',
-  [TokenType.PropertyValueString]: 'PropertyValueString',
+  [TokenType.PropertyValueString]: 'String',
 }
 
 const RE_LINE_COMMENT_START = /^#/
 const RE_WHITESPACE = /^ +/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
-const RE_PROPERTY_NAME = /^[a-zA-Z\-]+(?=\s*:)/
+const RE_PROPERTY_NAME = /^[a-zA-Z\-\_]+(?=\s*:)/
 const RE_PROPERTY_VALUE = /^[^;\}]+/
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
@@ -75,6 +76,7 @@ const RE_QUERY_CONTENT = /^[^\)]+/
 const RE_COMBINATOR = /^[\+\>\~]/
 const RE_LANGUAGE_CONSTANT = /^(?:true|false)/
 const RE_COLON = /^:/
+const RE_DASH = /^\-/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -111,6 +113,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_NUMERIC))) {
           token = TokenType.Numeric
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_DASH))) {
+          token = TokenType.Punctuation
+          state = State.AfterDash
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -155,6 +160,26 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterDash:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterDash
+        } else if ((next = part.match(RE_PROPERTY_NAME))) {
+          token = TokenType.PropertyName
+          state = State.AfterPropertyName
+        } else if ((next = part.match(RE_LANGUAGE_CONSTANT))) {
+          token = TokenType.LanguageConstant
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.PropertyValueString
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
       default:
         console.log({ state, line })
         throw new Error('no')
@@ -165,10 +190,11 @@ export const tokenizeLine = (line, lineState) => {
       length: next[0].length,
     })
   }
+  if (state === State.AfterPropertyNameAfterColon) {
+    state = State.TopLevelContent
+  }
   return {
     state,
     tokens,
   }
 }
-
-tokenizeLine(`x: 11`, initialLineState) //?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -38,8 +38,8 @@
     "verror": "^1.10.1",
     "ws": "^8.8.1",
     "xdg-basedir": "^5.1.0",
-    "@lvce-editor/pty-host": "0.4.0",
-    "@lvce-editor/extension-host": "0.4.0"
+    "@lvce-editor/pty-host": "0.4.1",
+    "@lvce-editor/extension-host": "0.4.1"
   },
   "optionalDependencies": {
     "electron-clipboard-ex": "^1.3.3",