Commitadc9f41

authored

support trigger test command in file explorer (LeetCode-OpenSource#30)

1 parent81e9d53 commitadc9f41Copy full SHA for adc9f41

File tree

+37

-28

lines changed

+37

-28

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@`
`81`	`81`	`},`
`82`	`82`	`{`
`83`	`83`	`"command":"leetcode.testSolution",`
`84`		`-"title":"Test",`
	`84`	`+"title":"Test in LeetCode",`
`85`	`85`	`"category":"LeetCode"`
`86`	`86`	`},`
`87`	`87`	`{`
`@@ -115,7 +115,7 @@`
`115`	`115`	`{`
`116`	`116`	`"command":"leetcode.showProblem",`
`117`	`117`	`"when":"view == leetCodeExplorer && viewItem == problem",`
`118`		`-"group":"1@1"`
	`118`	`+"group":"leetcode-explorer@1"`
`119`	`119`	`}`
`120`	`120`	`],`
`121`	`121`	`"commandPalette": [`
`@@ -125,9 +125,15 @@`
`125`	`125`	`}`
`126`	`126`	`],`
`127`	`127`	`"explorer/context": [`
	`128`	`+ {`
	`129`	`+"command":"leetcode.testSolution",`
	`130`	`+"when":"explorerResourceIsFolder == false",`
	`131`	`+"group":"file-explorer@1"`
	`132`	`+ },`
`128`	`133`	`{`
`129`	`134`	`"command":"leetcode.submitSolution",`
`130`		`-"when":"explorerResourceIsFolder == false"`
	`135`	`+"when":"explorerResourceIsFolder == false",`
	`136`	`+"group":"file-explorer@2"`
`131`	`137`	`}`
`132`	`138`	`]`
`133`	`139`	`},`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,26 +5,17 @@ import { leetCodeManager } from "../leetCodeManager";`
`5`	`5`	`import{leetCodeBinaryPath}from"../shared";`
`6`	`6`	`import{executeCommand}from"../utils/cpUtils";`
`7`	`7`	`import{DialogType,promptForOpenOutputChannel,promptForSignIn,showResultFile}from"../utils/uiUtils";`
	`8`	`+import{getActivefilePath}from"../utils/workspaceUtils";`
`8`	`9`
`9`	`10`	`exportasyncfunctionsubmitSolution(channel:vscode.OutputChannel,uri?:vscode.Uri):Promise<void>{`
`10`	`11`	`if(!leetCodeManager.getUser()){`
`11`	`12`	`promptForSignIn();`
`12`	`13`	`return;`
`13`	`14`	`}`
`14`	`15`
`15`		`-letfilePath:string;`
`16`		`-if(uri){`
`17`		`-filePath=uri.fsPath;`
`18`		`-}else{`
`19`		`-consttextEditor:vscode.TextEditor\|undefined=vscode.window.activeTextEditor;`
`20`		`-if(!textEditor){`
`21`		`-return;`
`22`		`-}`
`23`		`-if(!textEditor.document.save()){`
`24`		`-vscode.window.showWarningMessage("Please save the solution file first.");`
`25`		`-return;`
`26`		`-}`
`27`		`-filePath=textEditor.document.uri.fsPath;`
	`16`	`+constfilePath:string\|undefined=awaitgetActivefilePath(uri);`
	`17`	`+if(!filePath){`
	`18`	`+return;`
`28`	`19`	`}`
`29`	`20`
`30`	`21`	`try{`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,24 +6,18 @@ import { leetCodeManager } from "../leetCodeManager";`
`6`	`6`	`import{IQuickItemEx,leetCodeBinaryPath,UserStatus}from"../shared";`
`7`	`7`	`import{executeCommand}from"../utils/cpUtils";`
`8`	`8`	`import{DialogType,promptForOpenOutputChannel,showFileSelectDialog,showResultFile}from"../utils/uiUtils";`
	`9`	`+import{getActivefilePath}from"../utils/workspaceUtils";`
`9`	`10`
`10`		`-exportasyncfunctiontestSolution(channel:vscode.OutputChannel):Promise<void>{`
	`11`	`+exportasyncfunctiontestSolution(channel:vscode.OutputChannel,uri?:vscode.Uri):Promise<void>{`
`11`	`12`	`try{`
`12`	`13`	`if(leetCodeManager.getStatus()===UserStatus.SignedOut){`
`13`	`14`	`return;`
`14`	`15`	`}`
`15`	`16`
`16`		`-constactiveText:vscode.TextEditor\|undefined=vscode.window.activeTextEditor;`
`17`		`-if(!activeText){`
`18`		`-vscode.window.showErrorMessage("Please open a LeetCode solution file first.");`
	`17`	`+constfilePath:string\|undefined=awaitgetActivefilePath(uri);`
	`18`	`+if(!filePath){`
`19`	`19`	`return;`
`20`	`20`	`}`
`21`		`-if(!activeText.document.save()){`
`22`		`-vscode.window.showWarningMessage("Please save the solution file first.");`
`23`		`-return;`
`24`		`-}`
`25`		`-`
`26`		`-constfilePath=activeText.document.uri.fsPath;`
`27`	`21`	`constpicks:Array<IQuickItemEx<string>>=[];`
`28`	`22`	`picks.push(`
`29`	`23`	`{`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ export async function activate(context: vscode.ExtensionContext) {`
`27`	`27`	`vscode.commands.registerCommand("leetcode.showProblem",(node:LeetCodeNode)=>show.showProblem(channel,node)),`
`28`	`28`	`vscode.commands.registerCommand("leetcode.searchProblem",()=>show.searchProblem(channel)),`
`29`	`29`	`vscode.commands.registerCommand("leetcode.refreshExplorer",()=>leetCodeTreeDataProvider.refresh()),`
`30`		`-vscode.commands.registerCommand("leetcode.testSolution",()=>test.testSolution(channel)),`
`31`		`-vscode.commands.registerCommand("leetcode.submitSolution",(uri:vscode.Uri)=>submit.submitSolution(channel,uri)),`
	`30`	`+vscode.commands.registerCommand("leetcode.testSolution",(uri?:vscode.Uri)=>test.testSolution(channel,uri)),`
	`31`	`+vscode.commands.registerCommand("leetcode.submitSolution",(uri?:vscode.Uri)=>submit.submitSolution(channel,uri)),`
`32`	`32`	`);`
`33`	`33`
`34`	`34`	`leetCodeManager.on("statusChanged",()=>{`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,21 @@ export async function selectWorkspaceFolder(): Promise<string> {`
`17`	`17`	`}`
`18`	`18`	`returnfolder ?folder.uri.fsPath :path.join(os.homedir(),".leetcode");`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+exportasyncfunctiongetActivefilePath(uri?:vscode.Uri):Promise<string\|undefined>{`
	`22`	`+lettextEditor:vscode.TextEditor\|undefined;`
	`23`	`+if(uri){`
	`24`	`+textEditor=awaitvscode.window.showTextDocument(uri,{preview:false});`
	`25`	`+}else{`
	`26`	`+textEditor=vscode.window.activeTextEditor;`
	`27`	`+}`
	`28`	`+`
	`29`	`+if(!textEditor){`
	`30`	`+returnundefined;`
	`31`	`+}`
	`32`	`+if(textEditor.document.isDirty&&!awaittextEditor.document.save()){`
	`33`	`+vscode.window.showWarningMessage("Please save the solution file first.");`
	`34`	`+returnundefined;`
	`35`	`+}`
	`36`	`+returntextEditor.document.uri.fsPath;`
	`37`	`+}`

Comments

(0)