output: move clearOutput to IOutputChannel

isidorn · isidorn · commit 346a698cc5a4 · 2016-04-13T18:14:28.000+02:00
diff --git a/src/vs/workbench/api/node/extHostOutputService.ts b/src/vs/workbench/api/node/extHostOutputService.ts
@@ -93,7 +93,7 @@ export class MainThreadOutputService {
 	}
 
 	public clear(channel: string): TPromise<void> {
-		this._outputService.clearOutput(channel);
+		this._outputService.getOutputChannel(channel).clear();
 		return undefined;
 	}
 
diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts
@@ -53,7 +53,7 @@ export class ClearOutputAction extends Action {
 	}
 
 	public run(): TPromise<any> {
-		this.outputService.clearOutput(this.outputService.getActiveChannel());
+		this.outputService.getOutputChannel(this.outputService.getActiveChannel()).clear();
 		this.panelService.getActivePanel().focus();
 
 		return TPromise.as(true);
@@ -84,7 +84,7 @@ export class ClearOutputEditorAction extends EditorAction {
 	}
 
 	public run(): TPromise<boolean> {
-		this.outputService.clearOutput(this.outputService.getActiveChannel());
+		this.outputService.getOutputChannel(this.outputService.getActiveChannel()).clear();
 		return TPromise.as(false);
 	}
 }
diff --git a/src/vs/workbench/parts/output/common/output.ts b/src/vs/workbench/parts/output/common/output.ts
@@ -74,14 +74,6 @@ export interface IOutputService {
 	 */
 	getActiveChannel(): string;
 
-	/**
-	 * Clears all received output.
-	 *
-	 * The optional channel allows to clear the output for a specific channel. If you leave the
-	 * channel out, you get clear the default channels output.
-	 */
-	clearOutput(channel: string): void;
-
 	/**
 	 * Opens the output for the given channel
 	 *
@@ -113,6 +105,11 @@ export interface IOutputChannel {
 	 */
 	append(output: string): void;
 
+
+	/**
+	 * Clears all received output.
+	 */
+	clear(): void;
 }
 
 export interface IOutputChannelRegistry {
diff --git a/src/vs/workbench/parts/output/common/outputServices.ts b/src/vs/workbench/parts/output/common/outputServices.ts
@@ -99,7 +99,7 @@ export class OutputService implements IOutputService {
 		return this.activeChannelId;
 	}
 
-	public clearOutput(channel: string): void {
+	private clearOutput(channel: string): void {
 		this.receivedOutput[channel] = '';
 
 		this._onOutput.fire({ channelId: channel, output: null /* indicator to clear output */ });
diff --git a/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts b/src/vs/workbench/parts/tasks/node/processRunnerSystem.ts
@@ -410,6 +410,6 @@ export class ProcessRunnerSystem extends EventEmitter implements ITaskSystem {
 	}
 
 	private clearOutput(): void {
-		this.outputService.clearOutput(this.outputChannelId);
+		this.outputService.getOutputChannel(this.outputChannelId).clear();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ export class MainThreadOutputService {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public clear(channel: string): TPromise<void> {`
`96`		`- this._outputService.clearOutput(channel);`
	`96`	`+ this._outputService.getOutputChannel(channel).clear();`
`97`	`97`	`return undefined;`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export class ClearOutputAction extends Action {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public run(): TPromise<any> {`
`56`		`- this.outputService.clearOutput(this.outputService.getActiveChannel());`
	`56`	`+ this.outputService.getOutputChannel(this.outputService.getActiveChannel()).clear();`
`57`	`57`	`this.panelService.getActivePanel().focus();`
`58`	`58`
`59`	`59`	`return TPromise.as(true);`
`@@ -84,7 +84,7 @@ export class ClearOutputEditorAction extends EditorAction {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public run(): TPromise<boolean> {`
`87`		`- this.outputService.clearOutput(this.outputService.getActiveChannel());`
	`87`	`+ this.outputService.getOutputChannel(this.outputService.getActiveChannel()).clear();`
`88`	`88`	`return TPromise.as(false);`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ export class OutputService implements IOutputService {`
`99`	`99`	`return this.activeChannelId;`
`100`	`100`	`}`
`101`	`101`
`102`		`- public clearOutput(channel: string): void {`
	`102`	`+ private clearOutput(channel: string): void {`
`103`	`103`	`this.receivedOutput[channel] = '';`
`104`	`104`
`105`	`105`	`this._onOutput.fire({ channelId: channel, output: null /* indicator to clear output */ });`
Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,6 @@ export class ProcessRunnerSystem extends EventEmitter implements ITaskSystem {`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`private clearOutput(): void {`
`413`		`- this.outputService.clearOutput(this.outputChannelId);`
	`413`	`+ this.outputService.getOutputChannel(this.outputChannelId).clear();`
`414`	`414`	`}`
`415`	`415`	`}`