feat: Added abbility to choose files with open dialog

Author: OrangeUtan

src/extension.ts

@@ -3,7 +3,6 @@ import * as beet from './beet';
 import * as config from './config';
 import * as minecraft from './minecraft';
 import * as utils from './utils';
-import * as path from 'path';
 
 let SAVES: minecraft.Save[];
 
@@ -63,7 +62,7 @@ async function build() {
         case 1:
             configFile = configFiles[0];
         default:
-            let selection = await utils.pickFile(configFiles, configFiles.map((f) => ({label: vscode.workspace.asRelativePath(f)})), "Pick beet config file");
+            let selection = await utils.pickFile("Pick beet config file", configFiles);
             if(!selection) {
                 return;
             }
@@ -88,8 +87,8 @@ async function linkWorld() {
         return;
     }
 
-    const items = await Promise.all(SAVES.map(async (s) => ({label: path.basename(s.uri.fsPath), description: (await s.getVersion()).name})));
-    const selectedWorld = await utils.pickFile(SAVES.map(s => s.uri), items, "Pick world to link");
+    const descriptions = await Promise.all(SAVES.map(async (s) => (await s.getVersion()).name));
+    const selectedWorld = await utils.pickFile("Pick world to link", SAVES.map(s => s.uri), descriptions, {canSelectFiles: false, canSelectFolders: true});
     if(!selectedWorld) {
         return;
     }

src/utils.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import * as fs from 'fs';
 import * as util from 'util';
+import * as path from 'path';
 
 export async function isDirectory(path: string) {
     try {
@@ -19,19 +20,36 @@ export async function listDir(path: string) {
     }
 }
 
-export async function pickFile<T extends vscode.QuickPickItem>(files: vscode.Uri[], items: T[], placeHolder: string): Promise<vscode.Uri | undefined> {
+export async function pickFile(placeHolder: string, files: vscode.Uri[], descriptions?: string[], openDialogOptions?: vscode.OpenDialogOptions): Promise<vscode.Uri | undefined> {
     if (files.length === 0) {
         return undefined;
     } else if(files.length === 1) {
         return files[0];
     }
 
-    let options: { [key: string]: (vscode.Uri) } = {};
-    files.forEach((f, i) => {
-        options[items[i].label] = f;
-    });
+    let items: vscode.QuickPickItem[] = [
+        {
+            label: "Select path ...",
+            detail: "Select path with open dialog"
+        }
+    ];
+
+    items = items.concat(<vscode.QuickPickItem[]> files.map((file, i) => ({
+        label: path.basename(file.fsPath),
+        detail: file.fsPath,
+        description: descriptions? descriptions[i] : undefined
+    })));
+
+    const selection = await vscode.window.showQuickPick(items, { placeHolder, matchOnDescription: true});
 
-    return vscode.window.showQuickPick(items, { placeHolder, matchOnDescription: true }).then((selection) => {
-        return selection ? options[selection.label] : undefined;
+    if(selection?.detail === "Select path with open dialog") {
+        const selectedFiles = await vscode.window.showOpenDialog(openDialogOptions);
+        return selectedFiles ? selectedFiles[0] : undefined;
+    }
+
+    const options: { [key: string]: (vscode.Uri) } = {};
+    files.forEach((f, i) => {
+        options[files[i].fsPath] = f;
     });
+    return selection?.detail ? options[selection.detail] : undefined;
 }