From f09d48d7b66022750242bf60835a696196189dda Mon Sep 17 00:00:00 2001 From: "sheche@microsoft.com" Date: Sun, 13 Jan 2019 17:18:40 +0800 Subject: [PATCH 1/3] Use vscode.open instead of the opn package --- package-lock.json | 13 ------------- package.json | 3 +-- src/leetCodeExecutor.ts | 3 +-- src/utils/uiUtils.ts | 5 ++--- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7bf333d9..2c1422a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1840,11 +1840,6 @@ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" - }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", @@ -2595,14 +2590,6 @@ "mimic-fn": "^1.0.0" } }, - "opn": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz", - "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", - "requires": { - "is-wsl": "^1.1.0" - } - }, "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", diff --git a/package.json b/package.json index 3e41e674..ed290139 100644 --- a/package.json +++ b/package.json @@ -258,7 +258,6 @@ }, "dependencies": { "fs-extra": "^6.0.1", - "leetcode-cli": "2.6.1", - "opn": "^5.2.0" + "leetcode-cli": "2.6.1" } } diff --git a/src/leetCodeExecutor.ts b/src/leetCodeExecutor.ts index 3a656c5c..8f7f8cf3 100644 --- a/src/leetCodeExecutor.ts +++ b/src/leetCodeExecutor.ts @@ -2,7 +2,6 @@ // Licensed under the MIT license. import * as cp from "child_process"; -import * as opn from "opn"; import * as path from "path"; import * as vscode from "vscode"; import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils"; @@ -38,7 +37,7 @@ class LeetCodeExecutor { DialogOptions.open, ); if (choice === DialogOptions.open) { - opn("https://nodejs.org"); + vscode.commands.executeCommand("vscode.open", vscode.Uri.parse("https://nodejs.org")); } return false; } diff --git a/src/utils/uiUtils.ts b/src/utils/uiUtils.ts index 43c88cbe..741b1dc9 100644 --- a/src/utils/uiUtils.ts +++ b/src/utils/uiUtils.ts @@ -1,7 +1,6 @@ // Copyright (c) jdneo. All rights reserved. // Licensed under the MIT license. -import * as opn from "opn"; import * as vscode from "vscode"; import { isLeetCodeCnEnabled } from "../commands/plugin"; import { leetCodeChannel } from "../leetCodeChannel"; @@ -48,9 +47,9 @@ export async function promptForSignIn(): Promise { break; case DialogOptions.singUp: if (isLeetCodeCnEnabled()) { - opn("https://leetcode-cn.com"); + vscode.commands.executeCommand("vscode.open", vscode.Uri.parse("https://leetcode-cn.com")); } else { - opn("https://leetcode.com"); + vscode.commands.executeCommand("vscode.open", vscode.Uri.parse("https://leetcode.com")); } break; default: From 0e8a0fab0b1e202ba7b8f41d0688aed5b20a06d8 Mon Sep 17 00:00:00 2001 From: "sheche@microsoft.com" Date: Sun, 13 Jan 2019 17:22:59 +0800 Subject: [PATCH 2/3] Extract to common util --- src/leetCodeExecutor.ts | 4 ++-- src/utils/uiUtils.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/leetCodeExecutor.ts b/src/leetCodeExecutor.ts index 8f7f8cf3..f8906f62 100644 --- a/src/leetCodeExecutor.ts +++ b/src/leetCodeExecutor.ts @@ -5,7 +5,7 @@ import * as cp from "child_process"; import * as path from "path"; import * as vscode from "vscode"; import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils"; -import { DialogOptions } from "./utils/uiUtils"; +import { DialogOptions, openUrl } from "./utils/uiUtils"; import * as wsl from "./utils/wslUtils"; class LeetCodeExecutor { @@ -37,7 +37,7 @@ class LeetCodeExecutor { DialogOptions.open, ); if (choice === DialogOptions.open) { - vscode.commands.executeCommand("vscode.open", vscode.Uri.parse("https://nodejs.org")); + openUrl("https://nodejs.org"); } return false; } diff --git a/src/utils/uiUtils.ts b/src/utils/uiUtils.ts index 741b1dc9..25dd1866 100644 --- a/src/utils/uiUtils.ts +++ b/src/utils/uiUtils.ts @@ -47,9 +47,9 @@ export async function promptForSignIn(): Promise { break; case DialogOptions.singUp: if (isLeetCodeCnEnabled()) { - vscode.commands.executeCommand("vscode.open", vscode.Uri.parse("https://leetcode-cn.com")); + openUrl("https://leetcode-cn.com"); } else { - vscode.commands.executeCommand("vscode.open", vscode.Uri.parse("https://leetcode.com")); + openUrl("https://leetcode.com"); } break; default: @@ -69,6 +69,10 @@ export async function showFileSelectDialog(): Promise return await vscode.window.showOpenDialog(options); } +export async function openUrl(url: string): Promise { + return vscode.commands.executeCommand("vscode.open", vscode.Uri.parse(url)); +} + export enum DialogType { info = "info", warning = "warning", From 2dbe054cdd8b7d48ec7aa0670654e2ffde1f644d Mon Sep 17 00:00:00 2001 From: "sheche@microsoft.com" Date: Sun, 13 Jan 2019 17:30:54 +0800 Subject: [PATCH 3/3] Fix CI --- src/utils/uiUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/uiUtils.ts b/src/utils/uiUtils.ts index 25dd1866..aeb76ee6 100644 --- a/src/utils/uiUtils.ts +++ b/src/utils/uiUtils.ts @@ -70,7 +70,7 @@ export async function showFileSelectDialog(): Promise } export async function openUrl(url: string): Promise { - return vscode.commands.executeCommand("vscode.open", vscode.Uri.parse(url)); + vscode.commands.executeCommand("vscode.open", vscode.Uri.parse(url)); } export enum DialogType {