youngshuohao
diff --git a/‎src/commands/show.ts
Lines changed: 2 additions & 2 deletions b/‎src/commands/show.ts
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/leetCodeExecutor.ts
Lines changed: 8 additions & 1 deletion b/‎src/leetCodeExecutor.ts
Lines changed: 8 additions & 1 deletion
diff --git a/‎src/utils/cpUtils.ts
Lines changed: 10 additions & 1 deletion b/‎src/utils/cpUtils.ts
Lines changed: 10 additions & 1 deletion
@@ -65,10 +65,10 @@ async function fetchProblemLanguage(): Promise<string | undefined> {
     if (defaultLanguage && languages.indexOf(defaultLanguage) < 0) {
         defaultLanguage = undefined;
     }
-    const language: string | undefined = defaultLanguage || await vscode.window.showQuickPick(languages, { placeHolder: "Select the language you want to use" });
+    const language: string | undefined = defaultLanguage || await vscode.window.showQuickPick(languages, { placeHolder: "Select the language you want to use", ignoreFocusOut: true });
     // fire-and-forget default language query
     (async (): Promise<void> => {
-        if (!defaultLanguage && leetCodeConfig.get<boolean>("showSetDefaultLanguageHint")) {
+        if (language && !defaultLanguage && leetCodeConfig.get<boolean>("showSetDefaultLanguageHint")) {
             const choice: vscode.MessageItem | undefined = await vscode.window.showInformationMessage(
                 `Would you like to set '${language}' as your default language?`,
                 DialogOptions.yes,
 
@@ -111,7 +111,14 @@ class LeetCodeExecutor {
     }
 
     public async submitSolution(filePath: string): Promise<string> {
-        return await this.executeCommandWithProgressEx("Submitting to LeetCode...", "node", [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]);
+        try {
+            return await this.executeCommandWithProgressEx("Submitting to LeetCode...", "node", [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]);
+        } catch (error) {
+            if (error.result) {
+                return error.result;
+            }
+            throw error;
+        }
     }
 
     public async testSolution(filePath: string, testString?: string): Promise<string> {
 
@@ -5,6 +5,10 @@ import * as cp from "child_process";
 import * as vscode from "vscode";
 import { leetCodeChannel } from "../leetCodeChannel";
 
+interface IExecError extends Error {
+    result?: string;
+}
+
 export async function executeCommand(command: string, args: string[], options: cp.SpawnOptions = { shell: true }): Promise<string> {
     return new Promise((resolve: (res: string) => void, reject: (e: Error) => void): void => {
         let result: string = "";
@@ -20,9 +24,14 @@ export async function executeCommand(command: string, args: string[], options: c
         childProc.stderr.on("data", (data: string | Buffer) => leetCodeChannel.append(data.toString()));
 
         childProc.on("error", reject);
+
         childProc.on("close", (code: number) => {
             if (code !== 0 || result.indexOf("ERROR") > -1) {
-                reject(new Error(`Command "${command} ${args.toString()}" failed with exit code "${code}".`));
+                const error: IExecError = new Error(`Command "${command} ${args.toString()}" failed with exit code "${code}".`);
+                if (result) {
+                    error.result = result; // leetcode-cli may print useful content by exit with error code
+                }
+                reject(error);
             } else {
                 resolve(result);
             }
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,14 @@ class LeetCodeExecutor {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public async submitSolution(filePath: string): Promise<string> {`
`114`		- return await this.executeCommandWithProgressEx("Submitting to LeetCode...", "node", [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]);
	`114`	`+ try {`
	`115`	+ return await this.executeCommandWithProgressEx("Submitting to LeetCode...", "node", [await this.getLeetCodeBinaryPath(), "submit", `"${filePath}"`]);
	`116`	`+ } catch (error) {`
	`117`	`+ if (error.result) {`
	`118`	`+ return error.result;`
	`119`	`+ }`
	`120`	`+ throw error;`
	`121`	`+ }`
`115`	`122`	`}`
`116`	`123`
`117`	`124`	`public async testSolution(filePath: string, testString?: string): Promise<string> {`