@lvce-editor/shared-process 0.4.1 → 0.4.3

package/config/defaultKeyBindings.json

@@ -343,7 +343,7 @@
   },
   {
     "key": "Space",
-    "command": "Explorer.handleClickCurrent",
+    "command": "Explorer.handleClickCurrentButKeepFocus",
     "when": "focus.Explorer"
   },
   {

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

@@ -0,0 +1,14 @@
+# Language Basics Gitattributes
+
+## Contributing
+
+```sh
+git clone git@github.com:lvce-editor/language-basics-gitattributes.git &&
+cd language-basics-gitattributes &&
+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-gitattributes)

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

@@ -0,0 +1,12 @@
+{
+  "id": "builtin.language-basics-gitattributes",
+  "name": "Language Basics Gitattributes",
+  "description": "Provides syntax highlighting and bracket matching in gitattributes files.",
+  "languages": [
+    {
+      "id": "gitattributes",
+      "extensions": [".gitattributes"],
+      "tokenize": "src/tokenizeGitAttributes.js"
+    }
+  ]
+}

package/extensions/builtin.language-basics-gitattributes/src/tokenizeGitAttributes.js

@@ -0,0 +1,132 @@
+/**
+ * @enum number
+ */
+export const State = {
+  TopLevelContent: 1,
+  InsideLineComment: 2,
+  AfterPropertyName: 3,
+}
+
+/**
+ * @enum number
+ */
+export const TokenType = {
+  Comment: 885,
+  LanguageConstant: 11,
+  NewLine: 884,
+  None: 57,
+  Numeric: 15,
+  PropertyName: 12,
+  PropertyValueString: 14,
+  Punctuation: 13,
+  Query: 886,
+  Text: 887,
+  Unknown: 881,
+  Whitespace: 2,
+}
+
+export const TokenMap = {
+  [TokenType.Text]: 'Text',
+  [TokenType.Comment]: 'Comment',
+}
+
+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]+\b(?=\s*:)/
+const RE_PROPERTY_VALUE = /^[^;\}]+/
+const RE_SEMICOLON = /^;/
+const RE_COMMA = /^,/
+const RE_ANYTHING = /^.*/
+const RE_ANYTHING_BUT_COMMENT = /^[^#]+/
+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 = /^[\+\>\~]/
+const RE_LANGUAGE_CONSTANT = /^(?:true|false)/
+const RE_COLON = /^:/
+const RE_DASH = /^\-/
+const RE_WORDS = /^[\w\s]*\w/
+
+export const initialLineState = {
+  state: 1,
+  tokens: [],
+}
+
+export const hasArrayReturn = true
+
+/**
+ * @param {string} line
+ * @param {any} lineState
+ */
+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_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 {
+          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
+      case State.AfterPropertyName:
+        if ((next = part.match(RE_COLON))) {
+          token = TokenType.Punctuation
+          state = State.AfterPropertyNameAfterColon
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterPropertyName
+        } 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)
+  }
+  if (state === State.AfterPropertyNameAfterColon) {
+    state = State.TopLevelContent
+  }
+  return {
+    state,
+    tokens,
+  }
+}

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

@@ -53,7 +53,7 @@ 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\-\_\d\s]+\b(?=\s*:)/
 const RE_PROPERTY_VALUE = /^[^;\}]+/
 const RE_SEMICOLON = /^;/
 const RE_COMMA = /^,/
@@ -84,6 +84,8 @@ export const initialLineState = {
   stack: [],
 }
 
+export const hasArrayReturn = true
+
 /**
  * @param {string} line
  * @param {any} lineState
@@ -107,15 +109,15 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_LANGUAGE_CONSTANT))) {
           token = TokenType.LanguageConstant
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_DASH))) {
+          token = TokenType.Punctuation
+          state = State.AfterDash
         } else if ((next = part.match(RE_PROPERTY_NAME))) {
           token = TokenType.PropertyName
           state = State.AfterPropertyName
         } 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
@@ -184,11 +186,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 length = next[0].length
+    index += length
+    tokens.push(token, length)
   }
   if (state === State.AfterPropertyNameAfterColon) {
     state = State.TopLevelContent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "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.1",
-    "@lvce-editor/extension-host": "0.4.1"
+    "@lvce-editor/pty-host": "0.4.3",
+    "@lvce-editor/extension-host": "0.4.3"
   },
   "optionalDependencies": {
     "electron-clipboard-ex": "^1.3.3",

package/src/parts/Platform/Platform.js

@@ -92,7 +92,7 @@ export const getRecentlyOpenedPath = () => {
 }
 
 export const getDefaultSettingsPath = () => {
-  return Path.join(appDir, 'static', 'config', 'defaultSettings.json')
+  return Path.join(Root.root, 'config', 'defaultSettings.json')
 }
 
 export const setEnvironmentVariables = (variables) => {