Jan 21, 2019 · Jan 18, 2019 · Jan 18, 2019
diff --git a/package.json b/package.json
        "commands": [
            {
                "command": "leetcode.deleteCache",
                "title": "Deletecache",
                "title": "DeleteCache",
                "category": "LeetCode"
            },
            {
                "command": "leetcode.toogleLeetCodeCn",
                "title": "Switchendpoint",
                "title": "SwitchEndpoint",
                "category": "LeetCode",
                "icon": "resources/cn.png"
                "icon": {
                    "light": "resources/light/endpoint.svg",
                    "dark": "resources/dark/endpoint.svg"
                }
            },
            {
                "command": "leetcode.signin",
                "title": "Signin",
                "title": "SignIn",
                "category": "LeetCode",
                "icon": {
                    "light": "resources/light/signin.png",
                    "dark": "resources/dark/signin.png"
                    "light": "resources/light/signin.svg",
                    "dark": "resources/dark/signin.svg"
                }
            },
            {
                "command": "leetcode.signout",
                "title": "Signout",
                "title": "SignOut",
                "category": "LeetCode"
            },
            {
                "command": "leetcode.selectSessions",
                "title": "Selectsession",
                "title": "SelectSession",
                "category": "LeetCode"
            },
            {
                "command": "leetcode.createSession",
                "title": "Createnew session",
                "title": "CreateNew Session",
                "category": "LeetCode"
            },
            {
            },
            {
                "command": "leetcode.showProblem",
                "title": "Showproblem",
                "title": "ShowProblem",
                "category": "LeetCode"
            },
            {
                "command": "leetcode.searchProblem",
                "title": "Search Problem",
                "category": "LeetCode",
                "icon": "resources/search.png"
                "icon": {
                    "light": "resources/light/search.svg",
                    "dark": "resources/dark/search.svg"
                }
            },
            {
                "command": "leetcode.testSolution",
diff --git a/resources/cn.png b/resources/cn.png
diff --git a/resources/dark/endpoint.svg b/resources/dark/endpoint.svg
diff --git a/resources/dark/refresh.svg b/resources/dark/refresh.svg
diff --git a/resources/dark/search.svg b/resources/dark/search.svg
diff --git a/resources/dark/signin.png b/resources/dark/signin.png
diff --git a/resources/dark/signin.svg b/resources/dark/signin.svg
diff --git a/resources/light/endpoint.svg b/resources/light/endpoint.svg
diff --git a/resources/light/refresh.svg b/resources/light/refresh.svg
diff --git a/resources/light/search.svg b/resources/light/search.svg
diff --git a/resources/light/signin.png b/resources/light/signin.png
diff --git a/resources/light/signin.svg b/resources/light/signin.svg
diff --git a/resources/search.png b/resources/search.png
diff --git a/src/commands/plugin.ts b/src/commands/plugin.ts
 // Copyright (c) jdneo. All rights reserved.
 // Licensed under the MIT license.

 import * as fse from "fs-extra";
 import * as os from "os";
 import * as path from "path";
 import * as vscode from "vscode";
 import { leetCodeExecutor } from "../leetCodeExecutor";
 import { IQuickItemEx } from "../shared";
 import { Endpoint } from "../shared";
 import { DialogType, promptForOpenOutputChannel, promptForSignIn } from "../utils/uiUtils";
 import { deleteCache } from "./cache";

 export async functiontoogleLeetCodeCn(): Promise<void> {
    const isCnEnbaled: boolean =isLeetCodeCnEnabled();
 export async functionswitchEndpoint(): Promise<void> {
    const isCnEnbaled: boolean =getLeetCodeEndpoint() === Endpoint.LeetCodeCN;
    const picks: Array<IQuickItemEx<string>> = [];
    picks.push(
        {
            label: `${isCnEnbaled ? "$(check) " : ""}On`,
            description: "",
            detail: `Enable${Endpoint.LeetCodeCN}.`,
            value:"on",
            label: `${isCnEnbaled ? "" : "$(check) "}LeetCode`,
            description: "leetcode.com",
            detail: `EnableLeetCode US`,
            value:Endpoint.LeetCode,
        },
        {
            label: `${isCnEnbaled ? "" : "$(check) "}Off`,
            description: "",
            detail: `Disable ${Endpoint.LeetCodeCN}.`,
            value:"off",
            label: `${isCnEnbaled ? "$(check) " : ""}力扣`,
            description: "leetcode-cn.com",
            detail: `启用中国版 LeetCode`,
            value:Endpoint.LeetCodeCN,
        },
    );
    const choice: IQuickItemEx<string> | undefined = await vscode.window.showQuickPick(picks);
    }
    const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
    try {
        const enabled: boolean = choice.value === "on";
        const endpoint: string = enabled ? Endpoint.LeetCodeCN : Endpoint.LeetCode;
        await leetCodeExecutor.toggleLeetCodeCn(enabled);
        const endpoint: string = choice.value;
        await leetCodeExecutor.switchEndpoint(endpoint);
        await leetCodeConfig.update("endpoint", endpoint, true /* UserSetting */);
        vscode.window.showInformationMessage(`Switched the endpoint to ${endpoint}`);
    } catch (error) {
    }
 }

 export async function initializeEndpoint(): Promise<void> {
    const isCnEnabledInExtension: boolean = isLeetCodeCnEnabled();
    const isCnEnabledInCli: boolean = await isLeetCodeCnEnabledInCli();
    await leetCodeExecutor.toggleLeetCodeCn(isCnEnabledInExtension);
    if (isCnEnabledInCli !== isCnEnabledInExtension) {
        await deleteCache();
    }
 }

 export function isLeetCodeCnEnabled(): boolean {
 export function getLeetCodeEndpoint(): string {
    const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
    const endpoint: string | undefined = leetCodeConfig.get<string>("endpoint");
    if (endpoint && endpoint === Endpoint.LeetCodeCN) {
        return true;
    }
    return false;
 }

 async function isLeetCodeCnEnabledInCli(): Promise<boolean> {
    const pluginsStatusFile: string = path.join(os.homedir(), ".lc", "plugins.json");
    if (!await fse.pathExists(pluginsStatusFile)) {
        return false;
    }
    const pluginsObj: {} = await fse.readJson(pluginsStatusFile);
    return pluginsObj["leetcode.cn"];
    return leetCodeConfig.get<string>("endpoint", Endpoint.LeetCode);
 }
diff --git a/src/extension.ts b/src/extension.ts
        vscode.window.registerTreeDataProvider("leetCodeExplorer", leetCodeTreeDataProvider),
        vscode.languages.registerCodeLensProvider({ scheme: "file" }, codeLensProvider),
        vscode.commands.registerCommand("leetcode.deleteCache", () => cache.deleteCache()),
        vscode.commands.registerCommand("leetcode.toogleLeetCodeCn", () => plugin.toogleLeetCodeCn()),
        vscode.commands.registerCommand("leetcode.toogleLeetCodeCn", () => plugin.switchEndpoint()),
        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.submitSolution", (uri?: vscode.Uri) => submit.submitSolution(uri)),
    );

    await plugin.initializeEndpoint();
    awaitleetCodeExecutor.switchEndpoint(plugin.getLeetCodeEndpoint());
    leetCodeManager.getLoginStatus();
 }

diff --git a/src/leetCodeExecutor.ts b/src/leetCodeExecutor.ts
 import * as cp from "child_process";
 import * as path from "path";
 import * as vscode from "vscode";
 import { Endpoint } from "./shared";
 import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils";
 import { DialogOptions, openUrl } from "./utils/uiUtils";
 import * as wsl from "./utils/wslUtils";
        return await this.executeCommandWithProgressEx("Submitting to LeetCode...", "node", [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`]);
    }

    public async toggleLeetCodeCn(isEnable: boolean): Promise<string> {
        if (isEnable) {
            return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-e", "leetcode.cn"]);
    public async switchEndpoint(endpoint: string): Promise<string> {
        switch (endpoint) {
            case Endpoint.LeetCodeCN:
                return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-e", "leetcode.cn"]);
            case Endpoint.LeetCode:
            default:
                return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-d", "leetcode.cn"]);
        }
        return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-d", "leetcode.cn"]);
    }

    private async executeCommandEx(command: string, args: string[], options: cp.SpawnOptions = { shell: true }): Promise<string> {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,37 +43,40 @@
		"commands": [
		{
		"command": "leetcode.deleteCache",
		"title": "Deletecache",
		"title": "DeleteCache",
		"category": "LeetCode"
		},
		{
		"command": "leetcode.toogleLeetCodeCn",
		"title": "Switchendpoint",
		"title": "SwitchEndpoint",
		"category": "LeetCode",
		"icon": "resources/cn.png"
		"icon": {
		"light": "resources/light/endpoint.svg",
		"dark": "resources/dark/endpoint.svg"
		}
		},
		{
		"command": "leetcode.signin",
		"title": "Signin",
		"title": "SignIn",
		"category": "LeetCode",
		"icon": {
		"light": "resources/light/signin.png",
		"dark": "resources/dark/signin.png"
		"light": "resources/light/signin.svg",
		"dark": "resources/dark/signin.svg"
		}
		},
		{
		"command": "leetcode.signout",
		"title": "Signout",
		"title": "SignOut",
		"category": "LeetCode"
		},
		{
		"command": "leetcode.selectSessions",
		"title": "Selectsession",
		"title": "SelectSession",
		"category": "LeetCode"
		},
		{
		"command": "leetcode.createSession",
		"title": "Createnew session",
		"title": "CreateNew Session",
		"category": "LeetCode"
		},
		{
Expand All		@@ -87,14 +90,17 @@
		},
		{
		"command": "leetcode.showProblem",
		"title": "Showproblem",
		"title": "ShowProblem",
		"category": "LeetCode"
		},
		{
		"command": "leetcode.searchProblem",
		"title": "Search Problem",
		"category": "LeetCode",
		"icon": "resources/search.png"
		"icon": {
		"light": "resources/light/search.svg",
		"dark": "resources/dark/search.svg"
		}
		},
		{
		"command": "leetcode.testSolution",
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,31 +1,28 @@
		// Copyright (c) jdneo. All rights reserved.
		// Licensed under the MIT license.

		import * as fse from "fs-extra";
		import * as os from "os";
		import * as path from "path";
		import * as vscode from "vscode";
		import { leetCodeExecutor } from "../leetCodeExecutor";
		import { IQuickItemEx } from "../shared";
		import { Endpoint } from "../shared";
		import { DialogType, promptForOpenOutputChannel, promptForSignIn } from "../utils/uiUtils";
		import { deleteCache } from "./cache";

		export async functiontoogleLeetCodeCn(): Promise<void> {
		const isCnEnbaled: boolean =isLeetCodeCnEnabled();
		export async functionswitchEndpoint(): Promise<void> {
		const isCnEnbaled: boolean =getLeetCodeEndpoint() === Endpoint.LeetCodeCN;
		const picks: Array<IQuickItemEx<string>> = [];
		picks.push(
		{
		label: `${isCnEnbaled ? "$(check) " : ""}On`,
		description: "",
		detail: `Enable${Endpoint.LeetCodeCN}.`,
		value:"on",
		label: `${isCnEnbaled ? "" : "$(check) "}LeetCode`,
		description: "leetcode.com",
		detail: `EnableLeetCode US`,
		value:Endpoint.LeetCode,
		},
		{
		label: `${isCnEnbaled ? "" : "$(check) "}Off`,
		description: "",
		detail: `Disable ${Endpoint.LeetCodeCN}.`,
		value:"off",
		label: `${isCnEnbaled ? "$(check) " : ""}力扣`,
		description: "leetcode-cn.com",
		detail: `启用中国版 LeetCode`,
		value:Endpoint.LeetCodeCN,
		},
		);
		const choice: IQuickItemEx<string> \| undefined = await vscode.window.showQuickPick(picks);
Expand All		@@ -34,9 +31,8 @@ export async function toogleLeetCodeCn(): Promise<void> {
		}
		const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
		try {
		const enabled: boolean = choice.value === "on";
		const endpoint: string = enabled ? Endpoint.LeetCodeCN : Endpoint.LeetCode;
		await leetCodeExecutor.toggleLeetCodeCn(enabled);
		const endpoint: string = choice.value;
		await leetCodeExecutor.switchEndpoint(endpoint);
		await leetCodeConfig.update("endpoint", endpoint, true /* UserSetting */);
		vscode.window.showInformationMessage(`Switched the endpoint to ${endpoint}`);
		} catch (error) {
Expand All		@@ -52,29 +48,7 @@ export async function toogleLeetCodeCn(): Promise<void> {
		}
		}

		export async function initializeEndpoint(): Promise<void> {
		const isCnEnabledInExtension: boolean = isLeetCodeCnEnabled();
		const isCnEnabledInCli: boolean = await isLeetCodeCnEnabledInCli();
		await leetCodeExecutor.toggleLeetCodeCn(isCnEnabledInExtension);
		if (isCnEnabledInCli !== isCnEnabledInExtension) {
		await deleteCache();
		}
		}

		export function isLeetCodeCnEnabled(): boolean {
		export function getLeetCodeEndpoint(): string {
		const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
		const endpoint: string \| undefined = leetCodeConfig.get<string>("endpoint");
		if (endpoint && endpoint === Endpoint.LeetCodeCN) {
		return true;
		}
		return false;
		}

		async function isLeetCodeCnEnabledInCli(): Promise<boolean> {
		const pluginsStatusFile: string = path.join(os.homedir(), ".lc", "plugins.json");
		if (!await fse.pathExists(pluginsStatusFile)) {
		return false;
		}
		const pluginsObj: {} = await fse.readJson(pluginsStatusFile);
		return pluginsObj["leetcode.cn"];
		return leetCodeConfig.get<string>("endpoint", Endpoint.LeetCode);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,7 +36,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
		vscode.window.registerTreeDataProvider("leetCodeExplorer", leetCodeTreeDataProvider),
		vscode.languages.registerCodeLensProvider({ scheme: "file" }, codeLensProvider),
		vscode.commands.registerCommand("leetcode.deleteCache", () => cache.deleteCache()),
		vscode.commands.registerCommand("leetcode.toogleLeetCodeCn", () => plugin.toogleLeetCodeCn()),
		vscode.commands.registerCommand("leetcode.toogleLeetCodeCn", () => plugin.switchEndpoint()),
		vscode.commands.registerCommand("leetcode.signin", () => leetCodeManager.signIn()),
		vscode.commands.registerCommand("leetcode.signout", () => leetCodeManager.signOut()),
		vscode.commands.registerCommand("leetcode.selectSessions", () => session.selectSession()),
Expand All		@@ -48,7 +48,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
		vscode.commands.registerCommand("leetcode.submitSolution", (uri?: vscode.Uri) => submit.submitSolution(uri)),
		);

		await plugin.initializeEndpoint();
		awaitleetCodeExecutor.switchEndpoint(plugin.getLeetCodeEndpoint());
		leetCodeManager.getLoginStatus();
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@
		import * as cp from "child_process";
		import * as path from "path";
		import * as vscode from "vscode";
		import { Endpoint } from "./shared";
		import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils";
		import { DialogOptions, openUrl } from "./utils/uiUtils";
		import * as wsl from "./utils/wslUtils";
Expand DownExpand Up		@@ -89,11 +90,14 @@ class LeetCodeExecutor {
		return await this.executeCommandWithProgressEx("Submitting to LeetCode...", "node", [await this.getLeetCodeBinaryPath(), "test", `"${filePath}"`]);
		}

		public async toggleLeetCodeCn(isEnable: boolean): Promise<string> {
		if (isEnable) {
		return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-e", "leetcode.cn"]);
		public async switchEndpoint(endpoint: string): Promise<string> {
		switch (endpoint) {
		case Endpoint.LeetCodeCN:
		return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-e", "leetcode.cn"]);
		case Endpoint.LeetCode:
		default:
		return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-d", "leetcode.cn"]);
		}
		return await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-d", "leetcode.cn"]);
		}

		private async executeCommandEx(command: string, args: string[], options: cp.SpawnOptions = { shell: true }): Promise<string> {
Expand Down