@lvce-editor/quick-pick-worker 4.22.1 → 4.22.3

package/dist/quickPickWorkerMain.js

@@ -1959,7 +1959,7 @@ const getScrollBarTop = (state, scrollBarHeight) => {
 const getRelativePointerY = (state, clientY) => {
   return clientY - state.top - state.headerHeight;
 };
-const setDeltaY = async (state, deltaY) => {
+const setDeltaY = async (state, deltaY, force = false) => {
   object(state);
   number(deltaY);
   const {
@@ -1976,17 +1976,18 @@ const setDeltaY = async (state, deltaY) => {
   } else if (deltaY > finalDeltaY) {
     deltaY = Math.max(finalDeltaY, 0);
   }
-  if (state.deltaY === deltaY) {
+  if (state.deltaY === deltaY && !force) {
     return state;
   }
   const minLineY = Math.round(deltaY / itemHeight);
   const maxLineY = minLineY + Math.round(listHeight / itemHeight);
   number(minLineY);
   number(maxLineY);
+  const fileIconCache = force ? {} : state.fileIconCache;
   const {
     icons,
     newFileIconCache
-  } = await getQuickPickFileIcons(items.slice(minLineY, maxLineY), state.fileIconCache);
+  } = await getQuickPickFileIcons(items.slice(minLineY, maxLineY), fileIconCache);
   return {
     ...state,
     deltaY,
@@ -3188,7 +3189,7 @@ const getPicksGoToColumn = async value => {
       direntType: 0,
       fileIcon: '',
       icon: '',
-      label: pressEnterToGoToLine(position.row, position.column),
+      label: pressEnterToGoToLine(position.row + 1, position.column + 1),
       matches: [],
       uri: ''
     }];
@@ -3245,7 +3246,7 @@ const getPicks$a = async value => {
       direntType: 0,
       fileIcon: '',
       icon: '',
-      label: pressEnterToGoToLine(position.rowIndex, position.columnIndex),
+      label: pressEnterToGoToLine(position.rowIndex + 1, position.columnIndex + 1),
       matches: [],
       uri: ''
     }];
@@ -3418,6 +3419,10 @@ const decodePath = path => {
 const getRemoteSshPathStart = uri => {
   return uri.indexOf('/', remoteSshScheme.length);
 };
+const getRemoteSshAuthority = uri => {
+  const pathStart = getRemoteSshPathStart(uri);
+  return uri.slice(remoteSshScheme.length, pathStart === -1 ? uri.length : pathStart);
+};
 const getPath = uri => {
   if (uri.startsWith(fileScheme)) {
     return decodePath(uri.slice(fileScheme.length));
@@ -3436,37 +3441,32 @@ const getPath = uri => {
   }
   return uri;
 };
-const getLabel = uri => {
+const toProtoVisibleItem = uri => {
   const path = getPath(uri);
-  if (path === '/' && uri.startsWith(remoteSshScheme)) {
-    const pathStart = getRemoteSshPathStart(uri);
-    return uri.slice(remoteSshScheme.length, pathStart === -1 ? uri.length : pathStart);
-  }
+  const isRemoteSsh = uri.startsWith(remoteSshScheme);
+  const authority = isRemoteSsh ? getRemoteSshAuthority(uri) : '';
+  let folderName = path;
   if (path.startsWith('/')) {
-    return pathBaseName(path);
+    folderName = pathBaseName(path);
   }
-  return path;
-};
-const getDescription = uri => {
-  const path = getPath(uri);
+  if (path === '/' && isRemoteSsh) {
+    folderName = authority;
+  }
+  let description = '';
   if (path.startsWith('/')) {
-    const directory = pathDirName(path);
-    if (uri.startsWith(remoteSshScheme)) {
-      const pathStart = getRemoteSshPathStart(uri);
-      const authority = pathStart === -1 ? uri : uri.slice(0, pathStart);
-      return `${authority}${path === '/' ? '/' : directory}`;
-    }
-    return directory;
+    description = pathDirName(path);
   }
-  return '';
-};
-const toProtoVisibleItem = uri => {
+  if (path === '/' && isRemoteSsh) {
+    description = '/';
+  }
+  const label = isRemoteSsh ? `${folderName} [SSH: ${authority}]` : folderName;
   return {
-    description: getDescription(uri),
+    description,
     direntType: Directory,
     fileIcon: '',
     icon: '',
-    label: getLabel(uri),
+    iconName: isRemoteSsh ? folderName : undefined,
+    label,
     matches: [],
     uri
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/quick-pick-worker",
-  "version": "4.22.1",
+  "version": "4.22.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/quick-pick-worker.git"