@lvce-editor/shared-process 0.11.6 → 0.11.7

package/config/builtinCommands.json

@@ -326,7 +326,7 @@
     "label": "File: Open Recent"
   },
   {
-    "id": "Dialog.showAbout",
+    "id": "About.showAbout",
     "label": "Help: About"
   },
   {

package/config/defaultKeyBindings.json

@@ -149,7 +149,7 @@
   },
   {
     "key": "ctrl+Enter",
-    "command": "SourceControl.acceptInput",
+    "command": "Source Control.acceptInput",
     "when": "focus.sourceControlInput"
   },
   {

package/extensions/builtin.language-basics-desktop/src/tokenizeDesktop.js

@@ -4,6 +4,9 @@
 export const State = {
   TopLevelContent: 1,
   InsideLineComment: 2,
+  AfterPropertyName: 3,
+  AfterPropertyNameAfterEqualSign: 4,
+  InsideString: 5,
 }
 
 export const StateMap = {
@@ -23,6 +26,10 @@ export const TokenType = {
   Comment: 885,
   Query: 886,
   Text: 887,
+  PropertyName: 12,
+  PropertyValueString: 14,
+  Punctuation: 13,
+  LanguageConstant: 11,
 }
 
 export const TokenMap = {
@@ -34,13 +41,19 @@ export const TokenMap = {
   [TokenType.Comment]: 'Comment',
   [TokenType.Query]: 'Query',
   [TokenType.Text]: 'Text',
+  [TokenType.Punctuation]: 'Punctuation',
+  [TokenType.LanguageConstant]: 'LanguageConstant',
+  [TokenType.PropertyName]: 'JsonPropertyName',
+  [TokenType.LanguageConstant]: 'LanguageConstant',
+  [TokenType.Punctuation]: 'Punctuation',
+  [TokenType.PropertyValueString]: 'YamlPropertyValueString',
 }
 
 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_PROPERTY_NAME = /^[a-zA-Z\-\_\d]+\b(?=\s*=)/
 const RE_COLON = /^:/
 const RE_PROPERTY_VALUE = /^[^;\}]+/
 const RE_SEMICOLON = /^;/
@@ -62,6 +75,11 @@ const RE_STAR = /^\*/
 const RE_QUERY_NAME = /^[a-z\-]+/
 const RE_QUERY_CONTENT = /^[^\)]+/
 const RE_COMBINATOR = /^[\+\>\~]/
+const RE_EQUAL_SIGN = /^=/
+const RE_QUOTE_DOUBLE = /^"/
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
+const RE_LINE_COMMENT = /^#.*/s
+const RE_LANGUAGE_CONSTANT = /^(?:true|false)\b/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -85,9 +103,12 @@ export const tokenizeLine = (line, lineState) => {
     const part = line.slice(index)
     switch (state) {
       case State.TopLevelContent:
-        if ((next = part.match(RE_LINE_COMMENT_START))) {
+        if ((next = part.match(RE_PROPERTY_NAME))) {
+          token = TokenType.PropertyName
+          state = State.AfterPropertyName
+        } 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
@@ -99,10 +120,33 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
-      case State.InsideLineComment:
-        if ((next = part.match(RE_ANYTHING))) {
+      case State.AfterPropertyName:
+        if ((next = part.match(RE_EQUAL_SIGN))) {
+          token = TokenType.Punctuation
+          state = State.AfterPropertyNameAfterEqualSign
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterPropertyName
+        } else {
+          throw new Error('no')
+        }
+        break
+      case State.AfterPropertyNameAfterEqualSign:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterPropertyNameAfterEqualSign
+        } else if ((next = part.match(RE_LANGUAGE_CONSTANT))) {
+          token = TokenType.LanguageConstant
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideString
+        } else if ((next = part.match(RE_ANYTHING))) {
+          token = TokenType.PropertyValueString
+          state = State.TopLevelContent
         } else {
           throw new Error('no')
         }

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

@@ -37,6 +37,7 @@
       "fileNames": [
         "APKBUILD",
         "PKGBUILD",
+        ".INSTALL",
         ".envrc",
         ".hushlogin",
         "zshrc",

package/extensions/builtin.language-basics-xml/src/tokenizeXml.js

@@ -79,7 +79,7 @@ const RE_SLASH = /^\//
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 const RE_TAG_TEXT = /^[^\s>]+/
-const RE_TAGNAME = /^[!\w]+/
+const RE_TAGNAME = /^[!\w\-]+/
 const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
 const RE_WORD = /^[^\s]+/

package/index.js

@@ -5,12 +5,15 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 
 export const sharedProcessPath = join(__dirname, 'src', 'sharedProcessMain.js')
 
-export const exportStatic = async ({ extensionPath = process.cwd() } = {}) => {
+export const exportStatic = async ({
+  extensionPath = process.cwd(),
+  testPath = '',
+} = {}) => {
   const fn = await import('./src/parts/ExportStatic/ExportStatic.js')
   const root = process.cwd()
   if (extensionPath !== root) {
     extensionPath = join(root, extensionPath)
   }
   const pathPrefix = process.env.PATH_PREFIX || ''
-  await fn.exportStatic({ root, pathPrefix, extensionPath })
+  await fn.exportStatic({ root, pathPrefix, extensionPath, testPath })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.18.6",
-    "@lvce-editor/extension-host": "0.11.6",
-    "@lvce-editor/extension-host-helper-process": "0.11.6",
-    "@lvce-editor/pty-host": "0.11.6",
+    "@lvce-editor/extension-host": "0.11.7",
+    "@lvce-editor/extension-host-helper-process": "0.11.7",
+    "@lvce-editor/pty-host": "0.11.7",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
-    "exit-hook": "^3.1.2",
+    "exit-hook": "^3.1.4",
     "got": "^12.5.3",
     "is-object": "^1.0.2",
     "lines-and-columns": "^2.0.3",

package/src/parts/ExportStatic/ExportStatic.js

@@ -637,11 +637,76 @@ const addExtension = async ({
   })
 }
 
+const generateTestOverviewHtml = (dirents) => {
+  const pre = `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Tests</title>
+  </head>
+  <body>
+    <h1>Tests</h1>
+    <p>Available Tests</p>
+    <ul>
+`
+  let middle = ``
+  // TODO properly escape name
+  for (const dirent of dirents) {
+    const name = dirent
+    middle += `      <li><a href="./${name}.html">${name}</a></li>
+`
+  }
+
+  const post = `    </ul>
+  </body>
+</html>
+`
+  return pre + middle + post
+}
+
+const getName = (name) => {
+  return name.slice(0, -'.js'.length)
+}
+const isTestFile = (file) => {
+  return file !== '_all.js'
+}
+
+const getTestFiles = (testFilesRaw) => {
+  return testFilesRaw.map(getName).filter(isTestFile)
+}
+
+const addTestFiles = async ({ testPath, commitHash, root, pathPrefix }) => {
+  await FileSystem.copy(
+    `${root}/${testPath}/src`,
+    `${root}/dist/${commitHash}/packages/extension-host-worker-tests/src`
+  )
+  const testFilesRaw = await FileSystem.readDir(`${root}/${testPath}/src`)
+  const testFiles = getTestFiles(testFilesRaw)
+  await FileSystem.mkdir(`${root}/dist/${commitHash}/tests`)
+  await FileSystem.mkdir(`${root}/dist/tests`)
+  console.log({ testFiles })
+  for (const testFile of testFiles) {
+    await FileSystem.copyFile(
+      `${root}/dist/index.html`,
+      `${root}/dist/tests/${testFile}.html`
+    )
+  }
+  const testOverviewHtml = generateTestOverviewHtml(testFiles)
+  await FileSystem.writeFile(`${root}/dist/tests/index.html`, testOverviewHtml)
+}
+
 /**
  *
- * @param {{root:string, pathPrefix:string , extensionPath:string  }} param0
+ * @param {{root:string, pathPrefix:string , extensionPath:string, testPath:string   }} param0
  */
-export const exportStatic = async ({ root, pathPrefix, extensionPath }) => {
+export const exportStatic = async ({
+  root,
+  pathPrefix,
+  extensionPath,
+  testPath,
+}) => {
   if (pathPrefix === 'auto') {
     const extensionJson = await readExtensionManifest(
       Path.join(extensionPath, 'extension.json')
@@ -679,4 +744,15 @@ export const exportStatic = async ({ root, pathPrefix, extensionPath }) => {
     root,
   })
   console.timeEnd('addExtension')
+
+  if (testPath) {
+    console.time('addTestFiles')
+    await addTestFiles({
+      testPath,
+      commitHash,
+      pathPrefix,
+      root,
+    })
+    console.timeEnd('addTestFiles')
+  }
 }

package/src/parts/ExtensionLink/ExtensionLink.js

@@ -1,11 +1,11 @@
-import VError from 'verror'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as SymLink from '../SymLink/SymLink.js'
+import { VError } from '../VError/VError.js'
 
 const linkFallBack = async (path) => {
   try {
@@ -19,7 +19,6 @@ const linkFallBack = async (path) => {
     await FileSystem.remove(to)
     await SymLink.createSymLink(path, to)
   } catch (error) {
-    console.log({ error })
     throw new VError(error, `Failed to link extension`)
   }
 }

package/src/parts/ExtensionManagement/ExtensionManagement.js

@@ -1,5 +1,5 @@
 import { mkdir, rename, rm } from 'node:fs/promises'
-import VError from 'verror'
+import { VError } from '../VError/VError.js'
 import * as Debug from '../Debug/Debug.js'
 import * as ExtensionManifestInputType from '../ExtensionManifestInputType/ExtensionManifestInputType.js'
 import * as ExtensionManifests from '../ExtensionManifests/ExtensionManifests.js'

package/src/parts/ExtensionManifest/ExtensionManifest.js

@@ -1,9 +1,9 @@
 import isObject from 'is-object'
-import VError from 'verror'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js'
 import * as ReadJson from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import { VError } from '../VError/VError.js'
 
 const RE_EXTENSION_FRAGMENT = /.+(\/|\\)(.+)$/
 

package/src/parts/Search/Search.js

@@ -2,16 +2,30 @@ import { spawn } from 'node:child_process'
 import * as Platform from '../Platform/Platform.js'
 import * as RgPath from '../RgPath/RgPath.js'
 import * as RipGrepParsedLineType from '../RipGrepParsedLineType/RipGrepParsedLineType.js'
-import * as SplitLines from '../SplitLines/SplitLines.js'
+import * as TextSearchResultType from '../TextSearchResultType/TextSearchResultType.js'
 
 const MAX_SEARCH_RESULTS = 300
 
+const BEFORE = 20
+const AFTER = 20
+
 const toSearchResult = (parsedLine) => {
-  return {
-    preview: parsedLine.data.lines.text,
-    absoluteOffset: parsedLine.data.absolute_offset,
-    lineNumber: parsedLine.data.line_number - 1,
+  const results = []
+  const lines = parsedLine.data.lines.text
+  const lineNumber = parsedLine.data.line_number
+  for (const submatch of parsedLine.data.submatches) {
+    const previewStart = Math.max(submatch.start - BEFORE, 0)
+    const previewEnd = Math.min(submatch.end + AFTER, lines.length)
+    const previewText = lines.slice(previewStart, previewEnd)
+    results.push({
+      type: TextSearchResultType.Match,
+      start: submatch.start - previewStart,
+      end: submatch.end - previewStart,
+      lineNumber,
+      text: previewText,
+    })
   }
+  return results
 }
 
 // TODO update vscode-ripgrep when https://github.com/mhinz/vim-grepper/issues/244, https://github.com/BurntSushi/ripgrep/issues/1892 is fixed
@@ -52,32 +66,53 @@ export const search = async (searchDir, searchString) => {
     let numberOfResults = 0
     // TODO use pipeline / transform stream maybe
 
+    const handleLine = (line) => {
+      const parsedLine = JSON.parse(line)
+      switch (parsedLine.type) {
+        case RipGrepParsedLineType.Begin:
+          allSearchResults[parsedLine.data.path.text] = [
+            {
+              type: TextSearchResultType.File,
+              start: 0,
+              end: 0,
+              lineNumber: 0,
+              text: parsedLine.data.path.text,
+            },
+          ]
+          break
+        case RipGrepParsedLineType.Match:
+          numberOfResults++
+          allSearchResults[parsedLine.data.path.text].push(
+            ...toSearchResult(parsedLine)
+          )
+          break
+        case RipGrepParsedLineType.Summary:
+          stats = parsedLine.data
+          break
+        default:
+          break
+      }
+    }
+
+    let total = 0
     const handleData = (chunk) => {
-      buffer += chunk
-      const lines = SplitLines.splitLines(buffer)
-      // @ts-ignore
-      buffer = lines.pop()
-      for (const line of lines) {
-        const parsedLine = JSON.parse(line)
-        console.log(parsedLine)
-        switch (parsedLine.type) {
-          case RipGrepParsedLineType.Begin: {
-            allSearchResults[parsedLine.data.path.text] = []
-            break
-          }
-          case RipGrepParsedLineType.Match:
-            numberOfResults++
-            allSearchResults[parsedLine.data.path.text].push(
-              toSearchResult(parsedLine)
-            )
-            break
-          case RipGrepParsedLineType.Summary:
-            stats = parsedLine.data
-            break
-          default:
-            break
-        }
+      let newLineIndex = chunk.indexOf('\n')
+      const dataString = buffer + chunk
+      if (newLineIndex === -1) {
+        buffer = dataString
+        return
+      }
+      total += chunk.length
+      newLineIndex += buffer.length
+      let previousIndex = 0
+      while (newLineIndex >= 0) {
+        const line = dataString.slice(previousIndex, newLineIndex)
+        handleLine(line)
+        previousIndex = newLineIndex + 1
+        newLineIndex = dataString.indexOf('\n', previousIndex)
       }
+      buffer = dataString.slice(previousIndex)
+
       if (numberOfResults > MAX_SEARCH_RESULTS) {
         limitHit = true
         childProcess.kill()
@@ -85,8 +120,9 @@ export const search = async (searchDir, searchString) => {
     }
 
     const handleClose = () => {
+      const results = Object.values(allSearchResults).flat(1)
       resolve({
-        results: Object.entries(allSearchResults),
+        results,
         stats,
         limitHit,
       })
@@ -100,6 +136,7 @@ export const search = async (searchDir, searchString) => {
         limitHit,
       })
     }
+    childProcess.stdout.setEncoding('utf8')
     childProcess.stdout.on('data', handleData)
     childProcess.once('close', handleClose)
     childProcess.once('error', handleError)

package/src/parts/TextSearchResultType/TextSearchResultType.js

@@ -0,0 +1,2 @@
+export const File = 1
+export const Match = 2

package/src/parts/VError/VError.js

@@ -0,0 +1,44 @@
+const getCombinedMessage = (error, message) => {
+  let stringifiedError = `${error}`
+  if (stringifiedError.startsWith('Error: ')) {
+    stringifiedError = stringifiedError.slice(`Error: `.length)
+  } else if (stringifiedError.startsWith('VError: ')) {
+    stringifiedError = stringifiedError.slice(`VError: `.length)
+  }
+  if (message) {
+    return `${message}: ${stringifiedError}`
+  }
+  return stringifiedError
+}
+
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent
+  }
+  const parentNewLineIndex = parent.indexOf('\n')
+  const childNewLineIndex = child.indexOf('\n')
+  const parentFirstLine = parent.slice(0, parentNewLineIndex)
+  const childRest = child.slice(childNewLineIndex)
+  const childFirstLine = child.slice(0, childNewLineIndex)
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest
+  }
+  return child
+}
+
+export class VError extends Error {
+  constructor(error, message) {
+    const combinedMessage = getCombinedMessage(error, message)
+    super(combinedMessage)
+    this.name = 'VError'
+    if (error instanceof Error) {
+      this.stack = mergeStacks(this.stack, error.stack)
+    }
+    if (error.codeFrame) {
+      this.codeFrame = error.codeFrame
+    }
+    if (error.code) {
+      this.code = error.code
+    }
+  }
+}