Skip to content

Commit 82dea7d

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

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/utils.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
import os = require("os");
55
import path = require("path");
66
import vscode = require("vscode");
7-
import { satisfies } from "semver";
87

98
export const PowerShellLanguageId = "powershell";
109

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.
1612
export const ShellIntegrationScript = path.join(
1713
vscode.env.appRoot,
1814
"out",
@@ -22,7 +18,7 @@ export const ShellIntegrationScript = path.join(
2218
"terminal",
2319
"common",
2420
"scripts",
25-
shellIntegrationMoved ? "shellIntegration.psm1" : "shellIntegration.ps1",
21+
"shellIntegration.ps1",
2622
);
2723

2824
export function escapeSingleQuotes(p: string): string {

0 commit comments

Comments
 (0)