Commit 82dea7d

authored

Shell integration script moved back (#5220)

Undoes #5217 (except it's not a revert since we don't need the original logic any more). Since the change only appeared in Insiders, the check doesn't have to stick around (literally added and removed without a version bump).

1 parent 2111428 commit 82dea7dCopy full SHA for 82dea7d

File tree

1 file changed

-7

lines changed

src
- utils.ts

1 file changed

-7

lines changed

`‎src/utils.ts‎`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,11 @@`
`4`	`4`	`import os = require("os");`
`5`	`5`	`import path = require("path");`
`6`	`6`	`import vscode = require("vscode");`
`7`		`-import { satisfies } from "semver";`
`8`	`7`
`9`	`8`	`export const PowerShellLanguageId = "powershell";`
`10`	`9`
`11`		`-// Path to the shell integration script in the VS Code installation`
`12`		`-// See https://github.com/microsoft/vscode/pull/251303`
`13`		`-const shellIntegrationMoved = satisfies(vscode.version, ">=1.102", {`
`14`		`- includePrerelease: true,`
`15`		`-});`
	`10`	`+// Path to the shell integration script in the VS Code installation.`
	`11`	`+// See commit 21114288b if it moves again.`
`16`	`12`	`export const ShellIntegrationScript = path.join(`
`17`	`13`	`vscode.env.appRoot,`
`18`	`14`	`"out",`
`@@ -22,7 +18,7 @@ export const ShellIntegrationScript = path.join(`
`22`	`18`	`"terminal",`
`23`	`19`	`"common",`
`24`	`20`	`"scripts",`
`25`		`- shellIntegrationMoved ? "shellIntegration.psm1" : "shellIntegration.ps1",`
	`21`	`+ "shellIntegration.ps1",`
`26`	`22`	`);`
`27`	`23`
`28`	`24`	`export function escapeSingleQuotes(p: string): string {`

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 82dea7d

File tree

1 file changed

1 file changed

`‎src/utils.ts‎`

0 commit comments