From 17d36d433cb160e44ee995d3faf5ccc05aed6951 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Thu, 27 Aug 2020 13:15:37 -0500
Subject: [PATCH] Remove open-in flag
---
package.json | 2 +-
src/node/cli.ts | 4 +---
src/node/entry.ts | 15 +++++++--------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/package.json b/package.json
index 95495566ee38..4d75331e9f39 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"lint": "./ci/dev/lint.sh",
"test": "./ci/dev/test.sh",
"ci": "./ci/dev/ci.sh",
- "watch": "NODE_OPTIONS=--max_old_space_size=32384 ts-node ./ci/dev/watch.ts"
+ "watch": "VSCODE_IPC_HOOK_CLI= NODE_OPTIONS=--max_old_space_size=32384 ts-node ./ci/dev/watch.ts"
},
"main": "out/node/entry.js",
"devDependencies": {
diff --git a/src/node/cli.ts b/src/node/cli.ts
index 8da0b635384f..e5d0695519d7 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -45,7 +45,6 @@ export interface Args extends VsArgs {
readonly "proxy-domain"?: string[]
readonly locale?: string
readonly _: string[]
- readonly "open-in"?: boolean
readonly "reuse-window"?: boolean
readonly "new-window"?: boolean
}
@@ -142,7 +141,6 @@ const options: Options<Required<Args>> = {
"show-versions": { type: "boolean", description: "Show VS Code extension versions." },
"proxy-domain": { type: "string[]", description: "Domain used for proxying ports." },
- "open-in": { type: "boolean", short: "oi", description: "Open file(s) or folder(s) in running instance" },
"new-window": {
type: "boolean",
short: "n",
@@ -372,7 +370,7 @@ export async function readConfigFile(configPath?: string): Promise<Args> {
logger.info(`Wrote default config file to ${humanPath(configPath)}`)
}
- if (!process.env.CODE_SERVER_PARENT_PID) {
+ if (!process.env.CODE_SERVER_PARENT_PID && !process.env.VSCODE_IPC_HOOK_CLI) {
logger.info(`Using config file ${humanPath(configPath)}`)
}
diff --git a/src/node/entry.ts b/src/node/entry.ts
index 06f044bc84fb..61f417f5709b 100644
--- a/src/node/entry.ts
+++ b/src/node/entry.ts
@@ -164,14 +164,13 @@ async function entry(): Promise<void> {
console.log(version, commit)
}
process.exit(0)
- } else if (args["open-in"]) {
- if (!process.env["VSCODE_IPC_HOOK_CLI"]) {
- logger.error("VSCODE_IPC_HOOK_CLI missing from environment, unable to run")
- process.exit(1)
+ } else if (process.env.VSCODE_IPC_HOOK_CLI) {
+ const pipeArgs: OpenCommandPipeArgs = {
+ type: "open",
+ folderURIs: [],
+ forceReuseWindow: args["reuse-window"],
+ forceNewWindow: args["new-window"],
}
- const pipeArgs: OpenCommandPipeArgs = { type: "open", folderURIs: [] }
- pipeArgs.forceReuseWindow = args["reuse-window"]
- pipeArgs.forceNewWindow = args["new-window"]
const isDir = async (path: string): Promise<boolean> => {
try {
const st = await fs.stat(path)
@@ -196,7 +195,7 @@ async function entry(): Promise<void> {
process.exit(1)
}
if (pipeArgs.folderURIs.length === 0 && (!pipeArgs.fileURIs || pipeArgs.fileURIs.length === 0)) {
- logger.error("open-in expects at least one file or folder argument")
+ logger.error("Please specify at least one file or folder argument")
process.exit(1)
}
const vscode = http.request(