Move getSessionFilePath to SessionManager class

Author: andyleejordan

src/features/DebugSession.ts

@@ -311,7 +311,7 @@ export class DebugSessionFeature extends LanguageClientConsumer
         // Create or show the interactive console
         vscode.commands.executeCommand("PowerShell.ShowSessionConsole", true);
 
-        const sessionFilePath = utils.getDebugSessionFilePath();
+        const sessionFilePath = this.sessionManager.getDebugSessionFilePath();
 
         if (config.createTemporaryIntegratedConsole) {
             // TODO: This should be cleaned up to support multiple temporary consoles.

src/features/PesterTests.ts

@@ -132,7 +132,7 @@ export class PesterTestsFeature implements vscode.Disposable {
 
         // Write out temporary debug session file
         await utils.writeSessionFile(
-            utils.getDebugSessionFilePath(),
+            this.sessionManager.getDebugSessionFilePath(),
             this.sessionManager.getSessionDetails());
 
         // TODO: Update to handle multiple root workspaces.

src/features/RunCode.ts

@@ -45,7 +45,7 @@ export class RunCodeFeature implements vscode.Disposable {
 
         // Write out temporary debug session file
         await utils.writeSessionFile(
-            utils.getDebugSessionFilePath(),
+            this.sessionManager.getDebugSessionFilePath(),
             this.sessionManager.getSessionDetails());
 
         // TODO: Update to handle multiple root workspaces.

src/session.ts

@@ -56,6 +56,8 @@ export class SessionManager implements Middleware {
     private languageServerClient: LanguageClient = undefined;
     private sessionSettings: Settings.ISettings = undefined;
     private sessionDetails: utils.IEditorServicesSessionDetails;
+    private sessionsFolder = path.resolve(__dirname, "../sessions");
+    private sessionFilePathPrefix = path.resolve(this.sessionsFolder, "PSES-VSCode-" + process.env.VSCODE_PID);
     private bundledModulesPath: string;
     private started: boolean = false;
 
@@ -259,6 +261,14 @@ export class SessionManager implements Middleware {
         return this.versionDetails;
     }
 
+    private getSessionFilePath(uniqueId: number): string {
+        return `${this.sessionFilePathPrefix}-${uniqueId}`;
+    }
+
+    public getDebugSessionFilePath(): string {
+        return `${this.sessionFilePathPrefix}-Debug`;
+    }
+
     public createDebugSessionProcess(
         sessionPath: string,
         sessionSettings: Settings.ISettings): PowerShellProcess {
@@ -446,7 +456,7 @@ export class SessionManager implements Middleware {
         this.setSessionStatus("Starting...", SessionStatus.Initializing);
 
         const sessionFilePath =
-            utils.getSessionFilePath(
+            this.getSessionFilePath(
                 Math.floor(100000 + Math.random() * 900000));
 
         this.languageServerProcess =

src/utils.ts

@@ -52,15 +52,6 @@ export interface IEditorServicesSessionDetails {
 export type IReadSessionFileCallback = (details: IEditorServicesSessionDetails) => void;
 
 const sessionsFolder = path.resolve(__dirname, "../sessions");
-const sessionFilePathPrefix = path.resolve(sessionsFolder, "PSES-VSCode-" + process.env.VSCODE_PID);
-
-export function getSessionFilePath(uniqueId: number) {
-    return `${sessionFilePathPrefix}-${uniqueId}`;
-}
-
-export function getDebugSessionFilePath() {
-    return `${sessionFilePathPrefix}-Debug`;
-}
 
 export async function writeSessionFile(sessionFilePath: string, sessionDetails: IEditorServicesSessionDetails) {
     await vscode.workspace.fs.createDirectory(vscode.Uri.file(sessionsFolder));