Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various output channel-related fixes #8476

Merged
merged 2 commits into from
Sep 15, 2020
Merged

Various output channel-related fixes #8476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfd24a1
Clients can customize channel creation.
Sep 7, 2020
d3e7922
Removed superfluous channel caching for extensions
Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions packages/output/src/common/output-channel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export class OutputChannelManager implements CommandContribution, Disposable, Re
this.textModelService.createModelReference(uri).then(ref => editorModelRef.resolve(ref));
}

const channel = new OutputChannel(resource, this.preferences);
const channel = this.createChannel(resource);
this.channels.set(name, channel);
this.toDisposeOnChannelDeletion.set(name, this.registerListeners(channel));
this.channelAddedEmitter.fire(channel);
Expand Down Expand Up @@ -306,6 +306,10 @@ export class OutputChannelManager implements CommandContribution, Disposable, Re
return new OutputResource(uri, editorModelRef);
}

protected createChannel(resource: OutputResource): OutputChannel {
return new OutputChannel(resource, this.preferences);
}

}

export enum OutputChannelSeverity {
Expand All @@ -316,20 +320,21 @@ export enum OutputChannelSeverity {

export class OutputChannel implements Disposable {

private readonly contentChangeEmitter = new Emitter<void>();
private readonly visibilityChangeEmitter = new Emitter<{ isVisible: boolean, preserveFocus?: boolean }>();
private readonly disposedEmitter = new Emitter<void>();
private readonly toDispose = new DisposableCollection(
protected readonly contentChangeEmitter = new Emitter<void>();
protected readonly visibilityChangeEmitter = new Emitter<{ isVisible: boolean, preserveFocus?: boolean }>();
protected readonly disposedEmitter = new Emitter<void>();
protected readonly textModifyQueue = new PQueue({ autoStart: true, concurrency: 1 });
protected readonly toDispose = new DisposableCollection(
Disposable.create(() => this.textModifyQueue.clear()),
this.contentChangeEmitter,
this.visibilityChangeEmitter,
this.disposedEmitter
);

private disposed = false;
private visible = true;
private _maxLineNumber: number;
private decorationIds = new Set<string>();
private textModifyQueue = new PQueue({ autoStart: true, concurrency: 1 });
protected disposed = false;
protected visible = true;
protected _maxLineNumber: number;
protected decorationIds = new Set<string>();

readonly onVisibilityChange: Event<{ isVisible: boolean, preserveFocus?: boolean }> = this.visibilityChangeEmitter.event;
readonly onContentChange: Event<void> = this.contentChangeEmitter.event;
Expand Down
75 changes: 15 additions & 60 deletions packages/plugin-ext/src/main/browser/output-channel-registry-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,84 +15,39 @@
********************************************************************************/

import { injectable, inject } from 'inversify';
import { OutputWidget } from '@theia/output/lib/browser/output-widget';
import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
import { OutputChannel, OutputChannelManager } from '@theia/output/lib/common/output-channel';
import { CommandService } from '@theia/core/lib/common/command';
import { OutputCommands } from '@theia/output/lib/browser/output-commands';
import { OutputChannelRegistryMain, PluginInfo } from '../../common/plugin-api-rpc';

@injectable()
export class OutputChannelRegistryMainImpl implements OutputChannelRegistryMain {

@inject(OutputChannelManager)
private outputChannelManager: OutputChannelManager;

@inject(OutputContribution)
private outputContribution: OutputContribution;

private commonOutputWidget: OutputWidget | undefined;

private channels: Map<string, OutputChannel> = new Map();

$append(channelName: string, value: string, pluginInfo: PluginInfo): PromiseLike<void> {
const outputChannel = this.getChannel(channelName);
if (outputChannel) {
outputChannel.append(value);
}
@inject(CommandService)
protected readonly commandService: CommandService;

$append(name: string, text: string, pluginInfo: PluginInfo): PromiseLike<void> {
this.commandService.executeCommand(OutputCommands.APPEND.id, { name, text });
return Promise.resolve();
}

$clear(channelName: string): PromiseLike<void> {
const outputChannel = this.getChannel(channelName);
if (outputChannel) {
outputChannel.clear();
}

$clear(name: string): PromiseLike<void> {
this.commandService.executeCommand(OutputCommands.CLEAR.id, { name });
return Promise.resolve();
}

$dispose(channelName: string): PromiseLike<void> {
this.outputChannelManager.deleteChannel(channelName);
if (this.channels.has(channelName)) {
this.channels.delete(channelName);
}

$dispose(name: string): PromiseLike<void> {
this.commandService.executeCommand(OutputCommands.DISPOSE.id, { name });
return Promise.resolve();
}

async $reveal(channelName: string, preserveFocus: boolean): Promise<void> {
const outputChannel = this.getChannel(channelName);
if (outputChannel) {
const activate = !preserveFocus;
const reveal = preserveFocus;
this.commonOutputWidget = await this.outputContribution.openView({ activate, reveal });
outputChannel.setVisibility(true);
}
async $reveal(name: string, preserveFocus: boolean): Promise<void> {
const options = { preserveFocus };
this.commandService.executeCommand(OutputCommands.SHOW.id, { name, options });
}

$close(channelName: string): PromiseLike<void> {
const outputChannel = this.getChannel(channelName);
if (outputChannel) {
outputChannel.setVisibility(false);
}
const channels = this.outputChannelManager.getChannels();
const isEmpty = channels.findIndex((channel: OutputChannel) => channel.isVisible) === -1;
if (isEmpty && this.commonOutputWidget) {
this.commonOutputWidget.close();
}

$close(name: string): PromiseLike<void> {
this.commandService.executeCommand(OutputCommands.HIDE.id, { name });
return Promise.resolve();
}

private getChannel(channelName: string): OutputChannel | undefined {
let outputChannel: OutputChannel | undefined;
if (this.channels.has(channelName)) {
outputChannel = this.channels.get(channelName);
} else {
outputChannel = this.outputChannelManager.getChannel(channelName);
this.channels.set(channelName, outputChannel);
}

return outputChannel;
}
}