@lvce-editor/quick-pick-worker 4.22.2 → 4.23.0

package/dist/quickPickWorkerMain.js

@@ -3419,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));
@@ -3437,38 +3441,34 @@ 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: [],
+    removeButton: true,
     uri
   };
 };
@@ -3970,20 +3970,6 @@ const getIndex = (top, headerHeight, itemHeight, y) => {
   return index;
 };
 
-const getPick = (items, index) => {
-  array(items);
-  number(index);
-  // if (index < state.recentPicks.length) {
-  //   return state.recentPicks[index]
-  // }
-  // index -= state.recentPicks.length
-  if (index < items.length) {
-    return items[index];
-  }
-  console.warn('no pick matching index', index);
-  return undefined;
-};
-
 const Commands = 'quickPick://commands';
 const EveryThing = 'quickPick://everything';
 const Recent = 'quickPick://recent';
@@ -4172,6 +4158,20 @@ const loadContentWithContext = async context => {
   notifyVisible();
 };
 
+const getPick = (items, index) => {
+  array(items);
+  number(index);
+  // if (index < state.recentPicks.length) {
+  //   return state.recentPicks[index]
+  // }
+  // index -= state.recentPicks.length
+  if (index < items.length) {
+    return items[index];
+  }
+  console.warn('no pick matching index', index);
+  return undefined;
+};
+
 const createCustomPick = value => {
   return {
     description: '',
@@ -4257,7 +4257,18 @@ const selectIndex = async (state, index, button = /* left */0) => {
   // }
 };
 
-const handleClickAt = (state, x, y) => {
+const handleClickAt = async (state, x, y, uri) => {
+  if (uri) {
+    if (state.providerId !== Recent$1 || state.items.every(item => item.uri !== uri)) {
+      return state;
+    }
+    await invoke$3('RecentlyOpened.removeRecentlyOpened', uri);
+    const next = await loadContent({
+      ...state,
+      value: ''
+    });
+    return state.value ? setValue(next, state.value) : next;
+  }
   const {
     headerHeight,
     itemHeight,
@@ -4929,7 +4940,9 @@ const getQuickPickItemVirtualDom = visibleItem => {
     isActive,
     label,
     posInSet,
-    setSize
+    removeButton,
+    setSize,
+    uri
   } = visibleItem;
   const dom = [{
     ariaPosInSet: posInSet,
@@ -4965,6 +4978,17 @@ const getQuickPickItemVirtualDom = visibleItem => {
       type: Div
     }, text(description));
   }
+  if (removeButton) {
+    parent.childCount++;
+    dom.push({
+      ariaLabel: 'Remove from Recently Opened',
+      childCount: 1,
+      className: 'QuickPickItemRemove',
+      'data-uri': uri,
+      title: 'Remove from Recently Opened',
+      type: Button
+    }, text('×'));
+  }
   return dom;
 };
 
@@ -5155,7 +5179,7 @@ const render2 = (uid, diffResult) => {
 const renderEventListeners = () => {
   return [{
     name: HandlePointerDown,
-    params: ['handleClickAt', 'event.clientX', 'event.clientY'],
+    params: ['handleClickAt', 'event.clientX', 'event.clientY', 'event.target.dataset.uri'],
     preventDefault: true
   }, {
     name: HandleWheel,

package/package.json

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