development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #199946 (#201761)

Browse source
This commit is contained in:
Sandeep Somavarapu 2024-01-04 13:11:59 +05:30 committed by GitHub
parent d8a75eacf7
commit 95c1e5236a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
src/vs/workbench/contrib/output/browser/output.contribution.ts
View file

@ -15,12 +15,12 @@ import { OutputViewPane } from 'vs/workbench/contrib/output/browser/outputView';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { ViewContainer, IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry, IViewsService } from 'vs/workbench/common/views';
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
import { IQuickPickItem, IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { AUX_WINDOW_GROUP, AUX_WINDOW_GROUP_TYPE, IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { assertIsDefined } from 'vs/base/common/types';
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { Codicon } from 'vs/base/common/codicons';
@ -81,8 +81,9 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
class OutputContribution extends Disposable implements IWorkbenchContribution {
constructor(
@IInstantiationService instantiationService: IInstantiationService,
@IOutputService private readonly outputService: IOutputService,
@IEditorService private readonly editorService: IEditorService,
@IFilesConfigurationService private readonly fileConfigurationService: IFilesConfigurationService,
) {
super();
this.registerActions();
@ -94,6 +95,7 @@ class OutputContribution extends Disposable implements IWorkbenchContribution {
this.registerClearOutputAction();
this.registerToggleAutoScrollAction();
this.registerOpenActiveOutputFileAction();
this.registerOpenActiveOutputFileInAuxWindowAction();
this.registerShowLogsAction();
this.registerOpenLogFileAction();
}
@ -260,11 +262,12 @@ class OutputContribution extends Disposable implements IWorkbenchContribution {
}
private registerOpenActiveOutputFileAction(): void {
const that = this;
this._register(registerAction2(class extends Action2 {
constructor() {
super({
id: `workbench.action.openActiveLogOutputFile`,
title: nls.localize2('openActiveOutputFile', "Open Output as Editor"),
title: nls.localize2('openActiveOutputFile', "Open Output in Editor"),
menu: [{
id: MenuId.ViewTitle,
when: ContextKeyExpr.equals('view', OUTPUT_VIEW_ID),
@ -275,34 +278,59 @@ class OutputContribution extends Disposable implements IWorkbenchContribution {
precondition: CONTEXT_ACTIVE_FILE_OUTPUT
});
}
async run(accessor: ServicesAccessor): Promise<void> {
const outputService = accessor.get(IOutputService);
const editorService = accessor.get(IEditorService);
const fileConfigurationService = accessor.get(IFilesConfigurationService);
const fileOutputChannelDescriptor = this.getFileOutputChannelDescriptor(outputService);
if (fileOutputChannelDescriptor) {
await fileConfigurationService.updateReadonly(fileOutputChannelDescriptor.file, true);
await editorService.openEditor({
resource: fileOutputChannelDescriptor.file,
options: {
pinned: true,
}
});
}
}
private getFileOutputChannelDescriptor(outputService: IOutputService): IFileOutputChannelDescriptor | null {
const channel = outputService.getActiveChannel();
if (channel) {
const descriptor = outputService.getChannelDescriptors().filter(c => c.id === channel.id)[0];
if (descriptor?.file) {
return <IFileOutputChannelDescriptor>descriptor;
}
}
return null;
async run(): Promise<void> {
that.openActiveOutoutFile();
}
}));
}
private registerOpenActiveOutputFileInAuxWindowAction(): void {
const that = this;
this._register(registerAction2(class extends Action2 {
constructor() {
super({
id: `workbench.action.openActiveLogOutputFileInNewWindow`,
title: nls.localize2('openActiveOutputFileInNewWindow', "Open Output in New Window"),
menu: [{
id: MenuId.ViewTitle,
when: ContextKeyExpr.equals('view', OUTPUT_VIEW_ID),
group: 'navigation',
order: 5
}],
icon: Codicon.window,
precondition: CONTEXT_ACTIVE_FILE_OUTPUT
});
}
async run(): Promise<void> {
that.openActiveOutoutFile(AUX_WINDOW_GROUP);
}
}));
}
private async openActiveOutoutFile(group?: AUX_WINDOW_GROUP_TYPE): Promise<void> {
const fileOutputChannelDescriptor = this.getFileOutputChannelDescriptor();
if (fileOutputChannelDescriptor) {
await this.fileConfigurationService.updateReadonly(fileOutputChannelDescriptor.file, true);
await this.editorService.openEditor({
resource: fileOutputChannelDescriptor.file,
options: {
pinned: true,
},
}, group);
}
}
private getFileOutputChannelDescriptor(): IFileOutputChannelDescriptor | null {
const channel = this.outputService.getActiveChannel();
if (channel) {
const descriptor = this.outputService.getChannelDescriptors().filter(c => c.id === channel.id)[0];
if (descriptor?.file) {
return <IFileOutputChannelDescriptor>descriptor;
}
}
return null;
}
private registerShowLogsAction(): void {
this._register(registerAction2(class extends Action2 {
constructor() {