add pic

jdneo · jdneo · commit 9debda7e6959 · 2018-02-14T19:37:12.000+08:00
diff --git a/package.json b/package.json
@@ -14,6 +14,9 @@
         "onCommand:leetcode.signin",
         "onCommand:leetcode.signout",
         "onCommand:leetcode.selectSessions",
+        "onCommand:leetcode.refreshExplorer",
+        "onCommand:leetcode.showProblem",
+        "onCommand:leetcode.searchProblem",
         "onView:leetCodeExplorer"
     ],
     "main": "./out/src/extension",
@@ -34,10 +37,25 @@
                 "title": "Select session",
                 "category": "LeetCode"
             },
+            {
+                "command": "leetcode.refreshExplorer",
+                "title": "Refresh",
+                "category": "LeetCode",
+                "icon": {
+                    "light": "resources/light/refresh.svg",
+                    "dark": "resources/dark/refresh.svg"
+                }
+            },
             {
                 "command": "leetcode.showProblem",
                 "title": "Solve problem",
                 "category": "LeetCode"
+            },
+            {
+                "command": "leetcode.searchProblem",
+                "title": "Search",
+                "category": "LeetCode",
+                "icon": "resources/search.png"
             }
         ],
         "views": {
@@ -49,7 +67,18 @@
             ]
         },
         "menus": {
-            "view/title": [],
+            "view/title": [
+                {
+                    "command": "leetcode.searchProblem",
+                    "when": "view == leetCodeExplorer",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "leetcode.refreshExplorer",
+                    "when": "view == leetCodeExplorer",
+                    "group": "navigation@2"
+                }
+            ],
             "view/item/context": [
                 {
                     "command": "leetcode.showProblem",
diff --git a/resources/blank.png b/resources/blank.png
diff --git a/resources/check.png b/resources/check.png
diff --git a/resources/dark/refresh.svg b/resources/dark/refresh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#2D2D30"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#C5C5C5"/></svg>
diff --git a/resources/light/refresh.svg b/resources/light/refresh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#F6F6F6"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#424242"/></svg>
diff --git a/resources/search.png b/resources/search.png
diff --git a/src/commands/list.ts b/src/commands/list.ts
@@ -22,7 +22,7 @@ export async function listProblems(): Promise<IProblem[]> {
         const result: string = await executeCommand("node", [leetCodeBinaryPath, "list", "-q", "L"]);
         const problems: IProblem[] = [];
         const lines: string[] = result.split("\n");
-        const reg: RegExp = /(&#10004;?)\s*\[(\d*)\]\s*(.*)\s*(Easy|Medium|Hard)\s*\((\s*\d+\.\d+ %)\)/;
+        const reg: RegExp = /(.?)\s*\[\s*(\d*)\]\s*(.*)\s*(Easy|Medium|Hard)\s*\((\s*\d+\.\d+ %)\)/;
         for (const line of lines.map((l: string) => l.trim()).filter(Boolean)) {
             const match: RegExpMatchArray | null = line.match(reg);
             if (match && match.length === 6) {
diff --git a/src/commands/session.ts b/src/commands/session.ts
@@ -14,7 +14,7 @@ export async function getSessionList(): Promise<ISession[]> {
     const result: string = await cp.executeCommand("node", [leetCodeBinaryPath, "session"]);
     const lines: string[] = result.split("\n");
     const sessions: ISession[] = [];
-    const reg: RegExp = /(&#10004;?)\s*(\d+)\s+(.*)\s+(\d+ \(\s*\d+\.\d+ %\))\s+(\d+ \(\s*\d+\.\d+ %\))/;
+    const reg: RegExp = /(.?)\s*(\d+)\s+(.*)\s+(\d+ \(\s*\d+\.\d+ %\))\s+(\d+ \(\s*\d+\.\d+ %\))/;
     for (const line of lines.map((l: string) => l.trim()).filter(Boolean)) {
         const match: RegExpMatchArray | null = line.match(reg);
         if (match && match.length === 6) {
@@ -32,7 +32,7 @@ export async function getSessionList(): Promise<ISession[]> {
 
 export async function selectSession(): Promise<void> {
     const choice: IQuickItemEx<string> | undefined = await vscode.window.showQuickPick(parseSessionsToPicks(getSessionList()));
-    if (!choice || choice.label.indexOf("&#10004;") > -1) {
+    if (!choice || choice.description) {
         return;
     }
     try {
@@ -46,8 +46,8 @@ export async function selectSession(): Promise<void> {
 async function parseSessionsToPicks(p: Promise<ISession[]>): Promise<Array<IQuickItemEx<string>>> {
     return new Promise(async (resolve: (res: Array<IQuickItemEx<string>>) => void): Promise<void> => {
         const picks: Array<IQuickItemEx<string>> = (await p).map((s: ISession) => Object.assign({}, {
-            label: `${s.active ? "&#10004; " : ""}${s.name}`,
-            description: `ID: ${s.id}`,
+            label: `${s.active ? "$(check) " : ""}${s.name}`,
+            description: s.active ? "Active" : "",
             detail: `AC Questions: ${s.acQuestions}, AC Submits: ${s.acSubmits}`,
             value: s.id,
         }));
diff --git a/src/commands/show.ts b/src/commands/show.ts
@@ -1,19 +1,40 @@
 "use strict";
 
 import * as vscode from "vscode";
-import { LeetCodeNode } from "../leetCodeExplorer"
-import { selectWorkspaceFolder } from "../utils/workspaceUtils";
-import { languages, leetCodeBinaryPath } from "../shared";
+import { LeetCodeNode } from "../leetCodeExplorer";
+import { leetCodeManager } from "../leetCodeManager";
+import { IQuickItemEx, languages, leetCodeBinaryPath } from "../shared";
 import { executeCommand } from "../utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel } from "../utils/uiUtils";
+import { selectWorkspaceFolder } from "../utils/workspaceUtils";
+import * as list from "./list";
 
 export async function showProblem(node?: LeetCodeNode): Promise<void> {
-    let id: string;
     if (!node) {
         return;
-    } else {
-        id = node.id;
     }
+    await showProblemInternal(node.id);
+}
+
+export async function searchProblem(): Promise<void> {
+    const signInStatus = leetCodeManager.getUser();
+    if (!signInStatus) {
+        return;
+    }
+    const choice: IQuickItemEx<string> | undefined = await vscode.window.showQuickPick(
+        parseProblemsToPicks(list.listProblems()),
+        {
+            matchOnDetail: true,
+            placeHolder: "Select one problem",
+        },
+    );
+    if (!choice) {
+        return;
+    }
+    await showProblemInternal(choice.value);
+}
+
+async function showProblemInternal(id: string): Promise<void> {
     try {
         const language: string | undefined = await vscode.window.showQuickPick(languages, { placeHolder: "Select the language you want to use" });
         if (!language) {
@@ -32,3 +53,15 @@ export async function showProblem(node?: LeetCodeNode): Promise<void> {
         await promptForOpenOutputChannel("Failed to fetch the problem information. Please open the output channel for details", DialogType.error);
     }
 }
+
+async function parseProblemsToPicks(p: Promise<list.IProblem[]>): Promise<Array<IQuickItemEx<string>>> {
+    return new Promise(async (resolve: (res: Array<IQuickItemEx<string>>) => void): Promise<void> => {
+        const picks: Array<IQuickItemEx<string>> = (await p).map((problem: list.IProblem) => Object.assign({}, {
+            label: `${problem.solved ? "$(check) " : ""}${problem.id}.${problem.name}`,
+            description: "",
+            detail: `AC rate: ${problem.passRate}, Difficulty: ${problem.difficulty}`,
+            value: problem.id,
+        }));
+        resolve(picks);
+    });
+}
diff --git a/src/extension.ts b/src/extension.ts
@@ -4,19 +4,20 @@ import * as vscode from "vscode";
 import * as session from "./commands/session";
 import * as show from "./commands/show";
 import { leetcodeChannel } from "./leetCodeChannel";
-import { LeetCodeTreeDataProvider, LeetCodeNode } from "./leetCodeExplorer";
+import { LeetCodeNode, LeetCodeTreeDataProvider } from "./leetCodeExplorer";
 import { leetCodeManager } from "./leetCodeManager";
 import { leetCodeStatusBarItem } from "./leetCodeStatusBarItem";
 
 export function activate(context: vscode.ExtensionContext) {
     leetCodeManager.getLoginStatus();
-    const leetCodeTreeDataProvider: LeetCodeTreeDataProvider = new LeetCodeTreeDataProvider();
+    const leetCodeTreeDataProvider: LeetCodeTreeDataProvider = new LeetCodeTreeDataProvider(context);
     context.subscriptions.push(
         vscode.window.registerTreeDataProvider("leetCodeExplorer", leetCodeTreeDataProvider),
         vscode.commands.registerCommand("leetcode.signin", () => leetCodeManager.signIn()),
         vscode.commands.registerCommand("leetcode.signout", () => leetCodeManager.signOut()),
         vscode.commands.registerCommand("leetcode.selectSessions", () => session.selectSession()),
-        vscode.commands.registerCommand("leetcode.showProblem", (node?: LeetCodeNode) => show.showProblem(node)),
+        vscode.commands.registerCommand("leetcode.showProblem", (node: LeetCodeNode) => show.showProblem(node)),
+        vscode.commands.registerCommand("leetcode.searchProblem", () => show.searchProblem()),
     );
     leetCodeManager.on("statusChanged", () => {
         leetCodeStatusBarItem.updateStatusBar(leetCodeManager.getStatus(), leetCodeManager.getUser());
diff --git a/src/leetCodeExplorer.ts b/src/leetCodeExplorer.ts
@@ -1,5 +1,6 @@
 "use strict";
 
+import * as path from "path";
 import * as vscode from "vscode";
 import * as list from "./commands/list";
 
@@ -36,6 +37,8 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
     // tslint:disable-next-line:member-ordering
     public readonly onDidChangeTreeData: vscode.Event<any> = this.onDidChangeTreeDataEvent.event;
 
+    constructor(private context: vscode.ExtensionContext) { }
+
     public async refresh(): Promise<void> {
         this.treeData.clear();
         await this.getProblemData();
@@ -44,10 +47,15 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
 
     public getTreeItem(element: LeetCodeNode): vscode.TreeItem | Thenable<vscode.TreeItem> {
         return {
-            label: element.name,
+            label: element.isProblem ? `[${element.id}] ${element.name}` : element.name,
             id: element.id,
             collapsibleState: element.isProblem ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed,
             contextValue: element.isProblem ? "problem" : "difficulty",
+            iconPath: element.isProblem ?
+                (element.solved ?
+                    this.context.asAbsolutePath(path.join("resources", "check.png"))
+                    : this.context.asAbsolutePath(path.join("resources", "blank.png")))
+                : "",
         };
     }
     public getChildren(element?: LeetCodeNode | undefined): vscode.ProviderResult<LeetCodeNode[]> {
diff --git a/src/shared.ts b/src/shared.ts
@@ -28,5 +28,5 @@ export const languages = [
     "python3",
     "ruby",
     "scala",
-    "swift"
+    "swift",
 ];
diff --git a/src/utils/workspaceUtils.ts b/src/utils/workspaceUtils.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import * as vscode from "vscode"
 import * as os from "os";
+import * as vscode from "vscode";
 
 export async function selectWorkspaceFolder(): Promise<string> {
     let folder: vscode.WorkspaceFolder | undefined;
