@lvce-editor/shared-process 0.15.2 → 0.15.4

package/config/defaultSettings.json

@@ -18,6 +18,8 @@
 
   "extensions.autoUpdate": true,
 
+  "files.autoSave": "off",
+
   "files.exclude": {
     ".git": true,
     ".svn": true,

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

@@ -120,6 +120,7 @@ const RE_DOUBLE_QUOTE = /^"/
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 const RE_SINGLE_QUOTE = /^'/
+const RE_ANYTHING_BUT_CURLY = /^[^\{\}]+/s
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -231,6 +232,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_STAR))) {
           token = TokenType.CssSelector
           state = State.AfterSelector
+        } else if ((next = part.match(RE_ANYTHING_BUT_CURLY))) {
+          token = TokenType.Unknown
+          state = State.AfterSelector
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Unknown
           state = State.TopLevelContent

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

@@ -62,7 +62,7 @@ const RE_ANGLE_BRACKET_CLOSE = /^>/
 const RE_ANGLE_BRACKET_OPEN = /^</
 const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?![\s!\%])/
 const RE_ANY_TEXT = /^[^\n]+/
-const RE_ATTRIBUTE_NAME = /^[a-zA-Z\d\-\:]+/
+const RE_ATTRIBUTE_NAME = /^[a-zA-Z\d\-\:\_]+/
 const RE_BLOCK_COMMENT_CONTENT_1 = /^.+?(?=-->)/s
 const RE_BLOCK_COMMENT_CONTENT_2 = /^.+$/s
 const RE_BLOCK_COMMENT_END = /^-->/

package/extensions/builtin.language-basics-python/languageConfiguration.json

@@ -0,0 +1,5 @@
+{
+  "comments": {
+    "lineComment": "#"
+  }
+}

package/extensions/builtin.language-basics-python/src/tokenizePython.js

@@ -44,6 +44,7 @@ export const TokenType = {
   KeywordImport: 955,
   KeywordControl: 956,
   Function: 957,
+  KeywordOperator: 958,
 }
 
 export const TokenMap = {
@@ -67,6 +68,7 @@ export const TokenMap = {
   [TokenType.KeywordImport]: 'KeywordImport',
   [TokenType.KeywordControl]: 'KeywordControl',
   [TokenType.Function]: 'Function',
+  [TokenType.KeywordOperator]: 'KeywordOperator',
 }
 
 const RE_WHITESPACE = /^\s+/
@@ -150,8 +152,15 @@ export const tokenizeLine = (line, lineState) => {
             case 'raise':
             case 'break':
             case 'pass':
+            case 'assert':
               token = TokenType.KeywordControl
               break
+            case 'or':
+            case 'not':
+            case 'and':
+            case 'in':
+              token = TokenType.KeywordOperator
+              break
             default:
               token = TokenType.Keyword
               break

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

@@ -9,6 +9,9 @@
     "BadgeBackground": "#90599b",
     "BadgeForeground": "#eeeeee",
 
+    "DropDownBackground": "#3c3c3c",
+    "DropDownForeground": "#f0f0f0",
+
     "EditorBackGround": "#1e2324",
     "EditorScrollBarBackground": "rgba(57, 71, 71, 0.6)",
     "EditorCursorBackground": "#a8df5a",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,16 +17,15 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.21.4",
-    "@lvce-editor/extension-host": "0.15.2",
-    "@lvce-editor/extension-host-helper-process": "0.15.2",
-    "@lvce-editor/pty-host": "0.15.2",
+    "@lvce-editor/extension-host": "0.15.4",
+    "@lvce-editor/extension-host-helper-process": "0.15.4",
+    "@lvce-editor/pty-host": "0.15.4",
     "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.1.0",
     "p-queue": "^7.3.4",
     "parse-json": "^7.0.0",
     "symlink-dir": "^5.1.1",
@@ -40,6 +39,7 @@
   "optionalDependencies": {
     "extract-zip": "^2.0.1",
     "keytar": "^7.9.0",
-    "vscode-ripgrep-with-github-api-error-fix": "^2.8.0"
+    "vscode-ripgrep-with-github-api-error-fix": "^2.8.0",
+    "open": "^9.1.0"
   }
 }

package/src/parts/ExtensionHostRpc/ExtensionHostRpc.js

@@ -1,7 +1,7 @@
 import * as Assert from '../Assert/Assert.js'
 import * as Timeout from '../Timeout/Timeout.js'
 import { VError } from '../VError/VError.js'
-
+import * as Logger from '../Logger/Logger.js'
 // TODO maybe rename to extension host management for clarity
 
 const CONNECTION_TIMEOUT = 3000
@@ -10,15 +10,15 @@ export const create = async (ipc, socket) => {
   Assert.object(socket)
 
   const handleChildProcessError = (error) => {
-    console.error(`[Extension Host] ${error}`)
+    Logger.error(`[Extension Host] ${error}`)
   }
 
   const handleChildProcessExit = (exitCode) => {
-    console.info(`[SharedProcess] Extension Host exited with code ${exitCode}`)
+    Logger.info(`[SharedProcess] Extension Host exited with code ${exitCode}`)
   }
 
   const handleSocketClose = () => {
-    console.info('[shared process] disposing extension host')
+    Logger.info('[shared process] disposing extension host')
     ipc.dispose()
   }
 

package/src/parts/Module/Module.js

@@ -20,8 +20,8 @@ export const load = (moduleId) => {
       return import('../FileSystem/FileSystem.ipc.js')
     case ModuleId.GitLsFiles:
       return import('../GitLsFiles/GitLsFiles.ipc.js')
-    case ModuleId.Native:
-      return import('../Native/Native.ipc.js')
+    case ModuleId.OpenNativeFolder:
+      return import('../OpenNativeFolder/OpenNativeFolder.ipc.js')
     case ModuleId.OutputChannel:
       return import('../OutputChannel/OutputChannel.ipc.js')
     case ModuleId.Platform:

package/src/parts/ModuleId/ModuleId.js

@@ -3,7 +3,7 @@ export const Developer = 2
 export const ExtensionHost = 3
 export const ExtensionManagement = 4
 export const FileSystem = 5
-export const Native = 6
+export const OpenNativeFolder = 6
 export const OutputChannel = 7
 export const Platform = 8
 export const Preferences = 9

package/src/parts/ModuleMap/ModuleMap.js

@@ -106,7 +106,8 @@ export const getModuleId = (commandId) => {
     case 'IsAutoUpdateSupported.isAutoUpdateSupported':
       return ModuleId.IsAutoUpdateSupported
     case 'Native.openFolder':
-      return ModuleId.Native
+    case 'OpenNativeFolder.openFolder':
+      return ModuleId.OpenNativeFolder
     case 'OutputChannel.close':
     case 'OutputChannel.open':
       return ModuleId.OutputChannel

package/src/parts/OpenNativeFolder/OpenNativeFolder.ipc.js

@@ -0,0 +1,7 @@
+import * as OpenNativeFolder from './OpenNativeFolder.js'
+
+export const name = 'OpenNativeFolder'
+
+export const Commands = {
+  openFolder: OpenNativeFolder.openFolder,
+}

package/src/parts/OutputChannel/OutputChannel.js

@@ -1,4 +1,5 @@
 import { Tail } from 'tail'
+import { VError } from '../VError/VError.js'
 
 // TODO
 // option 1: use tail child process
@@ -31,7 +32,11 @@ export const open = (path, onData, onError) => {
 }
 
 export const dispose = (state) => {
-  if (state.tail) {
-    state.tail.unwatch()
+  try {
+    if (state.tail) {
+      state.tail.unwatch()
+    }
+  } catch (error) {
+    throw new VError(error, `Failed to dispose output channel`)
   }
 }

package/src/parts/Native/Native.ipc.js

@@ -1,7 +0,0 @@
-import * as Native from './Native.js'
-
-export const name = 'Native'
-
-export const Commands = {
-  openFolder: Native.openFolder,
-}