@lvce-editor/server 0.5.0 → 0.6.0

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorerHandleContextMenuKeyboard.js

@@ -1,4 +1,5 @@
 import * as Command from '../Command/Command.js'
+import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 
 export const handleContextMenuKeyboard = async (state) => {
   const { focusedIndex, left, top, minLineY, itemHeight } = state
@@ -8,7 +9,7 @@ export const handleContextMenuKeyboard = async (state) => {
     /* ContextMenu.show */ 'ContextMenu.show',
     /* x */ x,
     /* y */ y,
-    /* id */ 'explorer'
+    /* id */ MenuEntryId.Explorer
   )
   return state
 }

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorerHandleContextMenuMouseAt.js

@@ -1,6 +1,7 @@
 import * as Assert from '../Assert/Assert.js'
 import * as Command from '../Command/Command.js'
 import { getIndexFromPosition } from './ViewletExplorerShared.js'
+import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 
 export const handleContextMenuMouseAt = async (state, x, y) => {
   Assert.number(x)
@@ -10,7 +11,7 @@ export const handleContextMenuMouseAt = async (state, x, y) => {
     /* ContextMenu.show */ 'ContextMenu.show',
     /* x */ x,
     /* y */ y,
-    /* id */ 'explorer'
+    /* id */ MenuEntryId.Explorer
   )
   return {
     ...state,

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorerHandleDropRoot.js

@@ -38,13 +38,17 @@ const handleDropRootElectron = async (state, files) => {
   }
 }
 
-const handleDropRootDefault = async (state, files) => {
-  const { root, pathSeparator, dirents } = state
+const uploadFiles = async (root, pathSeparator, files) => {
   for (const file of files) {
     const content = await Command.execute('Blob.blobToBinaryString', file)
     const to = Path.join(pathSeparator, root, file.name)
     await FileSystem.writeFile(to, content, 'binary')
   }
+}
+
+const handleDropRootDefault = async (state, files) => {
+  const { root, pathSeparator, dirents } = state
+  await uploadFiles(root, pathSeparator, files)
   const mergedDirents = await getMergedDirents(root, pathSeparator, dirents)
   return {
     ...state,

package/static/fbac85f/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorerHandlePaste.js

@@ -0,0 +1,77 @@
+import * as Command from '../Command/Command.js'
+import * as FileSystem from '../FileSystem/FileSystem.js'
+import { getBaseName } from '../Path/Path.js'
+import * as Viewlet from '../Viewlet/Viewlet.js' // TODO should not import viewlet manager -> avoid cyclic dependency
+import { updateRoot } from './ViewletExplorerUpdateRoot.js'
+import * as Path from '../Path/Path.js'
+
+const handlePasteNone = (state, nativeFiles) => {
+  console.info('[ViewletExplorer/handlePaste] no paths detected')
+  return state
+}
+const handlePasteCopy = async (state, nativeFiles) => {
+  // TODO handle pasting files into nested folder
+  // TODO handle pasting files into symlink
+  // TODO handle pasting files into broken symlink
+  // TODO handle pasting files into hardlink
+  // TODO what if folder is big and it takes a long time
+  for (const source of nativeFiles.files) {
+    const target = Path.join(
+      state.pathSeperator,
+      state.root,
+      getBaseName(state.pathSeparator, source)
+    )
+    await FileSystem.copy(source, target)
+  }
+  const stateNow = Viewlet.getState('Explorer')
+  if (stateNow.disposed) {
+    return
+  }
+  // TODO only update folder at which level it changed
+  return updateRoot()
+}
+
+const handlePasteCut = async (state, nativeFiles) => {
+  for (const source of nativeFiles.files) {
+    const target = `${state.root}${state.pathSeparator}${getBaseName(
+      state.pathSeparator,
+      source
+    )}`
+    await FileSystem.rename(source, target)
+  }
+  return state
+}
+
+const NativeFileTypes = {
+  None: 'none',
+  Copy: 'copy',
+  Cut: 'cut',
+}
+
+export const handlePaste = async (state) => {
+  const nativeFiles = await Command.execute(
+    /* ClipBoard.readNativeFiles */ 'ClipBoard.readNativeFiles'
+  )
+  // TODO detect cut/paste event, not sure if that is possible
+  // TODO check that pasted folder is not a parent folder of opened folder
+  // TODO support pasting multiple paths
+  // TODO what happens when pasting multiple paths, but some of them error?
+  // how many error messages should be shown? Should the operation be undone?
+  // TODO what if it is a large folder and takes a long time to copy? Should show progress
+  // TODO what if there is a permission error? Probably should show a modal to ask for permission
+  // TODO if error is EEXISTS, just rename the copy (e.g. file-copy-1.txt, file-copy-2.txt)
+  // TODO actual target should be selected folder
+  // TODO but what if a file is currently selected? Then maybe the parent folder
+  // TODO but will it work if the folder is a symlink?
+  // TODO handle error gracefully when copy fails
+  switch (nativeFiles.type) {
+    case NativeFileTypes.None:
+      return handlePasteNone(state, nativeFiles)
+    case NativeFileTypes.Copy:
+      return handlePasteCopy(state, nativeFiles)
+    case NativeFileTypes.Cut:
+      return handlePasteCut(state, nativeFiles)
+    default:
+      throw new Error(`unexpected native paste type: ${nativeFiles.type}`)
+  }
+}

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorerShared.js

@@ -114,3 +114,14 @@ export const mergeDirents = (oldDirents, newDirents) => {
   }
   return merged
 }
+
+export const getTopLevelDirents = (root, pathSeparator) => {
+  if (!root) {
+    return []
+  }
+  return getChildDirents(root, pathSeparator, {
+    depth: 0,
+    path: root,
+    type: DirentType.Directory,
+  })
+}

package/static/fbac85f/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorerUpdateRoot.js

@@ -0,0 +1,26 @@
+import * as Viewlet from '../Viewlet/Viewlet.js'
+import { getTopLevelDirents, mergeDirents } from './ViewletExplorerShared.js'
+
+// TODO add lots of tests for this
+export const updateRoot = async () => {
+  const state1 = Viewlet.getState('Explorer')
+  if (state1.disposed) {
+    return state1
+  }
+  // const file = nativeFiles.files[0]
+  const topLevelDirents = await getTopLevelDirents(
+    state1.root,
+    state1.pathSeparator
+  )
+  const state2 = Viewlet.getState('Explorer')
+  // TODO what if root changes while reading directories?
+  if (state2.disposed || state2.root !== state1.root) {
+    return state2
+  }
+  const newDirents = mergeDirents(state2.dirents, topLevelDirents)
+  const state3 = {
+    ...state2,
+    dirents: newDirents,
+  }
+  return state3
+}

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletExtensions/ViewletExtensions.js

@@ -11,7 +11,7 @@ import {
   ITEM_HEIGHT,
   MINIMUM_SLIDER_SIZE,
 } from './ViewletExtensionsShared.js'
-
+import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 const SUGGESTIONS = [
   '@builtin',
   '@disabled',
@@ -460,7 +460,7 @@ export const handleContextMenu = async (state, x, y, index) => {
     /* ContextMenu.show */ 'ContextMenu.show',
     /* x */ x,
     /* y */ y,
-    /* id */ 'manageExtension'
+    /* id */ MenuEntryId.ManageExtension
   )
   return state
 }

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletKeyBindings/ViewletKeyBindingsRender.js

@@ -1,5 +1,13 @@
-import * as VirtualDomElements from '../VirtualDomElements/VirtualDomElements.js'
-import { text, h } from '../VirtualDomHelpers/VirtualDomHelpers.js'
+import {
+  kbd,
+  table,
+  tbody,
+  td,
+  text,
+  th,
+  thead,
+  tr,
+} from '../VirtualDomHelpers/VirtualDomHelpers.js'
 
 /**
  * @enum {string}
@@ -11,6 +19,7 @@ const ClassNames = {
   KeyBindingsTable: 'KeyBindingsTable',
   KeyBindingsTableHead: 'KeyBindingsTableHead',
   KeyBindingsTableBody: 'KeyBindingsTableBody',
+  KeyBindingsHeader: 'KeyBindingsHeader',
 }
 
 /**
@@ -22,10 +31,10 @@ const UiStrings = {
   When: 'When',
   Key: 'Key',
   EmptyString: '',
+  SearchKeyBindings: 'Search Key Bindings',
 }
 
-const kbd = h(
-  VirtualDomElements.Kbd,
+const kbdDom = kbd(
   {
     className: ClassNames.Key,
   },
@@ -38,14 +47,14 @@ const getKeyBindingCellChildren = (keyBinding) => {
   let childCount = 0
   if (keyBinding.isCtrl) {
     childCount += 2
-    children.push(kbd, text('Ctrl'), text('+'))
+    children.push(kbdDom, text('Ctrl'), text('+'))
   }
   if (keyBinding.isShift) {
     childCount += 2
-    children.push(kbd, text('Shift'), text('+'))
+    children.push(kbdDom, text('Shift'), text('+'))
   }
   childCount++
-  children.push(kbd, text(keyBinding.key))
+  children.push(kbdDom, text(keyBinding.key))
   return { children, childCount }
 }
 
@@ -53,13 +62,12 @@ const tableCellProps = {
   className: ClassNames.KeyBindingsTableCell,
 }
 
-const tableCell = h(VirtualDomElements.Td, tableCellProps, 1)
+const tableCell = td(tableCellProps, 1)
 
 const getTableRowDom = (keyBinding) => {
   const { children, childCount } = getKeyBindingCellChildren(keyBinding)
   return [
-    h(
-      VirtualDomElements.Tr,
+    tr(
       {
         ariaRowIndex: keyBinding.rowIndex,
         className: ClassNames.KeyBindingsTableRow,
@@ -68,23 +76,21 @@ const getTableRowDom = (keyBinding) => {
     ),
     tableCell,
     text(keyBinding.command),
-    h(VirtualDomElements.Td, tableCellProps, childCount),
+    td(tableCellProps, childCount),
     ...children,
     tableCell,
     text(keyBinding.when || UiStrings.EmptyString),
   ]
 }
 
-const tableHead = h(
-  VirtualDomElements.THead,
+const tableHead = thead(
   {
     className: ClassNames.KeyBindingsTableHead,
   },
   1
 )
 
-const tableHeadRow = h(
-  VirtualDomElements.Tr,
+const tableHeadRow = tr(
   {
     className: ClassNames.KeyBindingsTableRow,
     ariaRowIndex: 1,
@@ -92,7 +98,7 @@ const tableHeadRow = h(
   3
 )
 
-const tableHeading = h(VirtualDomElements.Th, tableCellProps, 1)
+const tableHeading = th(tableCellProps, 1)
 
 const tableHeadDom = [
   tableHead,
@@ -107,8 +113,7 @@ const tableHeadDom = [
 
 const getTableBodyDom = (displayKeyBindings) => {
   return [
-    h(
-      VirtualDomElements.TBody,
+    tbody(
       {
         className: ClassNames.KeyBindingsTableBody,
       },
@@ -120,8 +125,7 @@ const getTableBodyDom = (displayKeyBindings) => {
 
 const getTableDom = (filteredKeyBindings, displayKeyBindings) => {
   const tableDom = [
-    h(
-      VirtualDomElements.Table,
+    table(
       {
         className: ClassNames.KeyBindingsTable,
         ariaLabel: UiStrings.KeyBindings,
@@ -152,6 +156,23 @@ const getVisible = (filteredKeyBindings, minLineY, maxLineY) => {
   return visibleKeyBindings
 }
 
+// const getDom = () => {
+//   return [
+//     div({}, 2),
+//     div({ className: ClassNames.KeyBindingsHeader }, 1),
+//     input(
+//       {
+//         type: 'search',
+//         placeholder: UiStrings.SearchKeyBindings,
+//         on: {
+//           input: 'ViewletKeyBindings.handleInput',
+//         },
+//       },
+//       0
+//     ),
+//   ]
+// }
+
 const renderKeyBindings = {
   isEqual(oldState, newState) {
     return (

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletMain/ViewletMain.js

@@ -12,6 +12,7 @@ import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as Workspace from '../Workspace/Workspace.js'
 import * as Arrays from '../Arrays/Arrays.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 
 const COLUMN_WIDTH = 9 // TODO compute this automatically once
 
@@ -94,8 +95,6 @@ const handleTokenizeChange = (languageId) => {
 }
 
 const hydrateLazy = async () => {
-  // TODO main should not know about languages
-  await Languages.hydrate()
   // TODO this should be in extension host
   await Command.execute(
     /* EditorDiagnostics.hydrate */ 'EditorDiagnostics.hydrate'
@@ -179,7 +178,6 @@ const getRestoredEditors = async () => {
 
 export const loadContent = async (state) => {
   const editors = await getRestoredEditors()
-  console.log({ editors })
   // @ts-ignore
 
   LifeCycle.once(LifeCycle.PHASE_TWELVE, hydrateLazy)
@@ -409,7 +407,7 @@ export const handleTabContextMenu = async (state, index, x, y) => {
     /* ContextMenu.show */ 'ContextMenu.show',
     /* x */ x,
     /* y */ y,
-    /* id */ 'tab'
+    /* id */ MenuEntryId.Tab
   )
 }
 

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletManager/ViewletManager.js

@@ -81,13 +81,26 @@ export const load = async (viewlet, focus = false) => {
       }
     }
     state = ViewletState.ModuleLoaded
+
+    let left = viewlet.left
+    let top = viewlet.top
+    let width = viewlet.width
+    let height = viewlet.height
+    if (module.getPosition) {
+      const position = module.getPosition()
+      left = position.left
+      top = position.top
+      width = position.width
+      height = position.height
+    }
+
     const viewletState = module.create(
       viewlet.id,
       viewlet.uri,
-      viewlet.left,
-      viewlet.top,
-      viewlet.width,
-      viewlet.height
+      left,
+      top,
+      width,
+      height
     )
 
     const oldVersion =
@@ -160,11 +173,22 @@ export const load = async (viewlet, focus = false) => {
         commands = module.render(viewletState, newState)
       }
       if (viewlet.show === false) {
-        return [
+        const allCommands = [
           ['Viewlet.create', viewlet.id],
           ...commands,
           ['Viewlet.show', viewlet.id],
         ]
+        if (module.getPosition) {
+          allCommands.splice(1, 0, [
+            'Viewlet.setBounds',
+            viewlet.id,
+            left,
+            top,
+            width,
+            height,
+          ])
+        }
+        return allCommands
       }
       await RendererProcess.invoke(
         /* Viewlet.sendMultiple */ 'Viewlet.sendMultiple',

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletModule/ViewletModule.js

@@ -52,6 +52,8 @@ export const load = (moduleId) => {
       return import('../ViewletQuickPick/ViewletQuickPick.ipc.js')
     case ViewletModuleId.KeyBindings:
       return import('../ViewletKeyBindings/ViewletKeyBindings.ipc.js')
+    case ViewletModuleId.EditorFindWidget:
+      return import('../ViewletEditorFindWidget/ViewletEditorFindWidget.ipc.js')
     default:
       throw new Error(`unknown module "${moduleId}"`)
   }

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletModuleId/ViewletModuleId.js

@@ -47,3 +47,5 @@ export const StatusBar = 'StatusBar'
 export const Terminal = 'Terminal'
 
 export const TitleBar = 'TitleBar'
+
+export const EditorFindWidget = 'EditorFindWidget'

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletQuickPick/ViewletQuickPick.ipc.js

@@ -25,6 +25,7 @@ export const Commands = {
   'QuickPick.selectCurrentIndex': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.selectCurrentIndex),
   'QuickPick.selectIndex': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.selectIndex),
   'QuickPick.selectItem': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.selectItem),
+  'QuickPick.handleClickAt': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.handleClickAt),
 }
 
 export * from './ViewletQuickPick.js'

package/static/{4d80653 → fbac85f}/packages/renderer-worker/src/parts/ViewletQuickPick/ViewletQuickPick.js

@@ -1,9 +1,9 @@
 import * as Assert from '../Assert/Assert.js'
 import * as FuzzySearch from '../FuzzySearch/FuzzySearch.js'
-import * as QuickPickEveryThing from '../QuickPick/QuickPickEverything.js'
+import * as QuickPickEveryThing from '../QuickPickEntriesEverything/QuickPickEntriesEverything.js'
 import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as InputEventType from '../InputEventType/InputEventType.js'
-import * as QuickPickModule from '../QuickPickModule/QuickPickModule.js'
+import * as QuickPickEntries from '../QuickPickEntries/QuickPickEntries.js'
 
 // TODO send open signal to renderer process before items are ready
 // that way user can already type while items are still loading
@@ -45,6 +45,8 @@ export const create = (id, uri, top, left, width, height) => {
     deltaY: 0,
     itemHeight: 22,
     height: 300,
+    headerHeight: 30,
+    top: 50,
   }
 }
 
@@ -123,7 +125,7 @@ const getDefaultValue = (uri) => {
 export const loadContent = async (state) => {
   const uri = state.uri
   const value = getDefaultValue(uri)
-  const provider = await QuickPickModule.load(uri)
+  const provider = await QuickPickEntries.load(uri)
   const newPicks = await provider.getPicks(value)
   Assert.array(newPicks)
   const filterValue = provider.getFilterValue(value)
@@ -155,20 +157,19 @@ export const dispose = (state) => {
 }
 
 export const handleBlur = async (state) => {
-  console.log('quickpick blur')
   await Viewlet.closeWidget('QuickPick')
   return state
 }
 
-const getPick = (state, index) => {
-  Assert.object(state)
+const getPick = (items, index) => {
+  Assert.array(items)
   Assert.number(index)
   // if (index < state.recentPicks.length) {
   //   return state.recentPicks[index]
   // }
   // index -= state.recentPicks.length
-  if (index < state.items.length) {
-    return state.items[index]
+  if (index < items.length) {
+    return items[index]
   }
   console.warn('no pick matching index', index)
 }
@@ -192,13 +193,10 @@ export const selectItem = (state, label) => {
 }
 
 export const selectIndex = async (state, index, button = /* left */ 0) => {
-  const actualIndex = index + state.minLineY
-  const pick = getPick(state, actualIndex)
-  const selectPickResult = await state.provider.selectPick(
-    pick,
-    actualIndex,
-    button
-  )
+  const { minLineY, provider, items } = state
+  const actualIndex = index + minLineY
+  const pick = getPick(items, actualIndex)
+  const selectPickResult = await provider.selectPick(pick, actualIndex, button)
   Assert.object(selectPickResult)
   Assert.string(selectPickResult.command)
   const { command } = selectPickResult
@@ -207,7 +205,7 @@ export const selectIndex = async (state, index, button = /* left */ 0) => {
       await Viewlet.closeWidget('QuickPick')
       return state
     default:
-      break
+      return state
   }
 
   // TODO recent picks should be per provider
@@ -447,6 +445,13 @@ export const handleWheel = (state, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY)
 }
 
+export const handleClickAt = (state, x, y) => {
+  const { top, headerHeight, itemHeight } = state
+  const relativeY = y - top - headerHeight
+  const index = Math.floor(relativeY / itemHeight)
+  return selectIndex(state, index)
+}
+
 export const hasFunctionalRender = true
 
 const renderValue = {
@@ -534,7 +539,6 @@ const renderFocusedIndex = {
   apply(oldState, newState) {
     const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY
     const newFocusedIndex = newState.focusedIndex - newState.minLineY
-    console.log('focus', oldState.focusedIndex, newState.focusedIndex)
     return [
       /* Viewlet.send */ 'Viewlet.send',
       /* id */ 'QuickPick',