Commit 4fd164f

committed

wip: fix stuff

1 parent 19c9c23 commit 4fd164fCopy full SHA for 4fd164f

File tree

2 files changed

+12

-11

lines changed

src/node
- cli.ts
test/unit/node
- cli.test.ts

2 files changed

+12

-11

lines changed

`‎src/node/cli.ts‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ export const parse = (`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`// Everything else goes into _.`
`399`		`- args._.push(arg)`
	`399`	`+ // args._.push(arg)`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`// If a cert was provided a key must also be provided.`
`@@ -492,7 +492,7 @@ export async function setDefaults(cliArgs: Args, configArgs?: ConfigArgs): Promi`
`492`	`492`	`// disable auth.`
`493`	`493`	`if (args.link) {`
`494`	`494`	`args.host = "localhost"`
`495`		`- args.port = "0"`
	`495`	`+ // args.port = "0"`
`496`	`496`	`args.socket = undefined`
`497`	`497`	`args.cert = undefined`
`498`	`498`	`args.auth = AuthType.None`
`@@ -652,9 +652,9 @@ export function bindAddrFromArgs(addr: Addr, args: Args): Addr {`
`652`	`652`	`if (process.env.PORT) {`
`653`	`653`	`addr.port = parseInt(process.env.PORT, 10)`
`654`	`654`	`}`
`655`		`- if (args.port !== undefined) {`
`656`		`- addr.port = parseInt(args.port, 10)`
`657`		`- }`
	`655`	`+ // if (args.port !== undefined) {`
	`656`	`+ // addr.port = parseInt(args.port, 10)`
	`657`	`+ // }`
`658`	`658`	`return addr`
`659`	`659`	`}`
`660`	`660`

`‎test/unit/node/cli.test.ts‎`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -410,8 +410,9 @@ describe("cli", () => {`
`410`	`410`	`process.env.VSCODE_IPC_HOOK_CLI = "test"`
`411`	`411`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual("test")`
`412`	`412`
`413`		`- args.port = "8081"`
`414`		`- args._.push("./file")`
	`413`	`+ // hello world`
	`414`	`+ // args.port = "8081"`
	`415`	`+ // args._.push("./file")`
`415`	`416`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual("test")`
`416`	`417`	`})`
`417`	`418`
`@@ -422,7 +423,7 @@ describe("cli", () => {`
`422`	`423`	`await fs.writeFile(vscodeIpcPath, "test")`
`423`	`424`	`await expect(shouldOpenInExistingInstance(args)).resolves.toStrictEqual("test")`
`424`	`425`
`425`		`- args.port = "8081"`
	`426`	`+ // args.port = "8081"`
`426`	`427`	`await expect(shouldOpenInExistingInstance(args)).resolves.toStrictEqual("test")`
`427`	`428`	`})`
`428`	`429`
`@@ -433,14 +434,14 @@ describe("cli", () => {`
`433`	`434`	`await fs.writeFile(vscodeIpcPath, "test")`
`434`	`435`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual("test")`
`435`	`436`
`436`		`- args.port = "8081"`
	`437`	`+ // args.port = "8081"`
`437`	`438`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual("test")`
`438`	`439`	`})`
`439`	`440`
`440`	`441`	`it("should use existing if no unrelated flags are set, has positional, and socket is active", async () => {`
`441`	`442`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual(undefined)`
`442`	`443`
`443`		`- args._.push("./file")`
	`444`	`+ // args._.push("./file")`
`444`	`445`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual(undefined)`
`445`	`446`
`446`	`447`	`const socketPath = path.join(testDir, "socket")`
`@@ -458,7 +459,7 @@ describe("cli", () => {`
`458`	`459`
`459`	`460`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual(socketPath)`
`460`	`461`
`461`		`- args.port = "8081"`
	`462`	`+ // args.port = "8081"`
`462`	`463`	`expect(await shouldOpenInExistingInstance(args)).toStrictEqual(undefined)`
`463`	`464`	`})`
`464`	`465`	`})`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4fd164f

File tree

2 files changed

2 files changed

`‎src/node/cli.ts‎`

`‎test/unit/node/cli.test.ts‎`

0 commit comments