fix the icon bug in explorer (LeetCode-OpenSource#14)

jdneo · web-flow · commit 331ea7003030 · 2018-02-26T13:23:31.000+08:00
diff --git a/resources/x.png b/resources/x.png
diff --git a/src/commands/list.ts b/src/commands/list.ts
@@ -2,13 +2,12 @@
 
 import * as vscode from "vscode";
 import { leetCodeManager } from "../leetCodeManager";
-import { leetCodeBinaryPath } from "../shared";
-import { UserStatus } from "../shared";
+import { leetCodeBinaryPath, ProblemState, UserStatus } from "../shared";
 import { executeCommand } from "../utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel } from "../utils/uiUtils";
 
 export interface IProblem {
-    solved: boolean;
+    state: ProblemState;
     id: string;
     name: string;
     difficulty: string;
@@ -28,7 +27,7 @@ export async function listProblems(channel: vscode.OutputChannel): Promise<IProb
             const match: RegExpMatchArray | null = line.match(reg);
             if (match && match.length === 6) {
                 problems.push({
-                    solved: !!(match[1].trim()),
+                    state: parseProblemState(match[1]),
                     id: match[2].trim(),
                     name: match[3].trim(),
                     difficulty: match[4].trim(),
@@ -41,5 +40,22 @@ export async function listProblems(channel: vscode.OutputChannel): Promise<IProb
         await promptForOpenOutputChannel("Failed to list problems. Please open the output channel for details", DialogType.error, channel);
         return [];
     }
+}
 
+function parseProblemState(stateOutput: string): ProblemState {
+    if (!stateOutput) {
+        return ProblemState.Unknown;
+    }
+    switch (stateOutput.trim()) {
+        case "v":
+        case "✔":
+        case "√":
+            return ProblemState.AC;
+        case "X":
+        case "✘":
+        case "×":
+            return ProblemState.NotAC;
+        default:
+            return ProblemState.Unknown;
+    }
 }
diff --git a/src/commands/show.ts b/src/commands/show.ts
@@ -4,7 +4,7 @@ import * as fse from "fs-extra";
 import * as vscode from "vscode";
 import { LeetCodeNode } from "../leetCodeExplorer";
 import { leetCodeManager } from "../leetCodeManager";
-import { IQuickItemEx, languages, leetCodeBinaryPath } from "../shared";
+import { IQuickItemEx, languages, leetCodeBinaryPath, ProblemState } from "../shared";
 import { executeCommand } from "../utils/cpUtils";
 import { DialogOptions, DialogType, promptForOpenOutputChannel, promptForSignIn } from "../utils/uiUtils";
 import { selectWorkspaceFolder } from "../utils/workspaceUtils";
@@ -79,11 +79,22 @@ async function showProblemInternal(channel: vscode.OutputChannel, id: string): P
 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}`,
+            label: `${parseProblemDecorator(problem.state)}${problem.id}.${problem.name}`,
             description: "",
             detail: `AC rate: ${problem.passRate}, Difficulty: ${problem.difficulty}`,
             value: problem.id,
         }));
         resolve(picks);
     });
 }
+
+function parseProblemDecorator(state: ProblemState): string {
+    switch (state) {
+        case ProblemState.AC:
+            return "$(check) ";
+        case ProblemState.NotAC:
+            return "$(x) ";
+        default:
+            return "";
+    }
+}
diff --git a/src/leetCodeExplorer.ts b/src/leetCodeExplorer.ts
@@ -4,6 +4,7 @@ import * as path from "path";
 import * as vscode from "vscode";
 import * as list from "./commands/list";
 import { leetCodeManager } from "./leetCodeManager";
+import { ProblemState } from "./shared";
 
 // tslint:disable:max-classes-per-file
 export class LeetCodeNode {
@@ -13,8 +14,8 @@ export class LeetCodeNode {
         return this.data.name;
     }
 
-    public get solved(): boolean {
-        return this.data.solved;
+    public get state(): ProblemState {
+        return this.data.state;
     }
 
     public get id(): string {
@@ -64,11 +65,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             id: `${idPrefix}.${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")))
-                : "",
+            iconPath: this.parseIconPathFromProblemState(element),
         };
     }
 
@@ -77,7 +74,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             return [
                 new LeetCodeNode(
                     {
-                        solved: false,
+                        state: ProblemState.Unknown,
                         id: "notSignIn",
                         name: "Sign in to LeetCode",
                         difficulty: "",
@@ -128,7 +125,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             difficultynodes.push(
                 new LeetCodeNode(
                     {
-                        solved: false,
+                        state: ProblemState.Unknown,
                         id: difficulty,
                         name: difficulty,
                         difficulty: "",
@@ -155,4 +152,20 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
         });
         return difficultynodes;
     }
+
+    private parseIconPathFromProblemState(element: LeetCodeNode): string {
+        if (!element.isProblem) {
+            return "";
+        }
+        switch (element.state) {
+            case ProblemState.AC:
+                return this.context.asAbsolutePath(path.join("resources", "check.png"));
+            case ProblemState.NotAC:
+                return this.context.asAbsolutePath(path.join("resources", "x.png"));
+            case ProblemState.Unknown:
+                return this.context.asAbsolutePath(path.join("resources", "blank.png"));
+            default:
+                return "";
+        }
+    }
 }
diff --git a/src/shared.ts b/src/shared.ts
@@ -30,3 +30,9 @@ export const languages = [
     "scala",
     "swift",
 ];
+
+export enum ProblemState {
+    AC = 1,
+    NotAC = 2,
+    Unknown = 3,
+}
