add progress bar when submit

jdneo · jdneo · commit bd9da79dc7dd · 2018-07-16T14:23:23.000+08:00
diff --git a/src/commands/submit.ts b/src/commands/submit.ts
@@ -3,7 +3,7 @@
 import * as vscode from "vscode";
 import { leetCodeManager } from "../leetCodeManager";
 import { leetCodeBinaryPath } from "../shared";
-import { executeCommand } from "../utils/cpUtils";
+import { executeCommandWithProgress } from "../utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel, promptForSignIn, showResultFile } from "../utils/uiUtils";
 import { getActivefilePath } from "../utils/workspaceUtils";
 
@@ -19,7 +19,7 @@ export async function submitSolution(channel: vscode.OutputChannel, uri?: vscode
     }
 
     try {
-        const result: string = await executeCommand(channel, "node", [leetCodeBinaryPath, "submit", `"${filePath}"`]);
+        const result: string = await executeCommandWithProgress("Submitting to LeetCode...", channel, "node", [leetCodeBinaryPath, "submit", `"${filePath}"`]);
         await showResultFile(result);
     } catch (error) {
         await promptForOpenOutputChannel("Failed to submit the solution. Please open the output channel for details.", DialogType.error, channel);
diff --git a/src/commands/test.ts b/src/commands/test.ts
@@ -4,7 +4,7 @@ import * as fse from "fs-extra";
 import * as vscode from "vscode";
 import { leetCodeManager } from "../leetCodeManager";
 import { IQuickItemEx, leetCodeBinaryPath, UserStatus } from "../shared";
-import { executeCommand } from "../utils/cpUtils";
+import { executeCommandWithProgress } from "../utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel, showFileSelectDialog, showResultFile } from "../utils/uiUtils";
 import { getActivefilePath } from "../utils/workspaceUtils";
 
@@ -47,7 +47,7 @@ export async function testSolution(channel: vscode.OutputChannel, uri?: vscode.U
         let result: string | undefined;
         switch (choice.value) {
             case ":default":
-                result = await executeCommand(channel, "node", [leetCodeBinaryPath, "test", `"${filePath}"`]);
+                result = await executeCommandWithProgress("Submitting to LeetCode...", channel, "node", [leetCodeBinaryPath, "test", `"${filePath}"`]);
                 break;
             case ":direct":
                 const testString: string | undefined = await vscode.window.showInputBox({
@@ -57,15 +57,15 @@ export async function testSolution(channel: vscode.OutputChannel, uri?: vscode.U
                     ignoreFocusOut: true,
                 });
                 if (testString) {
-                    result = await executeCommand(channel, "node", [leetCodeBinaryPath, "test", `"${filePath}"`, "-t", `"${testString.replace(/"/g, "")}"`]);
+                    result = await executeCommandWithProgress("Submitting to LeetCode...", channel, "node", [leetCodeBinaryPath, "test", `"${filePath}"`, "-t", `"${testString.replace(/"/g, "")}"`]);
                 }
                 break;
             case ":file":
                 const testFile: vscode.Uri[] | undefined = await showFileSelectDialog();
                 if (testFile && testFile.length) {
                     const input: string = await fse.readFile(testFile[0].fsPath, "utf-8");
                     if (input.trim()) {
-                        result = await executeCommand(channel, "node", [leetCodeBinaryPath, "test", `"${filePath}"`, "-t", `"${input.replace(/"/g, "").replace(/\r?\n/g, "\\n")}"`]);
+                        result = await executeCommandWithProgress("Submitting to LeetCode...", channel, "node", [leetCodeBinaryPath, "test", `"${filePath}"`, "-t", `"${input.replace(/"/g, "").replace(/\r?\n/g, "\\n")}"`]);
                     } else {
                         vscode.window.showErrorMessage("The selected test file must not be empty.");
                     }
diff --git a/src/utils/cpUtils.ts b/src/utils/cpUtils.ts
@@ -26,3 +26,19 @@ export async function executeCommand(channel: vscode.OutputChannel, command: str
         });
     });
 }
+
+export async function executeCommandWithProgress(message: string, channel: vscode.OutputChannel, command: string, args: string[], options: cp.SpawnOptions = { shell: true }): Promise<string> {
+    let result: string = "";
+    await vscode.window.withProgress({ location: vscode.ProgressLocation.Window }, async (p: vscode.Progress<{}>) => {
+        return new Promise(async (resolve: () => void, reject: (e: Error) => void): Promise<void> => {
+            p.report({ message });
+            try {
+                result = await executeCommand(channel, command, args, options);
+                resolve();
+            } catch (e) {
+                reject(e);
+            }
+        });
+    });
+    return result;
+}
