feat: Move leetcode commands into submenu (LeetCode-OpenSource#712)

jdneo · web-flow · commit 45ae2451a51f · 2021-06-07T22:50:58.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "license": "MIT",
     "icon": "resources/LeetCode.png",
     "engines": {
-        "vscode": "^1.42.0"
+        "vscode": "^1.50.0"
     },
     "repository": {
         "type": "git",
@@ -243,6 +243,11 @@
                 }
             ],
             "editor/context": [
+                {
+                    "submenu": "leetcode.editorAction"
+                }
+            ],
+            "leetcode.editorAction": [
                 {
                     "command": "leetcode.testSolution",
                     "group": "leetcode@1"
@@ -261,6 +266,12 @@
                 }
             ]
         },
+        "submenus": [
+            {
+                "id": "leetcode.editorAction",
+                "label": "LeetCode"
+            }
+        ],
         "configuration": [
             {
                 "title": "LeetCode",
@@ -678,7 +689,7 @@
         "@types/mocha": "^2.2.42",
         "@types/node": "^14.14.33",
         "@types/require-from-string": "^1.2.0",
-        "@types/vscode": "1.42.0",
+        "@types/vscode": "1.50.0",
         "tslint": "^5.20.1",
         "typescript": "^4.3.2"
     },
diff --git a/src/explorer/LeetCodeTreeDataProvider.ts b/src/explorer/LeetCodeTreeDataProvider.ts
@@ -23,7 +23,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
 
     public async refresh(): Promise<void> {
         await explorerNodeManager.refreshCache();
-        this.onDidChangeTreeDataEvent.fire();
+        this.onDidChangeTreeDataEvent.fire(null);
     }
 
     public getTreeItem(element: LeetCodeNode): vscode.TreeItem | Thenable<vscode.TreeItem> {
diff --git a/src/utils/workspaceUtils.ts b/src/utils/workspaceUtils.ts
@@ -18,9 +18,8 @@ export async function selectWorkspaceFolder(): Promise<string> {
             return workspaceFolderSetting;
         }
     }
-    const workspaceFolders: vscode.WorkspaceFolder[] = vscode.workspace.workspaceFolders || [];
     let needAsk: boolean = true;
-    for (const folder of workspaceFolders) {
+    for (const folder of vscode.workspace.workspaceFolders || []) {
         if (isSubFolder(folder.uri.fsPath, workspaceFolderSetting)) {
             needAsk = false;
         }
@@ -47,7 +46,7 @@ export async function selectWorkspaceFolder(): Promise<string> {
                 await vscode.commands.executeCommand("vscode.openFolder", vscode.Uri.file(workspaceFolderSetting), true);
                 return "";
             case OpenOption.addToWorkspace:
-                vscode.workspace.updateWorkspaceFolders(workspaceFolders.length, 0, { uri: vscode.Uri.file(workspaceFolderSetting) });
+                vscode.workspace.updateWorkspaceFolders(vscode.workspace.workspaceFolders?.length ?? 0, 0, { uri: vscode.Uri.file(workspaceFolderSetting) });
                 break;
             default:
                 return "";

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod`
`23`	`23`
`24`	`24`	`public async refresh(): Promise<void> {`
`25`	`25`	`await explorerNodeManager.refreshCache();`
`26`		`- this.onDidChangeTreeDataEvent.fire();`
	`26`	`+ this.onDidChangeTreeDataEvent.fire(null);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public getTreeItem(element: LeetCodeNode): vscode.TreeItem \| Thenable<vscode.TreeItem> {`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@ export async function selectWorkspaceFolder(): Promise<string> {`
`18`	`18`	`return workspaceFolderSetting;`
`19`	`19`	`}`
`20`	`20`	`}`
`21`		`- const workspaceFolders: vscode.WorkspaceFolder[] = vscode.workspace.workspaceFolders \|\| [];`
`22`	`21`	`let needAsk: boolean = true;`
`23`		`- for (const folder of workspaceFolders) {`
	`22`	`+ for (const folder of vscode.workspace.workspaceFolders \|\| []) {`
`24`	`23`	`if (isSubFolder(folder.uri.fsPath, workspaceFolderSetting)) {`
`25`	`24`	`needAsk = false;`
`26`	`25`	`}`
`@@ -47,7 +46,7 @@ export async function selectWorkspaceFolder(): Promise<string> {`
`47`	`46`	`await vscode.commands.executeCommand("vscode.openFolder", vscode.Uri.file(workspaceFolderSetting), true);`
`48`	`47`	`return "";`
`49`	`48`	`case OpenOption.addToWorkspace:`
`50`		`- vscode.workspace.updateWorkspaceFolders(workspaceFolders.length, 0, { uri: vscode.Uri.file(workspaceFolderSetting) });`
	`49`	`+ vscode.workspace.updateWorkspaceFolders(vscode.workspace.workspaceFolders?.length ?? 0, 0, { uri: vscode.Uri.file(workspaceFolderSetting) });`
`51`	`50`	`break;`
`52`	`51`	`default:`
`53`	`52`	`return "";`