Replace ensurePathExists with fs.createDirectory

Author: andyleejordan

src/features/DebugSession.ts

@@ -317,9 +317,9 @@ export class DebugSessionFeature extends LanguageClientConsumer
             // TODO: This should be cleaned up to support multiple temporary consoles.
             this.tempDebugProcess = this.sessionManager.createDebugSessionProcess(sessionFilePath, settings);
             this.tempSessionDetails = await this.tempDebugProcess.start(`DebugSession-${this.sessionCount++}`);
-            utils.writeSessionFile(sessionFilePath, this.tempSessionDetails);
+            await utils.writeSessionFile(sessionFilePath, this.tempSessionDetails);
         } else {
-            utils.writeSessionFile(sessionFilePath, this.sessionManager.getSessionDetails());
+            await utils.writeSessionFile(sessionFilePath, this.sessionManager.getSessionDetails());
         }
 
         return config;

src/features/PesterTests.ts

@@ -131,7 +131,7 @@ export class PesterTestsFeature implements vscode.Disposable {
         vscode.commands.executeCommand("PowerShell.ShowSessionConsole", true);
 
         // Write out temporary debug session file
-        utils.writeSessionFile(
+        await utils.writeSessionFile(
             utils.getDebugSessionFilePath(),
             this.sessionManager.getSessionDetails());
 

src/features/RunCode.ts

@@ -35,21 +35,21 @@ export class RunCodeFeature implements vscode.Disposable {
 
         const launchType = runInDebugger ? LaunchType.Debug : LaunchType.Run;
         const launchConfig = createLaunchConfig(launchType, scriptToRun, args);
-        this.launch(launchConfig);
+        await this.launch(launchConfig);
     }
 
-    private launch(launchConfig) {
+    private async launch(launchConfig: string | vscode.DebugConfiguration) {
         // Create or show the interactive console
         // TODO #367: Check if "newSession" mode is configured
-        vscode.commands.executeCommand("PowerShell.ShowSessionConsole", true);
+        await vscode.commands.executeCommand("PowerShell.ShowSessionConsole", true);
 
         // Write out temporary debug session file
-        utils.writeSessionFile(
+        await utils.writeSessionFile(
             utils.getDebugSessionFilePath(),
             this.sessionManager.getSessionDetails());
 
         // TODO: Update to handle multiple root workspaces.
-        vscode.debug.startDebugging(vscode.workspace.workspaceFolders?.[0], launchConfig);
+        await vscode.debug.startDebugging(vscode.workspace.workspaceFolders?.[0], launchConfig);
     }
 }
 

src/logging.ts

@@ -5,7 +5,6 @@ import fs = require("fs");
 import os = require("os");
 import path = require("path");
 import vscode = require("vscode");
-import utils = require("./utils");
 
 export enum LogLevel {
     Diagnostic,
@@ -44,7 +43,6 @@ export class Logger implements ILogger {
         if (logBasePath === undefined) {
             // No workspace, we have to use another folder.
             this.logBasePath = vscode.Uri.file(path.resolve(__dirname, "../logs"));
-            utils.ensurePathExists(this.logBasePath.fsPath);
         } else {
             this.logBasePath = vscode.Uri.joinPath(logBasePath, "logs");
         }

src/utils.ts

@@ -10,19 +10,6 @@ import vscode = require("vscode");
 
 export const PowerShellLanguageId = "powershell";
 
-export function ensurePathExists(targetPath: string): void {
-    // Ensure that the path exists
-    try {
-        // TODO: Use vscode.workspace.fs
-        fs.mkdirSync(targetPath);
-    } catch (e) {
-        // If the exception isn't to indicate that the folder exists already, rethrow it.
-        if (e.code !== "EEXIST") {
-            throw e;
-        }
-    }
-}
-
 // Check that the file exists in an asynchronous manner that relies solely on the VS Code API, not Node's fs library.
 export async function fileExists(targetPath: string | vscode.Uri): Promise<boolean> {
     try {
@@ -67,9 +54,6 @@ export type IReadSessionFileCallback = (details: IEditorServicesSessionDetails)
 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
-ensurePathExists(sessionsFolder);
-
 export function getSessionFilePath(uniqueId: number) {
     return `${sessionFilePathPrefix}-${uniqueId}`;
 }
@@ -78,8 +62,8 @@ export function getDebugSessionFilePath() {
     return `${sessionFilePathPrefix}-Debug`;
 }
 
-export function writeSessionFile(sessionFilePath: string, sessionDetails: IEditorServicesSessionDetails) {
-    ensurePathExists(sessionsFolder);
+export async function writeSessionFile(sessionFilePath: string, sessionDetails: IEditorServicesSessionDetails) {
+    await vscode.workspace.fs.createDirectory(vscode.Uri.file(sessionsFolder));
 
     const writeStream = fs.createWriteStream(sessionFilePath);
     writeStream.write(JSON.stringify(sessionDetails));