Feb 3, 2021 · Feb 3, 2021 · Feb 4, 2021 · Feb 4, 2021 · Apr 10, 2021 · Apr 10, 2021
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/commands/list.ts b/src/commands/list.ts
diff --git a/src/explorer/LeetCodeNode.ts b/src/explorer/LeetCodeNode.ts
diff --git a/src/explorer/explorerNodeManager.ts b/src/explorer/explorerNodeManager.ts
diff --git a/src/leetCodeExecutor.ts b/src/leetCodeExecutor.ts
diff --git a/src/leetCodeManager.ts b/src/leetCodeManager.ts
diff --git a/src/shared.ts b/src/shared.ts
diff --git a/src/utils/cpUtils.ts b/src/utils/cpUtils.ts
diff --git a/src/webview/leetCodePreviewProvider.ts b/src/webview/leetCodePreviewProvider.ts
diff --git a/src/webview/leetCodeSolutionProvider.ts b/src/webview/leetCodeSolutionProvider.ts
diff --git a/src/webview/leetCodeSubmissionProvider.ts b/src/webview/leetCodeSubmissionProvider.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,7 @@
		"name": "vscode-leetcode",
		"displayName": "LeetCode",
		"description": "Solve LeetCode problems in VS Code",
	"version": "0.17.0",
	"version": "0.18.0",
		"author": "Sheng Chen",
		"publisher": "LeetCode",
		"license": "MIT",
Expand Down Expand Up		@@ -671,11 +671,11 @@
		"@types/lodash": "^4.14.123",
		"@types/markdown-it": "0.0.7",
		"@types/mocha": "^2.2.42",
	"@types/node": "^7.0.43",
	"@types/node": "14.14.22",
		"@types/vscode": "1.42.0",
		"@types/require-from-string": "^1.2.0",
		"tslint": "^5.9.1",
	"typescript": "^2.6.1"
	"typescript": "4.1.3"
		},
		"dependencies": {
		"fs-extra": "^6.0.1",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@
		import * as vscode from "vscode";
		import { leetCodeExecutor } from "../leetCodeExecutor";
		import { leetCodeManager } from "../leetCodeManager";
	import { IProblem, ProblemState, UserStatus } from "../shared";
	import { IProblem, ProblemCategory, ProblemState, UserStatus } from "../shared";
		import { DialogType, promptForOpenOutputChannel } from "../utils/uiUtils";

		export async function listProblems(): Promise<IProblem[]> {
Expand All		@@ -14,26 +14,29 @@ export async function listProblems(): Promise<IProblem[]> {
		}
		const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
		const showLocked: boolean = !!leetCodeConfig.get<boolean>("showLocked");
	const result: string = await leetCodeExecutor.listProblems(showLocked);
		const problems: IProblem[] = [];
	const lines: string[] = result.split("\n");
	const reg: RegExp = /^(.)\s(.{1,2})\s(.)\s\[\s(\d)\s\]\s(.)\s(Easy\|Medium\|Hard)\s\((\s\d+\.\d+ %)\)/;
	const { companies, tags } = await leetCodeExecutor.getCompaniesAndTags();
	for (const line of lines) {
	const match: RegExpMatchArray \| null = line.match(reg);
	if (match && match.length === 8) {
	const id: string = match[4].trim();
	problems.push({
	id,
	isFavorite: match[1].trim().length > 0,
	locked: match[2].trim().length > 0,
	state: parseProblemState(match[3]),
	name: match[5].trim(),
	difficulty: match[6].trim(),
	passRate: match[7].trim(),
	companies: companies[id] \|\| ["Unknown"],
	tags: tags[id] \|\| ["Unknown"],
	});
	for (let pc in ProblemCategory) {
	const result: string = await leetCodeExecutor.listProblems(showLocked, ProblemCategory[pc]);
	const lines: string[] = result.split("\n");
	const reg: RegExp = /^(.)\s(.{1,2})\s(.)\s\[(.)\]\s(.)\s(Easy\|Medium\|Hard)\s\((\s\d+\.\d+ %)\)/;
	const { companies, tags } = await leetCodeExecutor.getCompaniesAndTags();
	for (const line of lines) {
	const match: RegExpMatchArray \| null = line.match(reg);
	if (match && match.length === 8) {
	const id: string = match[4].trim();
	problems.push({
	id,
	isFavorite: match[1].trim().length > 0,
	locked: match[2].trim().length > 0,
	state: parseProblemState(match[3]),
	name: match[5].trim(),
	difficulty: match[6].trim(),
	passRate: match[7].trim(),
	companies: companies[id] \|\| ["Unknown"],
	tags: tags[id] \|\| ["Unknown"],
	category: pc,
	});
	}
		}
		}
		return problems.reverse();
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,10 @@ export class LeetCodeNode {
		return this.data.name;
		}

	public get category(): string {
	return this.data.category;
	}

		public get state(): ProblemState {
		return this.data.state;
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,6 +57,35 @@ class ExplorerNodeManager implements Disposable {

		public getAllNodes(): LeetCodeNode[] {
		return Array.from(this.explorerNodeMap.values());
	// const res: LeetCodeNode[] = [];
	// res.push(
	// new LeetCodeNode(Object.assign({}, defaultProblem, {
	// id: ``,
	// name: "算法",
	// }), false),
	// new LeetCodeNode(Object.assign({}, defaultProblem, {
	// id: ``,
	// name: "数据库",
	// }), false),
	// new LeetCodeNode(Object.assign({}, defaultProblem, {
	// id: ``,
	// name: "Shell",
	// }), false),
	// new LeetCodeNode(Object.assign({}, defaultProblem, {
	// id: ``,
	// name: "多线程",
	// }), false),
	// new LeetCodeNode(Object.assign({}, defaultProblem, {
	// id: ``,
	// name: "程序员面试金典",
	// }), false),
	// new LeetCodeNode(Object.assign({}, defaultProblem, {
	// id: ``,
	// name: "剑指Offer",
	// }), false),
	// );
	// this.sortSubCategoryNodes(res, Category.All);
	// return res;
		}

		public getAllDifficultyNodes(): LeetCodeNode[] {
Expand Down Expand Up		@@ -153,22 +182,41 @@ class ExplorerNodeManager implements Disposable {

		private sortSubCategoryNodes(subCategoryNodes: LeetCodeNode[], category: Category): void {
		switch (category) {
	case Category.All:
	function getCategoryValue(input: LeetCodeNode): number {
	switch (input.category.toLowerCase()) {
	case "algorithms":
	return 1;
	case "database":
	return 2;
	case "shell":
	return 3;
	case "concurrency":
	return 4;
	case "lcci":
	return 4;
	case "lcof":
	return 4;
	default:
	return Number.MAX_SAFE_INTEGER;
	}
	}
	subCategoryNodes.sort((a: LeetCodeNode, b: LeetCodeNode): number => getCategoryValue(a) - getCategoryValue(b));
	break;
		case Category.Difficulty:
	subCategoryNodes.sort((a: LeetCodeNode, b: LeetCodeNode): number => {
	function getValue(input: LeetCodeNode): number {
	switch (input.name.toLowerCase()) {
	case "easy":
	return 1;
	case "medium":
	return 2;
	case "hard":
	return 3;
	default:
	return Number.MAX_SAFE_INTEGER;
	}
	function getDifficultyValue(input: LeetCodeNode): number {
	switch (input.name.toLowerCase()) {
	case "easy":
	return 1;
	case "medium":
	return 2;
	case "hard":
	return 3;
	default:
	return Number.MAX_SAFE_INTEGER;
		}
	return getValue(a) - getValue(b);
	});
	}
	subCategoryNodes.sort((a: LeetCodeNode, b: LeetCodeNode): number => getDifficultyValue(a) - getDifficultyValue(b));
		break;
		case Category.Tag:
		case Category.Company:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,10 +88,10 @@ class LeetCodeExecutor implements Disposable {
		return await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "user", "-L"]);
		}

	public async listProblems(showLocked: boolean): Promise<string> {
	public async listProblems(showLocked: boolean, category: string): Promise<string> {
		return await this.executeCommandEx(this.nodeExecutable, showLocked ?
	[await this.getLeetCodeBinaryPath(), "list"] :
	[await this.getLeetCodeBinaryPath(), "list", "-q", "L"],
	[await this.getLeetCodeBinaryPath(), "list", "-t", category] :
	[await this.getLeetCodeBinaryPath(), "list", "-t", category, "-q", "L"],
		);
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -83,7 +83,7 @@ class LeetCodeManager extends EventEmitter {
		env: createEnvOption(),
		});

	childProc.stdout.on("data", async (data: string \| Buffer) => {
	childProc.stdout?.on("data", async (data: string \| Buffer) => {
		data = data.toString();
		leetCodeChannel.append(data);
		if (data.includes("twoFactorCode")) {
Expand All		@@ -96,19 +96,19 @@ class LeetCodeManager extends EventEmitter {
		childProc.kill();
		return resolve(undefined);
		}
	childProc.stdin.write(`${twoFactor}\n`);
	childProc.stdin?.write(`${twoFactor}\n`);
		}
		const successMatch: RegExpMatchArray \| null = data.match(this.successRegex);
		if (successMatch && successMatch[1]) {
	childProc.stdin.end();
	childProc.stdin?.end();
		return resolve(successMatch[1]);
		} else if (data.match(this.failRegex)) {
	childProc.stdin.end();
	childProc.stdin?.end();
		return reject(new Error("Faile to login"));
		}
		});

	childProc.stderr.on("data", (data: string \| Buffer) => leetCodeChannel.append(data.toString()));
	childProc.stderr?.on("data", (data: string \| Buffer) => leetCodeChannel.append(data.toString()));

		childProc.on("error", reject);
		const name: string \| undefined = await vscode.window.showInputBox({
Expand All		@@ -120,7 +120,7 @@ class LeetCodeManager extends EventEmitter {
		childProc.kill();
		return resolve(undefined);
		}
	childProc.stdin.write(`${name}\n`);
	childProc.stdin?.write(`${name}\n`);
		const pwd: string \| undefined = await vscode.window.showInputBox({
		prompt: isByCookie ? "Enter cookie" : "Enter password.",
		password: true,
Expand All		@@ -131,7 +131,7 @@ class LeetCodeManager extends EventEmitter {
		childProc.kill();
		return resolve(undefined);
		}
	childProc.stdin.write(`${pwd}\n`);
	childProc.stdin?.write(`${pwd}\n`);
		});
		if (userName) {
		vscode.window.showInformationMessage(`Successfully ${inMessage}.`);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,6 +80,7 @@ export interface IProblem {
		passRate: string;
		companies: string[];
		tags: string[];
	category: string;
		}

		export const defaultProblem: IProblem = {
Expand All		@@ -92,6 +93,7 @@ export const defaultProblem: IProblem = {
		passRate: "",
		companies: [] as string[],
		tags: [] as string[],
	category: "",
		};

		export enum Category {
Expand All		@@ -102,6 +104,15 @@ export enum Category {
		Favorite = "Favorite",
		}

	export enum ProblemCategory {
	ALGORITHMS = "algorithms",
	DATABASE = "database",
	SHELL = "shell",
	CONCURRENCY = "concurrency",
	LCCI = "lcci",
	LCOF = "lcof",
	}

		export const supportedPlugins: string[] = [
		"company",
		"solution.discuss",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,13 +15,13 @@ export async function executeCommand(command: string, args: string[], options: c

		const childProc: cp.ChildProcess = cp.spawn(command, args, { ...options, env: createEnvOption() });

	childProc.stdout.on("data", (data: string \| Buffer) => {
	childProc.stdout?.on("data", (data: string \| Buffer) => {
		data = data.toString();
		result = result.concat(data);
		leetCodeChannel.append(data);
		});

	childProc.stderr.on("data", (data: string \| Buffer) => leetCodeChannel.append(data.toString()));
	childProc.stderr?.on("data", (data: string \| Buffer) => leetCodeChannel.append(data.toString()));

		childProc.on("error", reject);

Expand All		@@ -42,11 +42,11 @@ export async function executeCommand(command: string, args: string[], options: c
		export async function executeCommandWithProgress(message: string, command: string, args: string[], options: cp.SpawnOptions = { shell: true }): Promise<string> {
		let result: string = "";
		await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification }, async (p: vscode.Progress<{}>) => {
	return new Promise(async (resolve: () => void, reject: (e: Error) => void): Promise<void> => {
	return new Promise(async (resolve, reject): Promise<void> => {
		p.report({ message });
		try {
		result = await executeCommand(command, args, options);
	resolve();
	resolve(undefined);
		} catch (e) {
		reject(e);
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -130,8 +130,8 @@ class LeetCodePreviewProvider extends LeetCodeWebview {

		protected onDidDisposeWebview(): void {
		super.onDidDisposeWebview();
	delete this.node;
	delete this.description;
	// delete this.node;
	// delete this.description;
		this.sideMode = false;
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,7 +64,7 @@ class LeetCodeSolutionProvider extends LeetCodeWebview {

		protected onDidDisposeWebview(): void {
		super.onDidDisposeWebview();
	delete this.solution;
	// delete this.solution;
		}

		private parseSolution(raw: string): Solution {
Expand Down