Commit3028be4

authored and

committed

1 parentbcafa92 commit3028be4Copy full SHA for 3028be4

File tree

+20

-4

lines changed

+20

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,10 @@ async function fetchProblemLanguage(): Promise<string \| undefined> {`
`65`	`65`	`if(defaultLanguage&&languages.indexOf(defaultLanguage)<0){`
`66`	`66`	`defaultLanguage=undefined;`
`67`	`67`	`}`
`68`		`-constlanguage:string\|undefined=defaultLanguage\|\|awaitvscode.window.showQuickPick(languages,{placeHolder:"Select the language you want to use"});`
	`68`	`+constlanguage:string\|undefined=defaultLanguage\|\|awaitvscode.window.showQuickPick(languages,{placeHolder:"Select the language you want to use",ignoreFocusOut:true});`
`69`	`69`	`// fire-and-forget default language query`
`70`	`70`	`(async():Promise<void>=>{`
`71`		`-if(!defaultLanguage&&leetCodeConfig.get<boolean>("showSetDefaultLanguageHint")){`
	`71`	`+if(language&&!defaultLanguage&&leetCodeConfig.get<boolean>("showSetDefaultLanguageHint")){`
`72`	`72`	`constchoice:vscode.MessageItem\|undefined=awaitvscode.window.showInformationMessage(`
`73`	`73`	`Would you like to set '${language}' as your default language?`,
`74`	`74`	`DialogOptions.yes,`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,14 @@ class LeetCodeExecutor {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`publicasyncsubmitSolution(filePath:string):Promise<string>{`
`114`		-returnawaitthis.executeCommandWithProgressEx("Submitting to LeetCode...","node",[awaitthis.getLeetCodeBinaryPath(),"submit",`"${filePath}"`]);
	`114`	`+try{`
	`115`	+returnawaitthis.executeCommandWithProgressEx("Submitting to LeetCode...","node",[awaitthis.getLeetCodeBinaryPath(),"submit",`"${filePath}"`]);
	`116`	`+}catch(error){`
	`117`	`+if(error.result){`
	`118`	`+returnerror.result;`
	`119`	`+}`
	`120`	`+throwerror;`
	`121`	`+}`
`115`	`122`	`}`
`116`	`123`
`117`	`124`	`publicasynctestSolution(filePath:string,testString?:string):Promise<string>{`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,10 @@ import * as cp from "child_process";`
`5`	`5`	`import*asvscodefrom"vscode";`
`6`	`6`	`import{leetCodeChannel}from"../leetCodeChannel";`
`7`	`7`
	`8`	`+interfaceIExecErrorextendsError{`
	`9`	`+result?:string;`
	`10`	`+}`
	`11`	`+`
`8`	`12`	`exportasyncfunctionexecuteCommand(command:string,args:string[],options:cp.SpawnOptions={shell:true}):Promise<string>{`
`9`	`13`	`returnnewPromise((resolve:(res:string)=>void,reject:(e:Error)=>void):void=>{`
`10`	`14`	`letresult:string="";`
`@@ -20,9 +24,14 @@ export async function executeCommand(command: string, args: string[], options: c`
`20`	`24`	`childProc.stderr.on("data",(data:string\|Buffer)=>leetCodeChannel.append(data.toString()));`
`21`	`25`
`22`	`26`	`childProc.on("error",reject);`
	`27`	`+`
`23`	`28`	`childProc.on("close",(code:number)=>{`
`24`	`29`	`if(code!==0\|\|result.indexOf("ERROR")>-1){`
`25`		-reject(newError(`Command "${command}${args.toString()}" failed with exit code "${code}".`));
	`30`	+consterror:IExecError=newError(`Command "${command}${args.toString()}" failed with exit code "${code}".`);
	`31`	`+if(result){`
	`32`	`+error.result=result;// leetcode-cli may print useful content by exit with error code`
	`33`	`+}`
	`34`	`+reject(error);`
`26`	`35`	`}else{`
`27`	`36`	`resolve(result);`
`28`	`37`	`}`

Comments

(0)