@lvce-editor/quick-pick-worker 4.24.4 → 4.24.6

package/dist/quickPickWorkerMain.js

@@ -1458,13 +1458,6 @@ const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
-const openUri$1 = async (uri, focus, options) => {
-  await invoke$3('Main.openUri', {
-    ...options,
-    focus,
-    uri
-  });
-};
 const showErrorDialog$1 = async errorInfo => {
   await invoke$3('ErrorHandling.showErrorDialog', errorInfo);
 };
@@ -3069,9 +3062,35 @@ const searchFile = async (path, value) => {
   const files = await searchFile$1(/* path */path, /* searchTerm */value, prepare, '');
   return files;
 };
+const hasUriScheme = path => /^[a-z][a-z\d+.-]*:/i.test(path) && !/^[a-z]:[\\/]/i.test(path);
+const isAbsolutePath = path => path.startsWith('/') || /^[a-z]:[\\/]/i.test(path);
+const trimTrailingSeparators = path => {
+  let result = path;
+  while (result.endsWith('/') || result.endsWith('\\')) {
+    result = result.slice(0, -1);
+  }
+  return result;
+};
+const resolveFileUri = (workspace, path) => {
+  if (hasUriScheme(path)) {
+    return path;
+  }
+  if (hasUriScheme(workspace)) {
+    const workspaceUrl = new URL(workspace);
+    const normalizedPath = path.replaceAll('\\', '/').replaceAll('%', '%25');
+    const workspacePath = trimTrailingSeparators(workspaceUrl.pathname);
+    workspaceUrl.pathname = normalizedPath.startsWith('/') ? normalizedPath : `${workspacePath}/${normalizedPath}`;
+    return workspaceUrl.href;
+  }
+  if (isAbsolutePath(path)) {
+    return path;
+  }
+  return `${trimTrailingSeparators(workspace)}/${path}`;
+};
 const convertToPick = uri => {
-  const baseName = pathBaseName(uri);
-  const dirName = pathDirName(uri);
+  const displayPath = hasUriScheme(uri) ? decodeURIComponent(new URL(uri).pathname) : uri.replaceAll('\\', '/');
+  const baseName = pathBaseName(displayPath);
+  const dirName = pathDirName(displayPath);
   return {
     description: dirName,
     direntType: File,
@@ -3094,7 +3113,7 @@ const getPicks$b = async searchValue => {
     return [];
   }
   const files = await searchFile(workspace, searchValue);
-  const picks = files.map(convertToPick);
+  const picks = files.map(path => convertToPick(resolveFileUri(workspace, path)));
   return picks;
 };
 
@@ -3665,17 +3684,20 @@ const selectPick$9 = async pick => {
 };
 
 const openUri = async uri => {
-  await openUri$1(uri);
+  await invoke$3('Main.openUri', uri);
 };
 
+const toFileUri = path => {
+  // Preserve already-qualified URIs, but treat Windows drive letters as paths.
+  if (/^[a-z][a-z\d+.-]*:/i.test(path) && !/^[a-z]:[\\/]/i.test(path)) {
+    return path;
+  }
+  const url = new URL('file:///');
+  url.pathname = path.replaceAll('\\', '/').replaceAll('%', '%25');
+  return url.href;
+};
 const selectPick$8 = async pick => {
-  const {
-    description
-  } = pick;
-  const fileName = pick.label;
-  const workspace = await getWorkspacePath();
-  const absolutePath = `${workspace}/${description}/${fileName}`;
-  await openUri(absolutePath);
+  await openUri(toFileUri(pick.uri));
   return {
     command: Hide
   };
@@ -3739,7 +3761,7 @@ const selectPick$5 = async pick => {
 const selectPick$4 = async pick => {
   const editorId = await getActiveEditorId();
   const value = pick.value;
-  await invoke$3('Viewlet.executeViewletCommand', editorId, 'setLanguageId', value.languageId, value.tokenizePath);
+  await invoke$3('Viewlet.executeViewletCommand', editorId, 'setLanguageId', value.languageId, value.tokenizePath, true);
   return {
     command: Hide
   };

package/package.json

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