@lvce-editor/server 0.0.30 → 0.0.33

package/static/{56ac02a → b576f0e}/packages/renderer-worker/src/parts/ViewletEditorText/ViewletEditorText.ipc.js

@@ -19,6 +19,7 @@ const lazyCommand = (importFn, key) => {
 const Imports = {
   ApplyEdit: () => import('../EditorCommand/EditorCommandApplyEdit.js'),
   Blur: () => import('../EditorCommand/EditorCommandBlur.js'),
+  BraceCompletion:()=>import('../EditorCommand/EditorCommandBraceCompletion.js'),
   CancelSelection: () => import('../EditorCommand/EditorCommandCancelSelection.js'),
   ContextMenu:()=>import('../EditorCommand/EditorCommandHandleContextMenu.js'),
   CopyLineDown:()=>import('../EditorCommand/EditorCommandCopyLineDown.js'),
@@ -54,8 +55,8 @@ const Imports = {
   HandleMouseMove:()=>import('../EditorCommand/EditorCommandHandleMouseMove.js'),
   HandleMouseMoveWithAltKey:()=>import('../EditorCommand/EditorCommandHandleMouseMoveWithAltKey.js'),
   HandleNativeSelectionChange:()=>import('../EditorCommand/EditorCommandHandleNativeSelectionChange.js'),
-  HandleScrollBarClick:()=>import('../EditorCommand/EditorCommandHandleScrollBarMove.js'),
-  HandleScrollBarMove:()=>import('../EditorCommand/EditorCommandHandleScrollBarClick.js'),
+  HandleScrollBarClick:()=>import('../EditorCommand/EditorCommandHandleScrollBarClick.js'),
+  HandleScrollBarMove:()=>import('../EditorCommand/EditorCommandHandleScrollBarMove.js'),
   HandleSingleClick:()=>import('../EditorCommand/EditorCommandHandleSingleClick.js'),
   HandleTab:()=>import('../EditorCommand/EditorCommandHandleTab.js'),
   HandleTouchEnd:()=>import('../EditorCommand/EditorCommandHandleTouchEnd.js'),
@@ -87,13 +88,13 @@ const Imports = {
   SetDecorations:()=>import('../EditorCommand/EditorCommandSetDecorations.js'),
   SetDeltaY:()=>import('../EditorCommand/EditorCommandSetDeltaY.js'),
   SetLanguageId:()=>import('../EditorCommand/EditorCommandSetLanguageId.js'),
+  SortLinesAscending:()=>import('../EditorCommand/EditorCommandSortLinesAscending.js'),
   TabCompletion:()=>import('../EditorCommand/EditorCommandTabCompletion.js'),
   ToggleBlockComment:()=>import('../EditorCommand/EditorCommandToggleBlockComment.js'),
   ToggleComment:()=>import('../EditorCommand/EditorCommandToggleComment.js'),
   Type:()=>import('../EditorCommand/EditorCommandType.js'),
   Undo:()=>import('../EditorCommand/EditorCommandUndo.js'),
   UnIndent:()=>import('../EditorCommand/EditorCommandUnindent.js'),
-  BraceCompletion:()=>import('../EditorCommand/EditorCommandBraceCompletion.js'),
 }
 
 // prettier-ignore
@@ -175,12 +176,13 @@ export const Commands = {
   'Editor.setDecorations': lazyCommand(Imports.SetDecorations, 'setDecorations'),
   'Editor.setDeltaY': lazyCommand(Imports.SetDeltaY, 'editorSetDeltaY'),
   'Editor.setLanguageId': lazyCommand(Imports.SetLanguageId, 'setLanguageId'),
+  'Editor.sortLinesAscending': lazyCommand(Imports.SortLinesAscending, 'sortLinesAscending'),
   'Editor.tabCompletion': lazyCommand(Imports.TabCompletion, 'editorTabCompletion'),
   'Editor.toggleBlockComment': lazyCommand(Imports.ToggleBlockComment, 'editorToggleBlockComment'),
   'Editor.toggleComment': lazyCommand(Imports.ToggleComment, 'editorToggleComment'),
   'Editor.type': lazyCommand(Imports.Type, 'editorType'),
   'Editor.undo': lazyCommand(Imports.Undo, 'editorUndo'),
-  'Editor.unindent': lazyCommand(Imports.UnIndent, 'editorUnindent')
+  'Editor.unindent': lazyCommand(Imports.UnIndent, 'editorUnindent'),
     // TODO command to set cursor position
   // TODO command copy line up/down
   // TODO command move line up/down

package/static/{56ac02a → b576f0e}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorer.js

@@ -13,8 +13,6 @@ import * as Workspace from '../Workspace/Workspace.js'
 // viewlet: creating | refreshing | done | disposed
 // TODO recycle viewlets (maybe)
 
-const ITEM_HEIGHT = 22 // TODO handle zoom
-
 export const name = 'Explorer'
 
 const getParentStartIndex = (dirents, index) => {
@@ -119,6 +117,7 @@ export const create = (id, uri, left, top, width, height) => {
     pathSeparator: '',
     version: 0,
     editingIndex: -1,
+    itemHeight: 22,
   }
 }
 
@@ -130,11 +129,12 @@ export const loadContent = async (state) => {
   const root = Workspace.state.workspacePath
   const pathSeparator = await getPathSeparator(root) // TODO only load path separator once
   const dirents = await getTopLevelDirents(root, pathSeparator)
+  const { itemHeight, height } = state
   return {
     ...state,
     root,
     dirents,
-    maxLineY: Math.round(state.height / ITEM_HEIGHT),
+    maxLineY: Math.round(height / itemHeight),
     pathSeparator,
   }
 }
@@ -217,16 +217,17 @@ const getVisible = (state) => {
 }
 
 export const setDeltaY = (state, deltaY) => {
+  const { itemHeight, height, dirents } = state
   if (deltaY < 0) {
     deltaY = 0
-  } else if (deltaY > state.dirents.length * ITEM_HEIGHT - state.height) {
-    deltaY = Math.max(state.dirents.length * ITEM_HEIGHT - state.height, 0)
+  } else if (deltaY > dirents.length * itemHeight - height) {
+    deltaY = Math.max(dirents.length * itemHeight - height, 0)
   }
   if (state.deltaY === deltaY) {
     return state
   }
-  const minLineY = Math.round(deltaY / ITEM_HEIGHT)
-  const maxLineY = minLineY + Math.round(state.height / ITEM_HEIGHT)
+  const minLineY = Math.round(deltaY / itemHeight)
+  const maxLineY = minLineY + Math.round(height / itemHeight)
   return {
     ...state,
     deltaY,
@@ -239,15 +240,20 @@ export const handleWheel = (state, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY)
 }
 
-export const handleContextMenu = async (state, x, y, index) => {
-  state.focusedIndex = index
+export const handleContextMenu = async (state, x, y, index, button) => {
+  if (button === -1) {
+    index = state.focusedIndex
+  }
   await Command.execute(
     /* ContextMenu.show */ 'ContextMenu.show',
     /* x */ x,
     /* y */ y,
     /* id */ 'explorer'
   )
-  return state
+  return {
+    ...state,
+    focusedIndex: index,
+  }
 }
 
 export const getFocusedDirent = (state) => {
@@ -503,8 +509,21 @@ export const copyPath = async (state) => {
   await Command.execute(/* ClipBoard.writeText */ 241, /* text */ path)
 }
 
+const getContaingingFolder = (root, dirents, focusedIndex, pathSeparator) => {
+  if (focusedIndex < 0) {
+    return root
+  }
+  const dirent = dirents[focusedIndex]
+  const direntPath = dirent.path
+  const direntParentPath = direntPath.slice(0, -(dirent.name.length + 1))
+  const path = `${direntParentPath}`
+  return path
+}
+
 export const openContainingFolder = async (state) => {
-  await Command.execute('Open.openNativeFolder', /* path */ state.root)
+  const { focusedIndex, root, dirents, pathSeparator } = state
+  const path = getContaingingFolder(root, dirents, focusedIndex, pathSeparator)
+  await Command.execute('Open.openNativeFolder', /* path */ path)
   return state
 }
 
@@ -758,10 +777,36 @@ export const focusNone = (state) => {
 }
 
 export const handleClickCurrent = (state) => {
-  return handleClick(state, state.focusedIndex)
+  return handleClick(state, state.focusedIndex - state.minLineY)
 }
 
 export const focusIndex = (state, index) => {
+  if (index < state.minLineY) {
+    if (index < 0) {
+      return {
+        ...state,
+        focusedIndex: index,
+        focused: true,
+      }
+    }
+    const diff = state.maxLineY - state.minLineY
+    return {
+      ...state,
+      focusedIndex: index,
+      focused: true,
+      minLineY: index,
+      maxLineY: index + diff,
+    }
+  } else if (index >= state.maxLineY) {
+    const diff = state.maxLineY - state.minLineY
+    return {
+      ...state,
+      focusedIndex: index,
+      focused: true,
+      minLineY: index + 1 - diff,
+      maxLineY: index + 1,
+    }
+  }
   return {
     ...state,
     focusedIndex: index,
@@ -948,13 +993,14 @@ export const handleMouseEnter = async (state, index) => {
     // TODO preload content maybe when it is a long hover
     return state
   }
-  const uri = `${state.root}${dirent.path}`
-  const top = state.top + index * ITEM_HEIGHT
-  const right = state.left
+  const { top, itemHeight, left, root } = state
+  const uri = `${root}${dirent.path}`
+  const newTop = top + index * itemHeight
+  const right = left
   await Command.execute(
     /* ImagePreview.show */ 9081,
     /* uri */ uri,
-    /* top */ top,
+    /* top */ newTop,
     /* right */ right
   )
 }
@@ -1107,7 +1153,8 @@ export const handlePaste = async (state) => {
 export const hasFunctionalResize = true
 
 export const resize = (state, dimensions) => {
-  const maxLineY = state.minLineY + Math.round(dimensions.height / ITEM_HEIGHT)
+  const { minLineY, itemHeight } = state
+  const maxLineY = minLineY + Math.round(dimensions.height / itemHeight)
   return {
     ...state,
     ...dimensions,
@@ -1415,8 +1462,12 @@ const renderFocusedIndex = {
     )
   },
   apply(oldState, newState) {
-    const oldFocusedIndex = oldState.focused ? oldState.focusedIndex : -2
-    const newFocusedIndex = newState.focused ? newState.focusedIndex : -2
+    const oldFocusedIndex = oldState.focused
+      ? oldState.focusedIndex - oldState.minLineY
+      : -2
+    const newFocusedIndex = newState.focused
+      ? newState.focusedIndex - newState.minLineY
+      : -2
     return [
       /* Viewlet.send */ 'Viewlet.send',
       /* id */ 'Explorer',

package/static/{56ac02a → b576f0e}/packages/renderer-worker/src/parts/ViewletMain/ViewletMain.js

@@ -66,10 +66,13 @@ const restoreEditors = async (state) => {
   //   Command.execute(/* Developer.openPerf */ 820)
   //   return
   // }
+  // @ts-ignore
   await openUri(state, restoredEditor.uri)
 }
 
 const handleTokenizeChange = (languageId) => {
+  // @ts-ignore
+
   const instances = ViewletState.getAllInstances()
   if (instances.EditorText) {
     const instance = instances.EditorText
@@ -171,6 +174,8 @@ const getRestoredEditors = async () => {
 
 export const loadContent = async (state) => {
   const editors = await getRestoredEditors()
+  // @ts-ignore
+
   LifeCycle.once(LifeCycle.PHASE_TWELVE, hydrateLazy)
   return {
     ...state,
@@ -208,6 +213,8 @@ export const contentLoaded = async (state) => {
     /* tabTitle */ tabTitle
   )
   // TODO race condition: Viewlet may have been resized before it has loaded
+  // @ts-ignore
+
   await ViewletManager.load(instance)
 }
 
@@ -231,6 +238,8 @@ export const openUri = async (state, uri) => {
         width,
         height
       )
+      // @ts-ignore
+
       await ViewletManager.load(instance)
       return
     }
@@ -259,6 +268,8 @@ export const openUri = async (state, uri) => {
     /* tabTitle */ tabTitle,
     /* oldActiveIndex */ oldActiveIndex
   )
+  // @ts-ignore
+
   return ViewletManager.load(instance)
 }
 
@@ -417,6 +428,7 @@ export const focusIndex = (state, index) => {
     /* unFocusIndex */ oldActiveIndex,
     /* focusIndex */ state.activeIndex
   )
+  // @ts-ignore
   return ViewletManager.load(viewlet)
 }
 

package/static/{56ac02a → b576f0e}/packages/renderer-worker/src/parts/ViewletManager/ViewletManager.js

@@ -161,10 +161,17 @@ export const load = async (viewlet, focus = false) => {
     }
     state = ViewletState.ContentLoaded
 
-    await RendererProcess.invoke(
-      /* Viewlet.load */ 'Viewlet.load',
-      /* id */ viewlet.id
-    )
+    if (viewlet.show === false) {
+      await RendererProcess.invoke(
+        /* Viewlet.load */ 'Viewlet.loadModule',
+        /* id */ viewlet.id
+      )
+    } else {
+      await RendererProcess.invoke(
+        /* Viewlet.load */ 'Viewlet.load',
+        /* id */ viewlet.id
+      )
+    }
     if (viewlet.disposed) {
       // TODO unload the module from renderer process
       return
@@ -206,6 +213,13 @@ export const load = async (viewlet, focus = false) => {
       } else {
         commands = module.render(viewletState, newState)
       }
+      if (viewlet.show === false) {
+        return [
+          ['Viewlet.create', viewlet.id],
+          ...commands,
+          ['Viewlet.show', viewlet.id],
+        ]
+      }
       await RendererProcess.invoke(
         /* Viewlet.sendMultiple */ 'Viewlet.sendMultiple',
         /* commands */ commands

package/static/{56ac02a → b576f0e}/packages/renderer-worker/src/parts/ViewletQuickPick/ViewletQuickPick.ipc.js

@@ -12,6 +12,7 @@ export const Commands = {
   'QuickPick.focusNext': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.focusNext),
   'QuickPick.handleBlur': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.handleBlur),
   'QuickPick.handleBeforeInput': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.handleBeforeInput),
+  'QuickPick.handleWheel': Viewlet.wrapViewletCommand('QuickPick', ViewletQuickPick.handleWheel),
 }
 
 export * from './ViewletQuickPick.js'