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.

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

[badge]: Badge decoration for active debug sessions #8342

Merged
merged 1 commit into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/core/src/browser/frontend-application-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export const frontendApplicationModule = new ContainerModule((bind, unbind, isBo

bindContributionProvider(bind, TabBarDecorator);
bind(TabBarDecoratorService).toSelf().inSingletonScope();
bind(FrontendApplicationContribution).toService(TabBarDecoratorService);

bindContributionProvider(bind, OpenHandler);
bind(DefaultOpenerService).toSelf().inSingletonScope();
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/browser/shell/tab-bar-decorator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@

import debounce = require('lodash.debounce');
import { Title, Widget } from '@phosphor/widgets';
import { inject, injectable, named, postConstruct } from 'inversify';
import { inject, injectable, named } from 'inversify';
import { Event, Emitter, ContributionProvider } from '../../common';
import { WidgetDecoration } from '../widget-decoration';
import { FrontendApplicationContribution } from '../frontend-application';

export const TabBarDecorator = Symbol('TabBarDecorator');

Expand All @@ -43,7 +44,7 @@ export interface TabBarDecorator {
}

@injectable()
export class TabBarDecoratorService {
export class TabBarDecoratorService implements FrontendApplicationContribution {

protected readonly onDidChangeDecorationsEmitter = new Emitter<void>();

Expand All @@ -52,8 +53,7 @@ export class TabBarDecoratorService {
@inject(ContributionProvider) @named(TabBarDecorator)
protected readonly contributions: ContributionProvider<TabBarDecorator>;

@postConstruct()
protected init(): void {
initialize(): void {
this.contributions.getContributions().map(decorator => decorator.onDidChangeDecorations(this.fireDidChangeDecorations));
}

Expand Down
5 changes: 5 additions & 0 deletions packages/debug/src/browser/debug-frontend-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-ser
import { DebugBreakpointWidget } from './editor/debug-breakpoint-widget';
import { DebugInlineValueDecorator } from './editor/debug-inline-value-decorator';
import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
import { DebugTabBarDecorator } from './debug-tab-bar-decorator';

export default new ContainerModule((bind: interfaces.Bind) => {
bind(DebugCallStackItemTypeKey).toDynamicValue(({ container }) =>
Expand Down Expand Up @@ -116,4 +118,7 @@ export default new ContainerModule((bind: interfaces.Bind) => {
bindLaunchPreferences(bind);

bind(DebugWatchManager).toSelf().inSingletonScope();

bind(DebugTabBarDecorator).toSelf().inSingletonScope();
bind(TabBarDecorator).toService(DebugTabBarDecorator);
});
57 changes: 57 additions & 0 deletions packages/debug/src/browser/debug-tab-bar-decorator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/********************************************************************************
* Copyright (C) 2020 Ericsson and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the Eclipse
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
* with the GNU Classpath Exception which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
********************************************************************************/

import { injectable, inject, postConstruct } from 'inversify';
import { DebugSessionManager } from './debug-session-manager';
import { DebugWidget } from './view/debug-widget';
import { Emitter, Event } from '@theia/core/lib/common/event';
import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
import { Title, Widget } from '@theia/core/lib/browser';
import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
import { DisposableCollection } from '@theia/core/lib/common';

@injectable()
export class DebugTabBarDecorator implements TabBarDecorator {
readonly id = 'theia-debug-tabbar-decorator';

protected readonly emitter = new Emitter<void>();
protected toDispose = new DisposableCollection();

@inject(DebugSessionManager)
protected readonly debugSessionManager: DebugSessionManager;

@postConstruct()
protected init(): void {
this.toDispose.pushAll([
this.debugSessionManager.onDidStartDebugSession(() => this.fireDidChangeDecorations()),
this.debugSessionManager.onDidDestroyDebugSession(() => this.fireDidChangeDecorations())
]);
}

decorate(title: Title<Widget>): WidgetDecoration.Data[] {
return (title.owner.id === DebugWidget.ID)
? [{ badge: this.debugSessionManager.sessions.length }]
: [];
}

get onDidChangeDecorations(): Event<void> {
return this.emitter.event;
}

protected fireDidChangeDecorations(): void {
this.emitter.fire(undefined);
}
}