Commit06e33d2

authored and

committed

1 parent7ca9b8a commit06e33d2Copy full SHA for 06e33d2

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import * as vscode from "vscode";`
`7`	`7`	`import{leetCodeChannel}from"./leetCodeChannel";`
`8`	`8`	`import{leetCodeExecutor}from"./leetCodeExecutor";`
`9`	`9`	`import{UserStatus}from"./shared";`
	`10`	`+import{createEnvOption}from"./utils/cpUtils";`
`10`	`11`	`import{DialogType,promptForOpenOutputChannel}from"./utils/uiUtils";`
`11`	`12`	`import*aswslfrom"./utils/wslUtils";`
`12`	`13`
`@@ -42,7 +43,10 @@ class LeetCodeManager extends EventEmitter {`
`42`	`43`
`43`	`44`	`constchildProc:cp.ChildProcess=wsl.useWsl()`
`44`	`45`	`?cp.spawn("wsl",["node",leetCodeBinaryPath,"user","-l"],{shell:true})`
`45`		`- :cp.spawn("node",[leetCodeBinaryPath,"user","-l"],{shell:true});`
	`46`	`+ :cp.spawn("node",[leetCodeBinaryPath,"user","-l"],{`
	`47`	`+shell:true,`
	`48`	`+env:createEnvOption(),`
	`49`	`+});`
`46`	`50`
`47`	`51`	`childProc.stdout.on("data",(data:string\|Buffer)=>{`
`48`	`52`	`data=data.toString();`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export async function executeCommand(command: string, args: string[], options: c`
`9`	`9`	`returnnewPromise((resolve:(res:string)=>void,reject:(e:Error)=>void):void=>{`
`10`	`10`	`letresult:string="";`
`11`	`11`
`12`		`-constchildProc:cp.ChildProcess=cp.spawn(command,args,options);`
	`12`	`+constchildProc:cp.ChildProcess=cp.spawn(command,args,{ ...options,env:createEnvOption()});`
`13`	`13`
`14`	`14`	`childProc.stdout.on("data",(data:string\|Buffer)=>{`
`15`	`15`	`data=data.toString();`
`@@ -45,3 +45,18 @@ export async function executeCommandWithProgress(message: string, command: strin`
`45`	`45`	`});`
`46`	`46`	`returnresult;`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+// clone process.env and add http proxy`
	`50`	`+exportfunctioncreateEnvOption():{}{`
	`51`	`+constproxy:string\|undefined=getHttpAgent();`
	`52`	`+if(proxy){`
	`53`	`+constenv:any=Object.create(process.env);`
	`54`	`+env.http_proxy=proxy;`
	`55`	`+returnenv;`
	`56`	`+}`
	`57`	`+returnprocess.env;`
	`58`	`+}`
	`59`	`+`
	`60`	`+functiongetHttpAgent():string\|undefined{`
	`61`	`+returnvscode.workspace.getConfiguration("http").get<string>("proxy");`
	`62`	`+}`

Comments

(0)