output: show labels in output channel dropdown

isidorn · isidorn · commit 31473fe488b6 · 2016-04-13T18:14:28.000+02:00
diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts
@@ -122,7 +122,7 @@ export class SwitchOutputActionItem extends SelectActionItem {
 	}
 
 	private static getChannels(outputService: IOutputService): string[] {
-		const contributedChannels = (<IOutputChannelRegistry>Registry.as(Extensions.OutputChannels)).getChannels().map(channelData => channelData.id);
+		const contributedChannels = (<IOutputChannelRegistry>Registry.as(Extensions.OutputChannels)).getChannels().map(channelData => channelData.displayName);
 		return contributedChannels.sort(); // sort by name
 	}
 }
diff --git a/src/vs/workbench/parts/output/common/output.ts b/src/vs/workbench/parts/output/common/output.ts
@@ -54,6 +54,9 @@ export var IOutputService = createDecorator<IOutputService>(OUTPUT_SERVICE_ID);
 export interface IOutputService {
 	serviceId: ServiceIdentifier<any>;
 
+	/**
+	 * Given the channel id returns the output channel instance.
+	 */
 	getOutputChannel(id: string): IOutputChannel;
 
 	/**
@@ -62,25 +65,25 @@ export interface IOutputService {
 	getActiveChannelId(): string;
 
 	/**
-	 * Allows to register on Output events
+	 * Allows to register on Output events.
 	 */
 	onOutput: Event<IOutputEvent>;
 
 	/**
-	 * Allows to register on a new Output channel getting filled with output
+	 * Allows to register on a new Output channel getting filled with output.
 	 */
 	onOutputChannel: Event<string>;
 
 	/**
-	 * Allows to register on active output channel change
+	 * Allows to register on active output channel change.
 	 */
 	onActiveOutputChannel: Event<string>;
 }
 
 export interface IOutputChannel {
 
 	/**
-	 * The received output content.
+	 * Returns the received output content.
 	 */
 	getContent(): string;
 
@@ -95,7 +98,7 @@ export interface IOutputChannel {
 	show(preserveFocus?: boolean): TPromise<IEditor>;
 
 	/**
-	 * Clears all received output.
+	 * Clears all received output for this channel.
 	 */
 	clear(): void;
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ export class SwitchOutputActionItem extends SelectActionItem {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`private static getChannels(outputService: IOutputService): string[] {`
`125`		`- const contributedChannels = (<IOutputChannelRegistry>Registry.as(Extensions.OutputChannels)).getChannels().map(channelData => channelData.id);`
	`125`	`+ const contributedChannels = (<IOutputChannelRegistry>Registry.as(Extensions.OutputChannels)).getChannels().map(channelData => channelData.displayName);`
`126`	`126`	`return contributedChannels.sort(); // sort by name`
`127`	`127`	`}`
`128`	`128`	`}`