@lvce-editor/quick-pick-worker 4.21.0 → 4.22.0

package/dist/quickPickWorkerMain.js

@@ -1804,6 +1804,87 @@ const getListHeight$1 = (itemsLength, itemHeight, maxHeight) => {
   return Math.min(totalHeight, maxHeight);
 };
 
+const getIconsCached = (paths, fileIconCache) => {
+  return paths.map(path => fileIconCache[path]);
+};
+
+const getMissingIconRequests = (dirents, fileIconCache) => {
+  const missingRequests = [];
+  for (const dirent of dirents) {
+    if (!dirent.path) {
+      continue;
+    }
+    if (!(dirent.path in fileIconCache)) {
+      missingRequests.push({
+        name: dirent.name,
+        path: dirent.path,
+        type: dirent.type
+      });
+    }
+  }
+  return missingRequests;
+};
+
+const getPath$1 = dirent => {
+  return dirent.path;
+};
+
+const None$2 = 0;
+const Directory = 3;
+const File = 7;
+
+const requestFileIcon = async request => {
+  if (!request.name) {
+    return '';
+  }
+  return request.type === File ? getFileIcon({
+    name: request.name
+  }) : getFolderIcon({
+    name: request.name
+  });
+};
+const requestFileIcons = async requests => {
+  const promises = requests.map(requestFileIcon);
+  return Promise.all(promises);
+};
+
+const toDirent = pick => {
+  const dirent = {
+    name: pick.iconName || pick.label,
+    path: pick.uri,
+    type: pick.direntType
+  };
+  return dirent;
+};
+
+const updateIconCache = (iconCache, missingRequests, newIcons) => {
+  if (missingRequests.length === 0) {
+    return iconCache;
+  }
+  const newFileIconCache = {
+    ...iconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    const request = missingRequests[i];
+    const icon = newIcons[i];
+    newFileIconCache[request.path] = icon;
+  }
+  return newFileIconCache;
+};
+
+const getQuickPickFileIcons = async (items, fileIconCache) => {
+  const dirents = items.map(toDirent);
+  const missingRequests = getMissingIconRequests(dirents, fileIconCache);
+  const newIcons = await requestFileIcons(missingRequests);
+  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
+  const paths = dirents.map(getPath$1);
+  const icons = getIconsCached(paths, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
 const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   if (size >= contentSize) {
     return 0;
@@ -1878,7 +1959,7 @@ const getScrollBarTop = (state, scrollBarHeight) => {
 const getRelativePointerY = (state, clientY) => {
   return clientY - state.top - state.headerHeight;
 };
-const setDeltaY = (state, deltaY) => {
+const setDeltaY = async (state, deltaY) => {
   object(state);
   number(deltaY);
   const {
@@ -1902,20 +1983,26 @@ const setDeltaY = (state, deltaY) => {
   const maxLineY = minLineY + Math.round(listHeight / itemHeight);
   number(minLineY);
   number(maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getQuickPickFileIcons(items.slice(minLineY, maxLineY), state.fileIconCache);
   return {
     ...state,
     deltaY,
+    fileIconCache: newFileIconCache,
+    icons,
     maxLineY,
     minLineY
   };
 };
-const handleWheel = (state, deltaMode, deltaY) => {
+const handleWheel = async (state, deltaMode, deltaY) => {
   object(state);
   number(deltaMode);
   number(deltaY);
   return setDeltaY(state, state.deltaY + deltaY);
 };
-const handleScrollBarPointerDown = (state, clientY, pointerId) => {
+const handleScrollBarPointerDown = async (state, clientY, pointerId) => {
   object(state);
   number(clientY);
   number(pointerId);
@@ -1934,7 +2021,7 @@ const handleScrollBarPointerDown = (state, clientY, pointerId) => {
   };
   return handleScrollBarPointerMove(newState, clientY, pointerId);
 };
-const handleScrollBarPointerMove = (state, clientY, pointerId) => {
+const handleScrollBarPointerMove = async (state, clientY, pointerId) => {
   object(state);
   number(clientY);
   number(pointerId);
@@ -2081,87 +2168,6 @@ const focusPick = (id, pick) => {
   return fn(pick);
 };
 
-const getIconsCached = (paths, fileIconCache) => {
-  return paths.map(path => fileIconCache[path]);
-};
-
-const getMissingIconRequests = (dirents, fileIconCache) => {
-  const missingRequests = [];
-  for (const dirent of dirents) {
-    if (!dirent.path) {
-      continue;
-    }
-    if (!(dirent.path in fileIconCache)) {
-      missingRequests.push({
-        name: dirent.name,
-        path: dirent.path,
-        type: dirent.type
-      });
-    }
-  }
-  return missingRequests;
-};
-
-const getPath$1 = dirent => {
-  return dirent.path;
-};
-
-const None$2 = 0;
-const Directory = 3;
-const File = 7;
-
-const requestFileIcon = async request => {
-  if (!request.name) {
-    return '';
-  }
-  return request.type === File ? getFileIcon({
-    name: request.name
-  }) : getFolderIcon({
-    name: request.name
-  });
-};
-const requestFileIcons = async requests => {
-  const promises = requests.map(requestFileIcon);
-  return Promise.all(promises);
-};
-
-const toDirent = pick => {
-  const dirent = {
-    name: pick.iconName || pick.label,
-    path: pick.uri,
-    type: pick.direntType
-  };
-  return dirent;
-};
-
-const updateIconCache = (iconCache, missingRequests, newIcons) => {
-  if (missingRequests.length === 0) {
-    return iconCache;
-  }
-  const newFileIconCache = {
-    ...iconCache
-  };
-  for (let i = 0; i < missingRequests.length; i++) {
-    const request = missingRequests[i];
-    const icon = newIcons[i];
-    newFileIconCache[request.path] = icon;
-  }
-  return newFileIconCache;
-};
-
-const getQuickPickFileIcons = async (items, fileIconCache) => {
-  const dirents = items.map(toDirent);
-  const missingRequests = getMissingIconRequests(dirents, fileIconCache);
-  const newIcons = await requestFileIcons(missingRequests);
-  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const paths = dirents.map(getPath$1);
-  const icons = getIconsCached(paths, newFileIconCache);
-  return {
-    icons,
-    newFileIconCache
-  };
-};
-
 const focusIndex = async (state, index) => {
   const {
     fileIconCache,
@@ -2613,7 +2619,39 @@ const filterQuickPickItem = (pattern, word) => {
   return matches;
 };
 
-const filterQuickPickItems = (items, value) => {
+const getMatchRank = (label, value) => {
+  if (label === value) {
+    return 4;
+  }
+  if (label.startsWith(value)) {
+    return 3;
+  }
+  let index = label.indexOf(value);
+  if (index === -1) {
+    return 0;
+  }
+  while (index !== -1) {
+    if (!/[\p{L}\p{N}]/u.test(label[index - 1])) {
+      return 2;
+    }
+    index = label.indexOf(value, index + 1);
+  }
+  return 1;
+};
+const rankCommandPicks = (items, value) => {
+  const normalizedValue = value.toLowerCase();
+  const ranked = items.map(item => ({
+    item,
+    rank: getMatchRank(item.label.toLowerCase(), normalizedValue)
+  }));
+  // The first match entry is the fuzzy score; the remaining entries describe highlights.
+  ranked.sort((a, b) => b.rank - a.rank || b.item.matches[0] - a.item.matches[0]);
+  return ranked.map(({
+    item
+  }) => item);
+};
+
+const filterQuickPickItems = (items, value, rankCommands = false) => {
   if (!value) {
     return items;
   }
@@ -2628,7 +2666,7 @@ const filterQuickPickItems = (items, value) => {
       });
     }
   }
-  return results;
+  return rankCommands ? rankCommandPicks(results, value) : results;
 };
 
 const Command = '>';
@@ -3786,7 +3824,7 @@ const setValue = async (state, newValue) => {
     platform
   });
   const filterValue = quickInput ? '' : getFilterValue(providerId, subId, newValue);
-  const items = filterQuickPickItems(newPicks, filterValue);
+  const items = filterQuickPickItems(newPicks, filterValue, subId === Commands$1);
   const focusedIndex = items.length === 0 ? -1 : 0;
   const sliced = items.slice(minLineY, maxLineY);
   const {
@@ -4057,7 +4095,7 @@ const getLoadedState = async state => {
   });
   array(newPicks);
   const filterValue = getFilterValue(id, subId, value);
-  const items = isTextInput(args) ? newPicks : filterQuickPickItems(newPicks, filterValue);
+  const items = isTextInput(args) ? newPicks : filterQuickPickItems(newPicks, filterValue, subId === Commands$1);
   const minLineY = 0;
   const maxLineY = Math.min(minLineY + maxVisibleItems, newPicks.length);
   const sliced = newPicks.slice(minLineY, maxLineY);

package/package.json

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