Fix relative paths (again)

andyleejordan · andyleejordan · commit 18f9cec3d893 · 2021-09-16T16:23:02.000-07:00
This are hard to get right, and harder to test.
diff --git a/src/features/Examples.ts b/src/features/Examples.ts
@@ -9,7 +9,7 @@ export class ExamplesFeature implements vscode.Disposable {
     private examplesPath: string;
 
     constructor() {
-        this.examplesPath = path.resolve(__dirname, "../../examples");
+        this.examplesPath = path.resolve(__dirname, "../examples");
         this.command = vscode.commands.registerCommand("PowerShell.OpenExamplesFolder", () => {
             vscode.commands.executeCommand(
                 "vscode.openFolder",
diff --git a/src/features/PesterTests.ts b/src/features/PesterTests.ts
@@ -18,7 +18,7 @@ export class PesterTestsFeature implements vscode.Disposable {
     private invokePesterStubScriptPath: string;
 
     constructor(private sessionManager: SessionManager) {
-        this.invokePesterStubScriptPath = path.resolve(__dirname, "../../modules/PowerShellEditorServices/InvokePesterStub.ps1");
+        this.invokePesterStubScriptPath = path.resolve(__dirname, "../modules/PowerShellEditorServices/InvokePesterStub.ps1");
 
         // File context-menu command - Run Pester Tests
         this.command = vscode.commands.registerCommand(
diff --git a/src/settings.ts b/src/settings.ts
@@ -157,6 +157,8 @@ export function load(): ISettings {
 
     const defaultDeveloperSettings: IDeveloperSettings = {
         featureFlags: [],
+        // From `<root>/out/main.js` we go to the directory before <root> and
+        // then into the other repo.
         bundledModulesPath: "../../PowerShellEditorServices/module",
         editorServicesLogLevel: "Normal",
         editorServicesWaitForDebugger: false,
@@ -234,7 +236,7 @@ export function load(): ISettings {
         promptToUpdatePackageManagement:
             configuration.get<boolean>("promptToUpdatePackageManagement", true),
         bundledModulesPath:
-            "../modules",
+            "../modules", // Because the extension is always at `<root>/out/main.js`
         useX86Host:
             configuration.get<boolean>("useX86Host", false),
         enableProfileLoading:
diff --git a/src/utils.ts b/src/utils.ts
@@ -45,7 +45,7 @@ export interface IEditorServicesSessionDetails {
 
 export type IReadSessionFileCallback = (details: IEditorServicesSessionDetails) => void;
 
-const sessionsFolder = path.resolve(__dirname, "..", "..", "sessions/");
+const sessionsFolder = path.resolve(__dirname, "../sessions");
 const sessionFilePathPrefix = path.resolve(sessionsFolder, "PSES-VSCode-" + process.env.VSCODE_PID);
 
 // Create the sessions path if it doesn't exist already
diff --git a/test/features/CustomViews.test.ts b/test/features/CustomViews.test.ts
@@ -70,15 +70,15 @@ hello
                     content: "console.log('asdf');",
                 },
                 {
-                    fileName: "../../testCustomViews.js",
+                    fileName: "../testCustomViews.js",
                     content: "console.log('asdf');",
                 },
             ],
             cssFiles: [],
             expectedHtmlString: `<html><head></head><body>
 hello
 <script src="${convertToVSCodeResourceScheme(path.join(__dirname, "testCustomViews.js"))}"></script>
-<script src="${convertToVSCodeResourceScheme(path.join(__dirname, "../../testCustomViews.js"))}"></script>
+<script src="${convertToVSCodeResourceScheme(path.join(__dirname, "../testCustomViews.js"))}"></script>
 </body></html>`,
         },
 
