Merge pull request #1 from jdneo/master

catch up

Author: Clock00Smith

ACKNOWLEDGEMENTS.md

@@ -8,3 +8,5 @@ A big thanks to the following individuals for contributing:
 - [@Vigilans](https://github.com/Vigilans) for contributing [#94](https://github.com/jdneo/vscode-leetcode/pull/94)
 - [@ringcrl](https://github.com/ringcrl) for contributing [#123](https://github.com/jdneo/vscode-leetcode/pull/123)
 - [@pujiaxun](https://github.com/pujiaxun) for contributing [#143](https://github.com/jdneo/vscode-leetcode/pull/143)
+- [@edvardchen](https://github.com/edvardchen) for contributing [#147](https://github.com/jdneo/vscode-leetcode/pull/147)
+- [@poppinlp](https://github.com/poppinlp) for contributing [#149](https://github.com/jdneo/vscode-leetcode/pull/149)

CHANGELOG.md

@@ -3,11 +3,17 @@ All notable changes to the "leetcode" extension will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
-## [Unreleased]
+## [0.11.0]
 ## Added
 - Add new setting: `leetcode.outputFolder` to customize the sub-directory to save the files generated by 'Show Problem' [#119](https://github.com/jdneo/vscode-leetcode/issues/119)
 - Add tooltips for sub-category nodes in LeetCode Explorer [#143](https://github.com/jdneo/vscode-leetcode/pull/143)
 
+## Changed
+- Now when triggering 'Show Problem', the extension will not generate a new file if it already exists [#59](https://github.com/jdneo/vscode-leetcode/issues/59)
+
+## Fixed
+- Log in timeout when proxy is enabled [#117](https://github.com/jdneo/vscode-leetcode/issues/117)
+
 ## [0.10.2]
 ## Fixed
 - Test cases cannot have double quotes [#60](https://github.com/jdneo/vscode-leetcode/issues/60)

package-lock.json

@@ -2,7 +2,7 @@
     "name": "vscode-leetcode",
     "displayName": "LeetCode",
     "description": "Solve LeetCode problems in VS Code",
-    "version": "0.10.2",
+    "version": "0.11.0",
     "author": "Sheng Chen",
     "publisher": "shengchen",
     "license": "MIT",
@@ -267,6 +267,7 @@
     },
     "devDependencies": {
         "@types/fs-extra": "5.0.0",
+        "@types/lodash.kebabcase": "^4.1.5",
         "@types/mocha": "^2.2.42",
         "@types/node": "^7.0.43",
         "@types/require-from-string": "^1.2.0",
@@ -277,6 +278,7 @@
     "dependencies": {
         "fs-extra": "^6.0.1",
         "leetcode-cli": "2.6.1",
+        "lodash.kebabcase": "^4.1.1",
         "require-from-string": "^2.0.2"
     }
 }

package.json

@@ -65,16 +65,10 @@ async function showProblemInternal(node: IProblem): Promise<void> {
 
         outDir = path.join(outDir, relativePath);
         await fse.ensureDir(outDir);
-        const result: string = await leetCodeExecutor.showProblem(node.id, language, outDir);
-        const reg: RegExp = /\* Source Code:\s*(.*)/;
-        const match: RegExpMatchArray | null = result.match(reg);
-        if (match && match.length >= 2) {
-            const filePath: string = wsl.useWsl() ? await wsl.toWinPath(match[1].trim()) : match[1].trim();
 
-            await vscode.window.showTextDocument(vscode.Uri.file(filePath), { preview: false });
-        } else {
-            throw new Error("Failed to fetch the problem information.");
-        }
+        const originFilePath: string = await leetCodeExecutor.showProblem(node, language, outDir);
+        const filePath: string = wsl.useWsl() ? await wsl.toWinPath(originFilePath) : originFilePath;
+        await vscode.window.showTextDocument(vscode.Uri.file(filePath), { preview: false });
 
         if (!defaultLanguage && leetCodeConfig.get<boolean>("showSetDefaultLanguageHint")) {
             const choice: vscode.MessageItem | undefined = await vscode.window.showInformationMessage(

src/commands/show.ts

@@ -65,27 +65,24 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider<LeetCod
             ];
         }
         if (!element) { // Root view
-            return new Promise(async (resolve: (res: LeetCodeNode[]) => void): Promise<void> => {
-                await this.getProblemData();
-                resolve([
-                    new LeetCodeNode(Object.assign({}, defaultProblem, {
-                        id: Category.Difficulty,
-                        name: Category.Difficulty,
-                    }), "ROOT", false),
-                    new LeetCodeNode(Object.assign({}, defaultProblem, {
-                        id: Category.Tag,
-                        name: Category.Tag,
-                    }), "ROOT", false),
-                    new LeetCodeNode(Object.assign({}, defaultProblem, {
-                        id: Category.Company,
-                        name: Category.Company,
-                    }), "ROOT", false),
-                    new LeetCodeNode(Object.assign({}, defaultProblem, {
-                        id: Category.Favorite,
-                        name: Category.Favorite,
-                    }), "ROOT", false),
-                ]);
-            });
+            return [
+                new LeetCodeNode(Object.assign({}, defaultProblem, {
+                    id: Category.Difficulty,
+                    name: Category.Difficulty,
+                }), "ROOT", false),
+                new LeetCodeNode(Object.assign({}, defaultProblem, {
+                    id: Category.Tag,
+                    name: Category.Tag,
+                }), "ROOT", false),
+                new LeetCodeNode(Object.assign({}, defaultProblem, {
+                    id: Category.Company,
+                    name: Category.Company,
+                }), "ROOT", false),
+                new LeetCodeNode(Object.assign({}, defaultProblem, {
+                    id: Category.Favorite,
+                    name: Category.Favorite,
+                }), "ROOT", false),
+            ];
         } else {
             switch (element.name) { // First-level
                 case Category.Favorite:

src/explorer/LeetCodeTreeDataProvider.ts

@@ -6,8 +6,9 @@ import * as fse from "fs-extra";
 import * as path from "path";
 import * as requireFromString from "require-from-string";
 import * as vscode from "vscode";
-import { Endpoint } from "./shared";
+import { Endpoint, IProblem } from "./shared";
 import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils";
+import { genFileName } from "./utils/problemUtils";
 import { DialogOptions, openUrl } from "./utils/uiUtils";
 import * as wsl from "./utils/wslUtils";
 
@@ -74,8 +75,16 @@ class LeetCodeExecutor {
         );
     }
 
-    public async showProblem(id: string, language: string, outDir: string): Promise<string> {
-        return await this.executeCommandWithProgressEx("Fetching problem data...", "node", [await this.getLeetCodeBinaryPath(), "show", id, "-gx", "-l", language, "-o", `"${outDir}"`]);
+    public async showProblem(node: IProblem, language: string, outDir: string): Promise<string> {
+        const fileName: string = genFileName(node, language);
+        const filePath: string = path.join(outDir, fileName);
+
+        if (!await fse.pathExists(filePath)) {
+            const codeTemplate: string = await this.executeCommandWithProgressEx("Fetching problem data...", "node", [await this.getLeetCodeBinaryPath(), "show", node.id, "-cx", "-l", language]);
+            await fse.writeFile(filePath, codeTemplate);
+        }
+
+        return filePath;
     }
 
     public async listSessions(): Promise<string> {

src/leetCodeExecutor.ts

@@ -7,6 +7,7 @@ import * as vscode from "vscode";
 import { leetCodeChannel } from "./leetCodeChannel";
 import { leetCodeExecutor } from "./leetCodeExecutor";
 import { UserStatus } from "./shared";
+import { createEnvOption } from "./utils/cpUtils";
 import { DialogType, promptForOpenOutputChannel } from "./utils/uiUtils";
 import * as wsl from "./utils/wslUtils";
 
@@ -42,7 +43,10 @@ class LeetCodeManager extends EventEmitter {
 
                 const childProc: cp.ChildProcess = wsl.useWsl()
                     ? cp.spawn("wsl", ["node", leetCodeBinaryPath, "user", "-l"], { shell: true })
-                    : cp.spawn("node", [leetCodeBinaryPath, "user", "-l"], { shell: true });
+                    : cp.spawn("node", [leetCodeBinaryPath, "user", "-l"], {
+                        shell: true,
+                        env: createEnvOption(),
+                    });
 
                 childProc.stdout.on("data", (data: string | Buffer) => {
                     data = data.toString();

src/leetCodeManager.ts

@@ -29,6 +29,23 @@ export const languages: string[] = [
     "swift",
 ];
 
+export const langExt: Map<string, string> = new Map([
+    ["bash", "sh"],
+    ["c", "c"],
+    ["cpp", "cpp"],
+    ["csharp", "cs"],
+    ["golang", "go"],
+    ["java", "java"],
+    ["javascript", "js"],
+    ["kotlin", "kt"],
+    ["mysql", "sql"],
+    ["python", "py"],
+    ["python3", "py"],
+    ["ruby", "rb"],
+    ["scala", "scala"],
+    ["swift", "swift"],
+]);
+
 export enum ProblemState {
     AC = 1,
     NotAC = 2,

src/shared.ts

@@ -9,7 +9,7 @@ export async function executeCommand(command: string, args: string[], options: c
     return new Promise((resolve: (res: string) => void, reject: (e: Error) => void): void => {
         let result: string = "";
 
-        const childProc: cp.ChildProcess = cp.spawn(command, args, options);
+        const childProc: cp.ChildProcess = cp.spawn(command, args, { ...options, env: createEnvOption() });
 
         childProc.stdout.on("data", (data: string | Buffer) => {
             data = data.toString();
@@ -45,3 +45,18 @@ export async function executeCommandWithProgress(message: string, command: strin
     });
     return result;
 }
+
+// clone process.env and add http proxy
+export function createEnvOption(): {} {
+    const proxy: string | undefined = getHttpAgent();
+    if (proxy) {
+        const env: any = Object.create(process.env);
+        env.http_proxy = proxy;
+        return env;
+    }
+    return process.env;
+}
+
+function getHttpAgent(): string | undefined {
+    return vscode.workspace.getConfiguration("http").get<string>("proxy");
+}

src/utils/cpUtils.ts

@@ -6,7 +6,7 @@ export function isWindows(): boolean {
 }
 
 export function usingCmd(): boolean {
-    const comSpec: string = process.env.ComSpec;
+    const comSpec: string | undefined = process.env.ComSpec;
     // 'cmd.exe' is used as a fallback if process.env.ComSpec is unavailable.
     if (!comSpec) {
         return true;

src/utils/osUtils.ts

@@ -0,0 +1,16 @@
+import kebabCase = require("lodash.kebabcase");
+import { IProblem, langExt } from "../shared";
+
+export function genFileExt(language: string): string {
+    const ext: string | undefined = langExt.get(language);
+    if (!ext) {
+        throw new Error(`The language "${language}" is not supported.`);
+    }
+    return ext;
+}
+
+export function genFileName(node: IProblem, language: string): string {
+    const slug: string = kebabCase(node.name);
+    const ext: string = genFileExt(language);
+    return `${node.id}.${slug}.${ext}`;
+}