Merge pull request microsoft#11419 from Microsoft/11325_fix_terminal_show_focus

Tyriar · web-flow · commit 57c890cdfc96 · 2016-09-01T15:36:33.000-07:00
Fix Terminal.show preserveFocus parameter
diff --git a/src/vs/workbench/api/node/mainThreadTerminalService.ts b/src/vs/workbench/api/node/mainThreadTerminalService.ts
@@ -26,6 +26,10 @@ export class MainThreadTerminalService extends MainThreadTerminalServiceShape {
 	public $show(terminalId: number, preserveFocus: boolean): void {
 		this._terminalService.show(!preserveFocus).then((terminalPanel) => {
 			this._terminalService.setActiveTerminalById(terminalId);
+			if (!preserveFocus) {
+				// If the panel was already showing an explicit focus call is necessary here.
+				terminalPanel.focus();
+			}
 		});
 	}
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
@@ -87,5 +87,6 @@ export interface ITerminalService {
 
 export interface ITerminalPanel {
 	closeTerminalById(terminalId: number): TPromise<void>;
+	focus(): void;
 	sendTextToActiveTerminal(text: string, addNewLine: boolean): void;
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -69,7 +69,6 @@ export class TerminalService implements ITerminalService {
 		return this.show(false).then((terminalPanel) => {
 			this.activeTerminalIndex = index;
 			terminalPanel.setActiveTerminal(this.activeTerminalIndex);
-			terminalPanel.focus();
 			this._onActiveInstanceChanged.fire();
 		});
 	}

Original file line number	Diff line number	Diff line change
`@@ -87,5 +87,6 @@ export interface ITerminalService {`
`87`	`87`
`88`	`88`	`export interface ITerminalPanel {`
`89`	`89`	`closeTerminalById(terminalId: number): TPromise<void>;`
	`90`	`+ focus(): void;`
`90`	`91`	`sendTextToActiveTerminal(text: string, addNewLine: boolean): void;`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ export class TerminalService implements ITerminalService {`
`69`	`69`	`return this.show(false).then((terminalPanel) => {`
`70`	`70`	`this.activeTerminalIndex = index;`
`71`	`71`	`terminalPanel.setActiveTerminal(this.activeTerminalIndex);`
`72`		`- terminalPanel.focus();`
`73`	`72`	`this._onActiveInstanceChanged.fire();`
`74`	`73`	`});`
`75`	`74`	`}`