@lvce-editor/shared-process 0.8.0 → 0.8.2

package/config/defaultKeyBindings.json

@@ -307,6 +307,16 @@
     "command": "Extensions.focusNext",
     "when": "focus.Extensions"
   },
+  {
+    "key": "Space",
+    "command": "Extensions.handleClickCurrentButKeepFocus",
+    "when": "focus.Extensions"
+  },
+  {
+    "key": "Enter",
+    "command": "Extensions.handleClickCurrent",
+    "when": "focus.Extensions"
+  },
   {
     "key": "ctrl+Space",
     "command": "Extensions.toggleSuggest",

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

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

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

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

package/extensions/builtin.language-basics-graphql/src/tokenizeGraphql.js

@@ -0,0 +1,28 @@
+/**
+ * @enum number
+ */
+export const TokenType = {
+  Text: 1,
+}
+
+export const TokenMap = {
+  [TokenType.Text]: 'Text',
+}
+
+export const initialLineState = {
+  state: 1,
+  tokens: [],
+}
+
+export const hasArrayReturn = true
+
+/**
+ * @param {string} line
+ */
+export const tokenizeLine = (line) => {
+  const tokens = [TokenType.Text, line.length]
+  return {
+    state: 1,
+    tokens,
+  }
+}

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

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

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

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

package/extensions/builtin.language-basics-r/src/tokenizeR.js

@@ -0,0 +1,71 @@
+/**
+ * @enum number
+ */
+export const State = {
+  TopLevelContent: 1,
+  InsideString: 2,
+  InsideLineComment: 3,
+}
+
+/**
+ * @enum number
+ */
+export const TokenType = {
+  None: 0,
+  Text: 1,
+  Function: 2,
+}
+
+export const TokenMap = {
+  [TokenType.Text]: 'Text',
+  [TokenType.Function]: 'Function',
+}
+
+export const initialLineState = {
+  state: State.TopLevelContent,
+  tokens: [],
+}
+
+export const hasArrayReturn = true
+
+const RE_BUILTIN_FUNCTION =
+  /^(?:abbreviate|abline|abs|acf2AR|acos|acosh|addmargins|addNA|addTaskCallback|addNextMethod|addNextCallback|adist|adjustcolor|aggregate|agrep|agrepl|alarm|alist|all\.equal|all|allGenerics|approx|approxfun|apropos|aregexc|argsAnywhere|arrows|as\.data\.frame|as\.Date|as\.double|as\.factor|as\.name|as\.numeric|as\.ordered|as\.single|assocplot|attach|attr|attributes|ave|axis|barplot|body|box|boxplot|browser|call|classLabel|classMetaName|className|completeSubclasses|doPrimitiveMethod|emptyMethodsList)\b/
+const RE_ANYTHING = /^.+/s
+
+/**
+ * @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_BUILTIN_FUNCTION))) {
+          token = TokenType.Function
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
+        } else {
+          part //?
+          throw new Error('no')
+        }
+        break
+      default:
+        throw new Error('no')
+    }
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
+  }
+  return {
+    state,
+    tokens,
+  }
+}

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

@@ -40,7 +40,7 @@ export const TokenMap = {
   [TokenType.Text]: 'Text',
 }
 
-const RE_LINE_COMMENT_START = /^#/
+const RE_LINE_COMMENT = /^#.*/s
 const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>]+/
 const RE_WHITESPACE = /^ +/
 const RE_CURLY_OPEN = /^\{/
@@ -110,9 +110,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
           token = TokenType.PunctuationString
           state = State.InsideString
-        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
-          state = State.InsideLineComment
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -132,14 +132,6 @@ export const tokenizeLine = (line, lineState) => {
           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:
         throw new Error('no')
     }
@@ -147,9 +139,6 @@ export const tokenizeLine = (line, lineState) => {
     index += tokenLength
     tokens.push(token, tokenLength)
   }
-  if (state === State.InsideLineComment) {
-    state = State.TopLevelContent
-  }
   return {
     state,
     tokens,

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

@@ -6,15 +6,8 @@
   "languages": [
     {
       "id": "toml",
-      "extensions": [
-        ".toml",
-        ".tml",
-        ".replit"
-      ],
-      "fileNames": [
-        "Cargo.lock",
-        "Gopkg.lock"
-      ],
+      "extensions": [".toml", ".tml", ".replit"],
+      "fileNames": ["Cargo.lock", "Gopkg.lock"],
       "tokenize": "src/tokenizeToml.js"
     }
   ]

package/extensions/builtin.language-basics-toml/src/tokenizeToml.js

@@ -3,7 +3,6 @@
  */
 export const State = {
   TopLevelContent: 1,
-  InsideLineComment: 2,
   AfterPropertyName: 3,
   AfterPropertyNameAfterEqualSign: 4,
   InsideString: 5,
@@ -11,7 +10,6 @@ export const State = {
 
 export const StateMap = {
   [State.TopLevelContent]: 'TopLevelContent',
-  [State.InsideLineComment]: 'InsideLineComment',
 }
 
 /**
@@ -53,7 +51,7 @@ export const TokenMap = {
   [TokenType.String]: 'String',
 }
 
-const RE_LINE_COMMENT_START = /^#/
+const RE_LINE_COMMENT = /^#.*/s
 const RE_WHITESPACE = /^ +/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
@@ -113,9 +111,9 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_PROPERTY_NAME))) {
           token = TokenType.PropertyName
           state = State.AfterPropertyName
-        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
-          state = State.InsideLineComment
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.TopLevelContent
@@ -127,14 +125,6 @@ export const tokenizeLine = (line, lineState) => {
           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_EQUAL_SIGN))) {
           token = TokenType.Punctuation
@@ -162,9 +152,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_NUMERIC_FLOAT))) {
           token = TokenType.Numeric
           state = State.TopLevelContent
-        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
-          state = State.InsideLineComment
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_NAN))) {
           token = TokenType.Numeric
           state = State.TopLevelContent

package/extensions/builtin.theme-gruvbox/README.md

@@ -0,0 +1,18 @@
+# Theme Gruvbox
+
+## Contributing
+
+```sh
+git clone git@github.com:lvce-editor/theme-gruvbox.git &&
+cd theme-gruvbox &&
+npm ci &&
+npm run dev
+```
+
+## Gitpod
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/lvce-editor/theme-gruvbox)
+
+## Credits
+
+Extension is based on https://github.com/sainnhe/gruvbox-material-vscode by @sainnhe (License MIT)

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

@@ -0,0 +1,173 @@
+{
+  "type": "dark",
+  "colors": {
+    "ActivityBarBackground": "rgb(41, 40, 40)",
+    "ActivityBarActiveForeground": "rgb(168, 153, 132)",
+    "ActivityBarForeground": "rgb(124, 111, 100)",
+
+    "BadgeBackground": "",
+    "BadgeForeground": "",
+
+    "ContextMenuBackground": "rgb(41, 40, 40)",
+    "ContextMenuForeground": "rgb(168, 153, 132)",
+
+    "EditorBackGround": "rgb(41, 40, 40)",
+    "EditorScrollBarBackground": "rgba(124, 111, 100, 0.5)",
+    "EditorCursorBackground": "#d4be98",
+    "EditorSelectionBackground": "rgba(80, 73, 69, 0.69)",
+
+    "FocusOutline": "",
+
+    "InputBoxBackground": "",
+    "InputBoxForeground": "",
+
+    "ListActiveSelectionBackground": "rgba(69, 64, 61, 0.38)",
+    "ListActiveSelectionForeground": "",
+    "ListHoverBackground": "rgba(69, 64, 61, 0.38)",
+    "ListHoverForeground": "",
+    "ListInactiveSelectionBackground": "",
+    "ListForeground": "rgb(212, 190, 152)",
+
+    "MainBackground": "rgb(41, 40, 40)",
+
+    "MenuBackground": "",
+    "MenuForeground": "rgb(168, 153, 132)",
+    "MenuItemHoverBackground": "rgb(50, 48, 47)",
+
+    "PanelBackground": "rgb(41, 40, 40)",
+    "PanelBorderTopColor": "",
+    "PanelTabHoverForeground": "",
+    "PanelTabActiveForeground": "#a89984",
+    "PanelTabHoverForeground": "#a89984",
+    "PanelTabForeground": "rgb(124, 111, 100)",
+
+    "QuickPickBackground": "rgb(41, 40, 40)",
+    "QuickPickInputBackground": "",
+
+    "SideBarBackground": "rgb(41, 40, 40)",
+    "SideBarForeground": "rgb(168, 153, 132)",
+
+    "StatusBarBackground": "rgb(41, 40, 40)",
+    "StatusBarBorderTopColor": "",
+
+    "TabActiveForeground": "rgb(212, 190, 152)",
+    "TabForeground": "rgb(212, 190, 152)",
+    "TabActiveBackground": "",
+    "TabInactiveBackground": "",
+
+    "TabsBackground": "",
+
+    "TitleBarBackground": "rgb(41, 40, 40)",
+    "TitleBarBorderBottomColor": "",
+    "TitleBarForeground": "rgb(168, 153, 132)",
+    "TitleBarColorInactive": "",
+
+    "TreeItemForeground": "rgb(146, 131, 116)"
+  },
+  "tokenColors": [
+    {
+      "name": "CssSelector",
+      "foreground": "#EA6962"
+    },
+    {
+      "name": "CssPropertyName",
+      "foreground": "#89B482"
+    },
+    {
+      "name": "CssPropertyValue",
+      "foreground": "#A9B665"
+    },
+    {
+      "name": "TagName",
+      "foreground": "#E78A4E"
+    },
+    {
+      "name": "AttributeName",
+      "foreground": "#D8A657"
+    },
+    {
+      "name": "String",
+      "foreground": "#A9B665"
+    },
+    {
+      "name": "PunctuationString",
+      "foreground": ""
+    },
+    {
+      "name": "PunctuationTag",
+      "foreground": "#A9B665"
+    },
+    {
+      "name": "JsonPropertyName",
+      "foreground": "#e78a4e"
+    },
+    {
+      "name": "JsonPropertyValueString",
+      "foreground": "#a9b665"
+    },
+    {
+      "name": "LanguageConstant",
+      "foreground": "#d3869b"
+    },
+    {
+      "name": "Keyword",
+      "foreground": "#EA6962"
+    },
+    {
+      "name": "Numeric",
+      "foreground": "#A9B665"
+    },
+    {
+      "name": "KeywordImport",
+      "foreground": "#89B482"
+    },
+    {
+      "name": "Type",
+      "foreground": ""
+    },
+    {
+      "name": "Macro",
+      "foreground": ""
+    },
+    {
+      "name": "KeywordControl",
+      "foreground": "#EA6962"
+    },
+    {
+      "name": "Regex",
+      "foreground": "#D8A657"
+    },
+    {
+      "name": "Function",
+      "foreground": ""
+    },
+    {
+      "name": "Comment",
+      "foreground": "#928374"
+    },
+    {
+      "name": "Punctuation",
+      "foreground": "#928374"
+    },
+    {
+      "name": "VariableName",
+      "foreground": "#D4BE98"
+    },
+    {
+      "name": "Text",
+      "foreground": "#d4be98"
+    },
+    {
+      "name": "KeywordReturn",
+      "foreground": "#EA6962"
+    },
+    {
+      "name": "Heading",
+      "foreground": "#E78A4E"
+    },
+    {
+      "name": "KeywordNew",
+      "foreground": "#EA6962"
+    }
+  ]
+}

package/extensions/builtin.theme-gruvbox/extension.json

@@ -0,0 +1,12 @@
+{
+  "id": "builtin.theme-gruvbox",
+  "name": "Gruvbox",
+  "description": "Theme based on gruvbox-material-vscode theme by sainnhe",
+  "colorThemes": [
+    {
+      "id": "gruvbox",
+      "label": "Gruvbox",
+      "path": "color-theme.json"
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -20,8 +20,8 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.8.0",
-    "@lvce-editor/pty-host": "0.8.0",
+    "@lvce-editor/extension-host": "0.8.2",
+    "@lvce-editor/pty-host": "0.8.2",
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "execa": "^6.1.0",

package/src/parts/ExtensionManagement/ExtensionManagement.ipc.js

@@ -13,7 +13,7 @@ export const Commands = {
   'ExtensionHost.watchColorTheme':ExtensionHostColorTheme.watch,
   'ExtensionManagement.disable': ExtensionManagement.disable,
   'ExtensionManagement.enable': ExtensionManagement.enable,
-  'ExtensionManagement.getAllExtensions': ExtensionManagement.getAllExtensions,
+  'ExtensionManagement.getAllExtensions': ExtensionManagement.getExtensions,
   'ExtensionManagement.getExtensions': ExtensionManagement.getExtensions,
   'ExtensionManagement.install': ExtensionManagement.install,
   'ExtensionManagement.uninstall': ExtensionManagement.uninstall,

package/src/parts/ExtensionManagement/ExtensionManagement.js

@@ -1,5 +1,4 @@
-import { mkdir, readdir, rename, rm } from 'node:fs/promises'
-import { performance } from 'node:perf_hooks'
+import { mkdir, rename, rm } from 'node:fs/promises'
 import VError from 'verror'
 import * as Debug from '../Debug/Debug.js'
 import * as ExtensionManifestInputType from '../ExtensionManifestInputType/ExtensionManifestInputType.js'
@@ -8,28 +7,6 @@ import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as Queue from '../Queue/Queue.js'
 
-const isLanguageBasics = (extension) => {
-  if (extension && extension.id) {
-    return extension.id.includes('language-basics')
-  }
-  return false
-}
-
-const getEnabledExtensionWithOnlyExtension = (
-  builtinExtensions,
-  onlyExtension
-) => {
-  const extensions = []
-  for (const builtinExtension of builtinExtensions) {
-    if (builtinExtension.id === onlyExtension.id) {
-      continue
-    }
-    extensions.push(builtinExtension)
-  }
-  extensions.push(onlyExtension)
-  return extensions
-}
-
 export const install = async (id) => {
   // TODO this should be a stateless function, renderer-worker should have info on marketplace url
   // TODO use command.execute
@@ -107,81 +84,7 @@ export const disable = async (id) => {
   }
 }
 
-const getAbsoluteDisabledPath = (dirent) => {
-  const disabledExtensionsPath = Platform.getDisabledExtensionsPath()
-  return Path.join(disabledExtensionsPath, dirent)
-}
-
-const getDisabledExtensionPaths = async () => {
-  try {
-    const disabledExtensionsPaths = Platform.getDisabledExtensionsPath()
-    const dirents = await readdir(disabledExtensionsPaths)
-    const paths = dirents.map(getAbsoluteDisabledPath)
-    return paths
-  } catch {
-    // TODO handle error
-    return []
-  }
-}
-
-const getAbsoluteBuiltinExtensionPath = (dirent) => {
-  const builtinExtensionsPath = Platform.getBuiltinExtensionsPath()
-  return Path.join(builtinExtensionsPath, dirent)
-}
-
-const isIncludedBuiltinExtension = (dirent) => {
-  const SKIPPED = [
-    'hello-world',
-    'vite',
-    'soundcloud',
-    'npm',
-    // 'builtin.git', ~40MB memory usage (too many file watchers)
-    // 'builtin.prettier',  ~20MB memory usage (maybe lazyload prettier)
-    // 'language-features-typescript',
-    // 'builtin.vscode-icons',
-  ]
-  return !SKIPPED.includes(dirent)
-}
-
-// TODO pass builtin extensions path from renderer-worker
-// only negative: more messages sent between renderer-worker and shared process on startup
-const getBuiltinExtensionPaths = async () => {
-  try {
-    const builtinExtensionsPath = Platform.getBuiltinExtensionsPath()
-    const dirents = await readdir(builtinExtensionsPath)
-    const filteredDirents = dirents.filter(isIncludedBuiltinExtension)
-    const paths = filteredDirents.map(getAbsoluteBuiltinExtensionPath)
-    return paths
-  } catch {
-    console.info('no builtin extension paths found')
-    return []
-  }
-}
-
-const getAbsoluteInstalledExtensionPath = (dirent) => {
-  const extensionsPath = Platform.getExtensionsPath()
-  return Path.join(extensionsPath, dirent)
-}
-
-const getInstalledExtensionPaths = async () => {
-  try {
-    const extensionsPath = Platform.getExtensionsPath()
-    const dirents = await readdir(extensionsPath)
-    const paths = dirents.map(getAbsoluteInstalledExtensionPath)
-    return paths
-  } catch (error) {
-    // TODO how to make typescript happy?
-    // @ts-ignore
-    if (error.code === 'ENOENT') {
-      // TODO what if mkdir fails?
-      await mkdir(Platform.getExtensionsPath(), { recursive: true })
-      return []
-    }
-    throw new VError(error, 'Failed to get installed extensions')
-  }
-}
-
-export const getBuiltinExtensions = async () => {
+export const getBuiltinExtensions = () => {
   return ExtensionManifests.getAll([
     {
       type: ExtensionManifestInputType.Folder,
@@ -199,7 +102,7 @@ export const getInstalledExtensions = () => {
   ])
 }
 
-export const getExtensions = async () => {
+export const getExtensions = () => {
   return ExtensionManifests.getAll([
     {
       type: ExtensionManifestInputType.OnlyExtension,
@@ -220,7 +123,7 @@ export const getExtensions = async () => {
   ])
 }
 
-export const getDisabledExtensions = async () => {
+export const getDisabledExtensions = () => {
   return ExtensionManifests.getAll([
     {
       type: ExtensionManifestInputType.Folder,
@@ -228,32 +131,3 @@ export const getDisabledExtensions = async () => {
     },
   ])
 }
-
-export const getAllExtensions = async () => {
-  const onlyExtensionPath = Platform.getOnlyExtensionPath()
-  if (onlyExtensionPath) {
-    return ExtensionManifests.getAll([
-      {
-        type: ExtensionManifestInputType.OnlyExtension,
-        path: onlyExtensionPath,
-      },
-    ])
-  }
-  const t1 = performance.now()
-  const [builtinExtensions, installedExtensions, disabledExtensions] =
-    // TODO handle error when one of them fails
-    await Promise.all([
-      getBuiltinExtensions(),
-      getInstalledExtensions(),
-      getDisabledExtensions(),
-    ])
-  const t4 = performance.now()
-  // TODO can optimize this by loading extension manifest while loading paths (though 2ms isn't a bottleneck right now)
-  // e.g.
-  // await Promise.all([getBuiltinExtensionPaths.then(getExtensionManifests), getInstalledExtensionPaths.then(getExtensionManifests)])
-  const timings = {
-    total: t4 - t1,
-  }
-  // console.log(timings)
-  return [...builtinExtensions, ...installedExtensions, ...disabledExtensions]
-}