From 832f8a3d3396c0b07b5a3907772fbfcc222410d9 Mon Sep 17 00:00:00 2001
From: Freddie Wang <tsfreddiewang@gmail.com>
Date: Thu, 8 Mar 2018 21:05:13 -0800
Subject: [PATCH 1/2] Support locked problems

---
 package.json            |   5 +++++
 resources/lock.png      | Bin 0 -> 2550 bytes
 src/commands/list.ts    |  22 ++++++++++++++--------
 src/commands/show.ts    |   6 +++++-
 src/leetCodeExplorer.ts |  10 ++++++++++
 5 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 resources/lock.png

diff --git a/package.json b/package.json
index 822fe441..bcef2d8f 100644
--- a/package.json
+++ b/package.json
@@ -129,6 +129,11 @@
             {
                 "title": "LeetCode",
                 "properties": {
+                    "leetcode.showLocked": {
+                        "type": "boolean",
+                        "default": true,
+                        "description": "Show locked problems."
+                    },
                     "leetcode.defaultLanguage": {
                         "type": "string",
                         "enum": [
diff --git a/resources/lock.png b/resources/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..96780dada2edbb13f2d7847825036bd925069bd8
GIT binary patch
literal 2550
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

literal 0
HcmV?d00001

diff --git a/src/commands/list.ts b/src/commands/list.ts
index 5fcd3d53..df9a9c2d 100644
--- a/src/commands/list.ts
+++ b/src/commands/list.ts
@@ -7,6 +7,8 @@ import { executeCommand } from "../utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel } from "../utils/uiUtils";
 
 export interface IProblem {
+    favorate: boolean;
+    locked: boolean;
     state: ProblemState;
     id: string;
     name: string;
@@ -19,19 +21,23 @@ export async function listProblems(channel: vscode.OutputChannel): Promise<IProb
         if (leetCodeManager.getStatus() === UserStatus.SignedOut) {
             return [];
         }
-        const result: string = await executeCommand(channel, "node", [leetCodeBinaryPath, "list", "-q", "L"]);
+        const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
+        const showLocked = leetCodeConfig.get<string>("showLocked");
+        const result: string = await executeCommand(channel, "node", showLocked ? [leetCodeBinaryPath, "list"] : [leetCodeBinaryPath, "list", "-q", "L"]);
         const problems: IProblem[] = [];
         const lines: string[] = result.split("\n");
-        const reg: RegExp = /(.?)\s*\[\s*(\d*)\]\s*(.*)\s*(Easy|Medium|Hard)\s*\((\s*\d+\.\d+ %)\)/;
+        const reg: RegExp = /^(.)\s(.{1,2})\s(.)\s\[\s*(\d*)\]\s*(.*)\s*(Easy|Medium|Hard)\s*\((\s*\d+\.\d+ %)\)/;
         for (const line of lines) {
             const match: RegExpMatchArray | null = line.match(reg);
-            if (match && match.length === 6) {
+            if (match && match.length === 8) {
                 problems.push({
-                    state: parseProblemState(match[1]),
-                    id: match[2].trim(),
-                    name: match[3].trim(),
-                    difficulty: match[4].trim(),
-                    passRate: match[5].trim(),
+                    favorate: match[1].trim().length > 0,
+                    locked: match[2].trim().length > 0,
+                    state: parseProblemState(match[3]),
+                    id: match[4].trim(),
+                    name: match[5].trim(),
+                    difficulty: match[6].trim(),
+                    passRate: match[7].trim(),
                 });
             }
         }
diff --git a/src/commands/show.ts b/src/commands/show.ts
index b8ce98b5..081a6bd2 100644
--- a/src/commands/show.ts
+++ b/src/commands/show.ts
@@ -81,7 +81,7 @@ async function parseProblemsToPicks(p: Promise<list.IProblem[]>): Promise<Array<
         const picks: Array<IQuickItemEx<string>> = (await p).map((problem: list.IProblem) => Object.assign({}, {
             label: `${parseProblemDecorator(problem.state)}${problem.id}.${problem.name}`,
             description: "",
-            detail: `AC rate: ${problem.passRate}, Difficulty: ${problem.difficulty}`,
+            detail: `${parseLockDecorator(problem.locked)}AC rate: ${problem.passRate}, Difficulty: ${problem.difficulty}`,
             value: problem.id,
         }));
         resolve(picks);
@@ -98,3 +98,7 @@ function parseProblemDecorator(state: ProblemState): string {
             return "";
     }
 }
+
+function parseLockDecorator(locked: boolean): string {
+    return locked ? "$(lock) " : "";
+}
diff --git a/src/leetCodeExplorer.ts b/src/leetCodeExplorer.ts
index 9f26bbeb..927fb5fb 100644
--- a/src/leetCodeExplorer.ts
+++ b/src/leetCodeExplorer.ts
@@ -10,6 +10,9 @@ import { ProblemState } from "./shared";
 export class LeetCodeNode {
     constructor(private data: list.IProblem, private isProblemNode = true) { }
 
+    public get locked(): boolean {
+        return this.data.locked;
+    }
     public get name(): string {
         return this.data.name;
     }
@@ -74,6 +77,8 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             return [
                 new LeetCodeNode(
                     {
+                        favorate: false,
+                        locked: false,
                         state: ProblemState.Unknown,
                         id: "notSignIn",
                         name: "Sign in to LeetCode",
@@ -125,6 +130,8 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             difficultynodes.push(
                 new LeetCodeNode(
                     {
+                        favorate: false,
+                        locked: false,
                         state: ProblemState.Unknown,
                         id: difficulty,
                         name: difficulty,
@@ -163,6 +170,9 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             case ProblemState.NotAC:
                 return this.context.asAbsolutePath(path.join("resources", "x.png"));
             case ProblemState.Unknown:
+                if (element.locked) {
+                    return this.context.asAbsolutePath(path.join("resources", "lock.png"));
+                }
                 return this.context.asAbsolutePath(path.join("resources", "blank.png"));
             default:
                 return "";

From bc019c9bad0c1c9ef5a6edc753cfdd340e29fbf2 Mon Sep 17 00:00:00 2001
From: Freddie Wang <tsfreddiewang@gmail.com>
Date: Fri, 9 Mar 2018 09:10:22 -0800
Subject: [PATCH 2/2] Fixed a typo, added a type def

---
 package.json            | 2 +-
 src/commands/list.ts    | 6 +++---
 src/leetCodeExplorer.ts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index bcef2d8f..dfd17b6a 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
                 "properties": {
                     "leetcode.showLocked": {
                         "type": "boolean",
-                        "default": true,
+                        "default": false,
                         "description": "Show locked problems."
                     },
                     "leetcode.defaultLanguage": {
diff --git a/src/commands/list.ts b/src/commands/list.ts
index df9a9c2d..600335d0 100644
--- a/src/commands/list.ts
+++ b/src/commands/list.ts
@@ -7,7 +7,7 @@ import { executeCommand } from "../utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel } from "../utils/uiUtils";
 
 export interface IProblem {
-    favorate: boolean;
+    favorite: boolean;
     locked: boolean;
     state: ProblemState;
     id: string;
@@ -22,7 +22,7 @@ export async function listProblems(channel: vscode.OutputChannel): Promise<IProb
             return [];
         }
         const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
-        const showLocked = leetCodeConfig.get<string>("showLocked");
+        const showLocked: boolean | undefined = leetCodeConfig.get<boolean>("showLocked");
         const result: string = await executeCommand(channel, "node", showLocked ? [leetCodeBinaryPath, "list"] : [leetCodeBinaryPath, "list", "-q", "L"]);
         const problems: IProblem[] = [];
         const lines: string[] = result.split("\n");
@@ -31,7 +31,7 @@ export async function listProblems(channel: vscode.OutputChannel): Promise<IProb
             const match: RegExpMatchArray | null = line.match(reg);
             if (match && match.length === 8) {
                 problems.push({
-                    favorate: match[1].trim().length > 0,
+                    favorite: match[1].trim().length > 0,
                     locked: match[2].trim().length > 0,
                     state: parseProblemState(match[3]),
                     id: match[4].trim(),
diff --git a/src/leetCodeExplorer.ts b/src/leetCodeExplorer.ts
index 927fb5fb..09dc7cff 100644
--- a/src/leetCodeExplorer.ts
+++ b/src/leetCodeExplorer.ts
@@ -77,7 +77,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             return [
                 new LeetCodeNode(
                     {
-                        favorate: false,
+                        favorite: false,
                         locked: false,
                         state: ProblemState.Unknown,
                         id: "notSignIn",
@@ -130,7 +130,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             difficultynodes.push(
                 new LeetCodeNode(
                     {
-                        favorate: false,
+                        favorite: false,
                         locked: false,
                         state: ProblemState.Unknown,
                         id: difficulty,