Merge pull request microsoft#66359 from TylerLeonhardt/single-quote-edgecase

Tyriar · web-flow · commit 3ddc4dc5ac0a · 2019-01-10T15:04:22.000-08:00
Handle the edge case where there's a single quote but no space
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -801,7 +801,7 @@ export class TerminalInstance implements ITerminalInstance {
 				pathBasename === 'powershell' ||
 				this.title === 'powershell';
 
-			if (hasSpace && isPowerShell) {
+			if (isPowerShell && (hasSpace || originalPath.indexOf('\'') !== -1)) {
 				c(`& '${originalPath.replace('\'', '\'\'')}'`);
 				return;
 			}

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ export class TerminalInstance implements ITerminalInstance {`
`801`	`801`	`pathBasename === 'powershell' \|\|`
`802`	`802`	`this.title === 'powershell';`
`803`	`803`
`804`		`- if (hasSpace && isPowerShell) {`
	`804`	`+ if (isPowerShell && (hasSpace \|\| originalPath.indexOf('\'') !== -1)) {`
`805`	`805`	c(`& '${originalPath.replace('\'', '\'\'')}'`);
`806`	`806`	`return;`
`807`	`807`	`}`