microsoft#57618 Fix open log output file action

sandy081 · sandy081 · commit 8d0c573bf5c2 · 2018-09-04T18:42:24.000+02:00
diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts
@@ -20,6 +20,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { Registry } from 'vs/platform/registry/common/platform';
 import { groupBy } from 'vs/base/common/arrays';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { URI } from 'vs/base/common/uri';
 
 export class ToggleOutputAction extends TogglePanelAction {
 
@@ -179,16 +180,16 @@ export class OpenLogOutputFile extends Action {
 	}
 
 	private update(): void {
-		this.enabled = this.isLogChannel();
+		this.enabled = !!this.getLogFile();
 	}
 
 	public run(): TPromise<any> {
-		return this.commandService.executeCommand(COMMAND_OPEN_LOG_VIEWER, this.isLogChannel());
+		return this.commandService.executeCommand(COMMAND_OPEN_LOG_VIEWER, this.getLogFile());
 	}
 
-	private isLogChannel(): boolean {
+	private getLogFile(): URI {
 		const channel = this.outputService.getActiveChannel();
 		const descriptor = channel ? this.outputService.getChannelDescriptors().filter(c => c.id === channel.id)[0] : null;
-		return descriptor && descriptor.log;
+		return descriptor && descriptor.log ? descriptor.file : null;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView`
`20`	`20`	`import { Registry } from 'vs/platform/registry/common/platform';`
`21`	`21`	`import { groupBy } from 'vs/base/common/arrays';`
`22`	`22`	`import { ICommandService } from 'vs/platform/commands/common/commands';`
	`23`	`+import { URI } from 'vs/base/common/uri';`
`23`	`24`
`24`	`25`	`export class ToggleOutputAction extends TogglePanelAction {`
`25`	`26`
`@@ -179,16 +180,16 @@ export class OpenLogOutputFile extends Action {`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`private update(): void {`
`182`		`- this.enabled = this.isLogChannel();`
	`183`	`+ this.enabled = !!this.getLogFile();`
`183`	`184`	`}`
`184`	`185`
`185`	`186`	`public run(): TPromise<any> {`
`186`		`- return this.commandService.executeCommand(COMMAND_OPEN_LOG_VIEWER, this.isLogChannel());`
	`187`	`+ return this.commandService.executeCommand(COMMAND_OPEN_LOG_VIEWER, this.getLogFile());`
`187`	`188`	`}`
`188`	`189`
`189`		`- private isLogChannel(): boolean {`
	`190`	`+ private getLogFile(): URI {`
`190`	`191`	`const channel = this.outputService.getActiveChannel();`
`191`	`192`	`const descriptor = channel ? this.outputService.getChannelDescriptors().filter(c => c.id === channel.id)[0] : null;`
`192`		`- return descriptor && descriptor.log;`
	`193`	`+ return descriptor && descriptor.log ? descriptor.file : null;`
`193`	`194`	`}`
`194`	`195`	`}`