@lvce-editor/server 0.1.1 → 0.2.2

package/static/{0c1ed12 → e2dcaea}/packages/renderer-worker/src/parts/Preferences/Preferences.js

@@ -47,37 +47,41 @@ const getPreferences = async () => {
 }
 
 export const hydrate = async () => {
-  // TODO should configuration be together with all other preferences (e.g. selecting color theme code is not needed on startup)
-  // TODO probably not all preferences need to be kept in memory
-  const preferences = await getPreferences()
-  Object.assign(state, preferences)
+  try {
+    // TODO should configuration be together with all other preferences (e.g. selecting color theme code is not needed on startup)
+    // TODO probably not all preferences need to be kept in memory
+    const preferences = await getPreferences()
+    Object.assign(state, preferences)
 
-  const styles = []
-  const fontSize = preferences['editor.fontSize']
-  if (fontSize) {
-    styles.push(`  --EditorFontSize: ${fontSize}px;`)
-  }
-  const fontFamily = preferences['editor.fontFamily']
-  if (fontFamily) {
-    styles.push(`  --EditorFontFamily: ${fontFamily};`)
-  }
-  const lineHeight = preferences['editor.lineHeight']
-  if (lineHeight) {
-    styles.push(`  --EditorLineHeight: ${lineHeight}px;`)
-  }
-  const letterSpacing = preferences['editor.letterSpacing']
-  if (letterSpacing) {
-    styles.push(`  --EditorLetterSpacing: ${letterSpacing}px;`)
-  }
-  const css = `:root {
+    const styles = []
+    const fontSize = preferences['editor.fontSize']
+    if (fontSize) {
+      styles.push(`  --EditorFontSize: ${fontSize}px;`)
+    }
+    const fontFamily = preferences['editor.fontFamily']
+    if (fontFamily) {
+      styles.push(`  --EditorFontFamily: ${fontFamily};`)
+    }
+    const lineHeight = preferences['editor.lineHeight']
+    if (lineHeight) {
+      styles.push(`  --EditorLineHeight: ${lineHeight}px;`)
+    }
+    const letterSpacing = preferences['editor.letterSpacing']
+    if (letterSpacing) {
+      styles.push(`  --EditorLetterSpacing: ${letterSpacing}px;`)
+    }
+    const css = `:root {
 ${styles.join('\n')}
 }`
-  // TODO make Css.setInlineStyle a separate module in renderer-worker
-  await RendererProcess.invoke(
-    /* Css.setInlineStyle */ 'Css.setInlineStyle',
-    /* id */ 'Settings',
-    /* css */ css
-  )
+    // TODO make Css.setInlineStyle a separate module in renderer-worker
+    await RendererProcess.invoke(
+      /* Css.setInlineStyle */ 'Css.setInlineStyle',
+      /* id */ 'Settings',
+      /* css */ css
+    )
+  } catch (error) {
+    console.error(error)
+  }
 }
 
 export const get = (key) => {

package/static/{0c1ed12 → e2dcaea}/packages/renderer-worker/src/parts/QuickPick/QuickPickFile.js

@@ -1,15 +1,10 @@
 import * as Command from '../Command/Command.js'
 import * as Languages from '../Languages/Languages.js'
-import * as Platform from '../Platform/Platform.js'
-import * as SharedProcess from '../SharedProcess/SharedProcess.js'
+import * as SearchFile from '../SearchFile/SearchFile.js'
 import * as Workspace from '../Workspace/Workspace.js'
 
 const searchFile = async (path, value) => {
-  if (Platform.platform === 'web') {
-    return []
-  }
-  const files = await SharedProcess.invoke(
-    /* SearchFile.searchFile */ 'SearchFile.searchFile',
+  const files = await SearchFile.searchFile(
     /* path */ path,
     /* searchTerm */ value
   )

package/static/e2dcaea/packages/renderer-worker/src/parts/SearchFile/SearchFile.js

@@ -0,0 +1,28 @@
+import * as Platform from '../Platform/Platform.js'
+import * as SharedProcess from '../SharedProcess/SharedProcess.js'
+
+const searchFileWeb = (path, value) => {
+  // TODO
+  return []
+}
+
+const searchFileRemote = async (path, value) => {
+  const files = await SharedProcess.invoke(
+    /* SearchFile.searchFile */ 'SearchFile.searchFile',
+    /* path */ path,
+    /* searchTerm */ value
+  )
+  return files
+}
+
+export const searchFile = async (path, value) => {
+  switch (Platform.platform) {
+    case 'web':
+      return searchFileWeb(path, value)
+    case 'electron':
+    case 'remote':
+      return searchFileRemote(path, value)
+    default:
+      return []
+  }
+}

package/static/{0c1ed12 → e2dcaea}/packages/renderer-worker/src/parts/SessionReplay/SessionReplay.js

@@ -7,6 +7,7 @@ import * as SharedProcess from '../SharedProcess/SharedProcess.js'
 import * as Assert from '../Assert/Assert.js'
 import { VError } from '../VError/VError.js'
 import * as Json from '../Json/Json.js'
+import * as Timestamp from '../Timestamp/Timestamp.js'
 
 export const state = {
   sessionId: '',
@@ -19,10 +20,9 @@ const getSessionId = () => {
   return state.sessionId
 }
 
-export const handleMessage = async (source, message) => {
+export const handleMessage = async (source, timestamp, message) => {
   try {
     const sessionId = getSessionId()
-    const timestamp = performance.now()
     await IndexedDb.saveValue(sessionId, {
       source,
       timestamp,
@@ -109,7 +109,7 @@ export const replaySession = async (sessionId) => {
 
 export const getEvents = async (sessionId) => {
   try {
-    const timestamp = performance.now()
+    const timestamp = Timestamp.now()
     const events = await IndexedDb.getValuesByIndexName(
       'session',
       'sessionId',
@@ -151,7 +151,8 @@ const wrapIpc = (ipc, name, getData) => {
   const wrappedIpc = {
     async send(message) {
       ipc.send(message)
-      await handleMessage(nameTo, message)
+      const timestamp = Timestamp.now()
+      await handleMessage(nameTo, timestamp, message)
     },
     sendAndTransfer(message, transferables) {
       ipc.sendAndTransfer(message, transferables)
@@ -166,8 +167,9 @@ const wrapIpc = (ipc, name, getData) => {
   const originalOnMessage = wrappedIpc.onmessage
   wrappedIpc.onmessage = async (event) => {
     const message = getData(event)
+    const timestamp = Timestamp.now()
     await originalOnMessage(event)
-    await handleMessage(nameFrom, message)
+    await handleMessage(nameFrom, timestamp, message)
   }
   return wrappedIpc
 }

package/static/{0c1ed12 → e2dcaea}/packages/renderer-worker/src/parts/TestFrameWork/TestFrameWork.js

@@ -1,5 +1,6 @@
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 export { create as Locator } from './Locator.js'
+import * as Timestamp from '../Timestamp/Timestamp.js'
 
 export const getTmpDir = async () => {
   return `memfs://`
@@ -29,9 +30,9 @@ export const test = async (name, fn) => {
   let _duration
   try {
     await waitForReady()
-    _start = performance.now()
+    _start = Timestamp.now()
     await fn()
-    _end = performance.now()
+    _end = Timestamp.now()
     _duration = `${_end - _start}ms`
     console.info(`[test passed] ${name} in ${_duration}`)
   } catch (error) {

package/static/{0c1ed12 → e2dcaea}/packages/renderer-worker/src/parts/TestFrameWorkComponent/TestFrameWorkComponentFileSystem.js

@@ -34,3 +34,10 @@ export const createExecutable = async (content) => {
   await chmod(gitPath, '755')
   return gitPath
 }
+
+export const createExecutableFrom = async (path) => {
+  const testPath = await Platform.getTestPath()
+  const absolutePath = testPath + '/' + path
+  const content = await Command.execute('Ajax.getText', absolutePath)
+  return createExecutable(content)
+}

package/static/e2dcaea/packages/renderer-worker/src/parts/Timestamp/Timestamp.js

@@ -0,0 +1,3 @@
+export const now = () => {
+  return performance.now()
+}

package/static/{0c1ed12 → e2dcaea}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBar.js

@@ -4,8 +4,20 @@ import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
 import * as Layout from '../Layout/Layout.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as ActivityBarItemFlags from '../ActivityBarItemFlags/ActvityBarItemFlags.js'
-
-const ACTIVITY_BAR_ITEM_HEIGHT = 48
+import * as I18nString from '../I18NString/I18NString.js'
+
+/**
+ * @enum {string}
+ */
+const UiStrings = {
+  Explorer: 'Explorer',
+  Search: 'Search',
+  SourceControl: 'Source Control',
+  RunAndDebug: 'Run and Debug',
+  Extensions: 'Extensions',
+  Settings: 'Settings',
+  AdditionalViews: 'Additional Views',
+}
 
 export const name = 'ActivityBar'
 
@@ -18,9 +30,8 @@ export const name = 'ActivityBar'
 // TODO unregister listeners when hidden
 
 const getNumberOfVisibleItems = (state) => {
-  const numberOfVisibleItemsTop = Math.floor(
-    state.height / ACTIVITY_BAR_ITEM_HEIGHT
-  )
+  const { height, itemHeight } = state
+  const numberOfVisibleItemsTop = Math.floor(height / itemHeight)
   return numberOfVisibleItemsTop
 }
 
@@ -41,6 +52,7 @@ const getVisibleActivityBarItems = (state) => {
   }
   const showMoreItem = {
     id: 'Additional Views',
+    title: I18nString.i18nString(UiStrings.AdditionalViews),
     icon: 'icons/ellipsis.svg',
     enabled: true,
     flags: ActivityBarItemFlags.Button,
@@ -72,6 +84,7 @@ export const create = (id, uri, left, top, width, height) => {
     top,
     width,
     height,
+    itemHeight: 48,
   }
 }
 
@@ -80,6 +93,7 @@ const getActivityBarItems = () => {
     // Top
     {
       id: 'Explorer',
+      title: I18nString.i18nString(UiStrings.Explorer),
       icon: 'icons/files.svg',
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
@@ -87,6 +101,7 @@ const getActivityBarItems = () => {
     },
     {
       id: 'Search',
+      title: I18nString.i18nString(UiStrings.Search),
       icon: 'icons/search.svg',
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
@@ -94,6 +109,7 @@ const getActivityBarItems = () => {
     },
     {
       id: 'Source Control',
+      title: I18nString.i18nString(UiStrings.SourceControl),
       icon: 'icons/source-control.svg',
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
@@ -101,6 +117,7 @@ const getActivityBarItems = () => {
     },
     {
       id: 'Run and Debug',
+      title: I18nString.i18nString(UiStrings.RunAndDebug),
       icon: 'icons/debug-alt-2.svg',
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
@@ -108,6 +125,7 @@ const getActivityBarItems = () => {
     },
     {
       id: 'Extensions',
+      title: I18nString.i18nString(UiStrings.Extensions),
       icon: 'icons/extensions.svg',
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
@@ -116,6 +134,7 @@ const getActivityBarItems = () => {
     // Bottom
     {
       id: 'Settings',
+      title: I18nString.i18nString(UiStrings.Settings),
       icon: 'icons/settings-gear.svg',
       enabled: true,
       flags: ActivityBarItemFlags.Button,
@@ -332,20 +351,18 @@ export const focusLast = (state) => {
 }
 
 const getPosition = (state, index) => {
-  if (index > state.activityBarItems.length - 2) {
+  const { activityBarItems, top, left, height, itemHeight } = state
+  if (index > activityBarItems.length - 2) {
     // at bottom
     return {
-      x: state.left,
-      y:
-        state.top +
-        state.height -
-        (state.activityBarItems.length - 1 - index) * ACTIVITY_BAR_ITEM_HEIGHT,
+      x: left,
+      y: top + height - (activityBarItems.length - 1 - index) * itemHeight,
     }
   }
   // at top
   return {
-    x: state.left,
-    y: state.top + index * ACTIVITY_BAR_ITEM_HEIGHT,
+    x: left,
+    y: top + index * itemHeight,
   }
 }
 

package/static/{0c1ed12 → e2dcaea}/packages/renderer-worker/src/parts/ViewletEditorCompletion/ViewletEditorCompletion.js

@@ -5,6 +5,7 @@ import * as TextDocument from '../TextDocument/TextDocument.js'
 import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as IconTheme from '../IconTheme/IconTheme.js'
 import * as EditorShowMessage from '../EditorCommand/EditorCommandShowMessage.js'
+import * as EditorCompletionType from '../EditorCompletionType/EditorCompletionType.js'
 
 export const create = (id, uri, top, left, width, height) => {
   console.log({ id, uri, top, left, width, height })
@@ -55,25 +56,18 @@ const getLabel = (item) => {
   return item.label
 }
 
+const EditorCompletionClassNames = {
+  [EditorCompletionType.Property]: 'IconProperty',
+  [EditorCompletionType.Value]: 'IconValue',
+  [EditorCompletionType.Function]: 'IconFunction',
+  [EditorCompletionType.Variable]: 'IconVariable',
+  [EditorCompletionType.Keyword]: 'IconKeyword',
+}
+
+const defaultClassName = 'IconDefault'
+
 const getIconClassName = (item) => {
-  switch (item.kind) {
-    case /* Property */ 1:
-      return 'IconProperty'
-    case /* Value */ 2:
-      return 'IconValue'
-    case /* Function */ 3:
-      return 'IconFunction'
-    case /* Variable */ 4:
-      return 'IconVariable'
-    case /* Keyword */ 5:
-      return 'IconKeyword'
-    case /* Folder */ 6:
-      return IconTheme.getFolderIcon({ name: item.label })
-    case /* File */ 7:
-      return IconTheme.getFileIcon({ name: item.label })
-    default:
-      return 'IconDefault'
-  }
+  return EditorCompletionClassNames[item.kind] || defaultClassName
 }
 
 const getVisibleItems = (filteredItems) => {