Skip to content

Commit 19466f3

Browse files
jriekenjrieken
committed
move broadcast service definition to common-layer, microsoft#70319 
1 parent f94c735 commit 19466f3

7 files changed

Lines changed: 38 additions & 21 deletions

File tree

‎src/vs/workbench/api/electron-browser/mainThreadConsole.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
99
import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
1010
import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/electron-browser/extensionHost';
1111
import { IWindowsService } from 'vs/platform/windows/common/windows';
12-
import { IBroadcastService } from 'vs/workbench/services/broadcast/electron-browser/broadcastService';
12+
import { IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
1313
import { EXTENSION_LOG_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
1414

1515
@extHostNamedCustomer(MainContext.MainThreadConsole)

‎src/vs/workbench/contrib/debug/electron-browser/debugService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
3434
import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
3535
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
3636
import { EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
37-
import { IBroadcastService } from 'vs/workbench/services/broadcast/electron-browser/broadcastService';
37+
import { IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
3838
import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console';
3939
import { TaskEvent, TaskEventKind, TaskIdentifier } from 'vs/workbench/contrib/tasks/common/tasks';
4040
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';

‎src/vs/workbench/contrib/splash/electron-browser/partsSplash.contribution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { getTotalHeight, getTotalWidth } from 'vs/base/browser/dom';
99
import { Color } from 'vs/base/common/color';
1010
import { Event } from 'vs/base/common/event';
1111
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
12-
import { IBroadcastService } from 'vs/workbench/services/broadcast/electron-browser/broadcastService';
12+
import { IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
1313
import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
1414
import { Registry } from 'vs/platform/registry/common/platform';
1515
import { ColorIdentifier, editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';

‎src/vs/workbench/services/broadcast/common/broadcast.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
7+
import { Event } from 'vs/base/common/event';
8+
9+
export const IBroadcastService = createDecorator<IBroadcastService>('broadcastService');
10+
11+
export interface IBroadcast {
12+
channel: string;
13+
payload: any;
14+
}
15+
16+
export interface IBroadcastService {
17+
_serviceBrand: any;
18+
19+
onBroadcast: Event<IBroadcast>;
20+
21+
broadcast(b: IBroadcast): void;
22+
}
23+
24+
export class NullBroadcastService implements IBroadcastService {
25+
_serviceBrand: any;
26+
onBroadcast: Event<IBroadcast> = Event.None;
27+
broadcast(_b: IBroadcast): void {
28+
29+
}
30+
}

‎src/vs/workbench/services/broadcast/electron-browser/broadcastService.ts‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,13 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
76
import { Event, Emitter } from 'vs/base/common/event';
87
import { ipcRenderer as ipc } from 'electron';
98
import { ILogService } from 'vs/platform/log/common/log';
109
import { Disposable } from 'vs/base/common/lifecycle';
1110
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
1211
import { IWindowService } from 'vs/platform/windows/common/windows';
13-
14-
export const IBroadcastService = createDecorator<IBroadcastService>('broadcastService');
15-
16-
export interface IBroadcast {
17-
channel: string;
18-
payload: any;
19-
}
20-
21-
export interface IBroadcastService {
22-
_serviceBrand: any;
23-
24-
onBroadcast: Event<IBroadcast>;
25-
26-
broadcast(b: IBroadcast): void;
27-
}
12+
import { IBroadcastService, IBroadcast } from 'vs/workbench/services/broadcast/common/broadcast';
2813

2914
export class BroadcastService extends Disposable implements IBroadcastService {
3015
_serviceBrand: any;
@@ -63,4 +48,4 @@ export class BroadcastService extends Disposable implements IBroadcastService {
6348
}
6449
}
6550

66-
registerSingleton(IBroadcastService, BroadcastService, true);
51+
registerSingleton(IBroadcastService, BroadcastService, true);

‎src/vs/workbench/services/extensions/electron-browser/extensionHost.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
2121
import { findFreePort, randomPort } from 'vs/base/node/ports';
2222
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
2323
import { PersistentProtocol, generateRandomPipeName } from 'vs/base/parts/ipc/node/ipc.net';
24-
import { IBroadcast, IBroadcastService } from 'vs/workbench/services/broadcast/electron-browser/broadcastService';
24+
import { IBroadcast, IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
2525
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
2626
import { EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
2727
import { ILabelService } from 'vs/platform/label/common/label';

‎src/vs/workbench/workbench.nodeless.main.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS
9494
// import { IURLService } from 'vs/platform/url/common/url';
9595
// import { RelayURLService } from 'vs/platform/url/electron-browser/urlService';
9696
import { IHeapService, NullHeapService } from 'vs/workbench/services/heap/common/heap';
97+
import { IBroadcastService, NullBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
9798

9899
import 'vs/workbench/browser/nodeless.simpleservices';
99100

@@ -169,6 +170,7 @@ registerSingleton(IContextViewService, ContextViewService, true);
169170
// registerSingleton(IMenubarService, MenubarService);
170171
// registerSingleton(IURLService, RelayURLService);
171172
registerSingleton(IHeapService, NullHeapService);
173+
registerSingleton(IBroadcastService, NullBroadcastService);
172174

173175
registerSingleton(IContextMenuService, ContextMenuService);
174176

0 commit comments

Comments
 (0)