Also strip quote pairs from cwd setting

Author: andyleejordan

src/platform.ts

@@ -232,17 +232,11 @@ export class PowerShellExeFinder {
     private *enumerateAdditionalPowerShellInstallations(): Iterable<IPossiblePowerShellExe> {
         for (const versionName in this.additionalPowerShellExes) {
             if (Object.prototype.hasOwnProperty.call(this.additionalPowerShellExes, versionName)) {
-                let exePath = this.additionalPowerShellExes[versionName];
+                const exePath = utils.stripQuotePair(this.additionalPowerShellExes[versionName]);
                 if (!exePath) {
                     continue;
                 }
 
-                // Remove surrounding quotes from path (without regex)
-                if (exePath.startsWith("'") && exePath.endsWith("'")
-                    || exePath.startsWith("\"") && exePath.endsWith("\"")) {
-                    exePath = exePath.slice(1, -1);
-                }
-
                 // Always search for what the user gave us first
                 yield new PossiblePowerShellExe(exePath, versionName);
 

src/settings.ts

@@ -217,7 +217,8 @@ let hasPrompted = false;
 export let chosenWorkspace: vscode.WorkspaceFolder | undefined = undefined;
 
 export async function validateCwdSetting(logger: ILogger): Promise<string> {
-    let cwd: string | undefined = vscode.workspace.getConfiguration(utils.PowerShellLanguageId).get<string>("cwd");
+    let cwd: string | undefined = utils.stripQuotePair(
+        vscode.workspace.getConfiguration(utils.PowerShellLanguageId).get<string>("cwd"));
 
     // Only use the cwd setting if it exists.
     if (cwd !== undefined && await utils.checkIfDirectoryExists(cwd)) {

src/utils.ts

@@ -11,6 +11,20 @@ export function escapeSingleQuotes(p: string): string {
     return p.replace(new RegExp("'", "g"), "''");
 }
 
+export function stripQuotePair(p: string | undefined): string | undefined {
+    if (p === undefined) {
+        return p;
+    }
+
+    // Remove matching surrounding quotes from p (without regex)
+    if (p.startsWith("'") && p.endsWith("'")
+        || p.startsWith("\"") && p.endsWith("\"")) {
+        return p.slice(1, -1);
+    }
+
+    return p;
+}
+
 export function getPipePath(pipeName: string): string {
     if (os.platform() === "win32") {
         return "\\\\.\\pipe\\" + pipeName;