Commitea4b179

committed

lint

1 parente7cad82 commitea4b179Copy full SHA for ea4b179

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,14 @@ export class Commands {`
`526`	`526`	`constdevContainerName=args[3]asstring`
`527`	`527`	`constdevContainerFolder=args[4]asstring`
`528`	`528`
`529`		`-awaitthis.openDevContainerInner(baseUrl,workspaceOwner,workspaceName,workspaceAgent,devContainerName,devContainerFolder)`
	`529`	`+awaitthis.openDevContainerInner(`
	`530`	`+baseUrl,`
	`531`	`+workspaceOwner,`
	`532`	`+workspaceName,`
	`533`	`+workspaceAgent,`
	`534`	`+devContainerName,`
	`535`	`+devContainerFolder,`
	`536`	`+)`
`530`	`537`	`}`
`531`	`538`
`532`	`539`	`/**`
`@@ -709,4 +716,3 @@ export class Commands {`
`709`	`716`	`)`
`710`	`717`	`}`
`711`	`718`	`}`
`712`		`-`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -529,9 +529,9 @@ export class Remote {`
`529`	`529`	`)`
`530`	`530`	`if(coderConnectAddr){`
`531`	`531`	`// Find the path of the current workspace, which will have the same authority`
`532`		`-constfolderPath=this.vscodeProposed.workspace.workspaceFolders`
`533`		`-?.find(folder=>folder.uri.authority===remoteAuthority)`
`534`		`-?.uri.path;`
	`532`	`+constfolderPath=this.vscodeProposed.workspace.workspaceFolders?.find(`
	`533`	`+(folder)=>folder.uri.authority===remoteAuthority,`
	`534`	`+)?.uri.path`
`535`	`535`	letnewRemoteAuthority=`ssh-remote+${coderConnectAddr}`
`536`	`536`	`if(parts.containerNameHex){`
`537`	`537`	newRemoteAuthority=`attached-container+${parts.containerNameHex}@${newRemoteAuthority}`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ it("ignore unrelated authorities", async () => {`
`9`	`9`	`"vscode://ssh-remote+coder-vscode-test--foo--bar",`
`10`	`10`	`"vscode://ssh-remote+coder-vscode-foo--bar",`
`11`	`11`	`"vscode://ssh-remote+coder--foo--bar",`
`12`		`-"vscode://attached-container+namehash@ssh-remote+dev.foo.admin.coder"`
	`12`	`+"vscode://attached-container+namehash@ssh-remote+dev.foo.admin.coder",`
`13`	`13`	`]`
`14`	`14`	`for(consttestoftests){`
`15`	`15`	`expect(parseRemoteAuthority(test)).toBe(null)`
`@@ -69,7 +69,9 @@ it("should parse authority", async () => {`
`69`	`69`	`username:"foo",`
`70`	`70`	`workspace:"bar",`
`71`	`71`	`})`
`72`		`-expect(parseRemoteAuthority("vscode://attached-container+namehash@ssh-remote+coder-vscode.dev.coder.com--foo--bar.baz")).toStrictEqual({`
	`72`	`+expect(`
	`73`	`+parseRemoteAuthority("vscode://attached-container+namehash@ssh-remote+coder-vscode.dev.coder.com--foo--bar.baz"),`
	`74`	`+).toStrictEqual({`
`73`	`75`	`containerNameHex:"namehash",`
`74`	`76`	`agent:"baz",`
`75`	`77`	`host:"coder-vscode.dev.coder.com--foo--bar.baz",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export function parseRemoteAuthority(authority: string): AuthorityParts \| null {`
`33`	`33`	`letsshAuthority`
`34`	`34`	`if(authorityParts.length==1){`
`35`	`35`	`sshAuthority=authorityParts[0]`
`36`		`-}elseif(authorityParts.length==2&&authorityParts[0].includes("attached-container+")){`
	`36`	`+}elseif(authorityParts.length==2&&authorityParts[0].includes("attached-container+")){`
`37`	`37`	`sshAuthority=authorityParts[1]`
`38`	`38`	`containerNameHex=authorityParts[0].split("+")[1]`
`39`	`39`	`}else{`

Comments

(0)