Skip to content

Commit 3f7bd94

Browse files
author
Benjamin Pasero
committed
debt - lift a few service implementations from platform to workbench
1 parent f39e5c3 commit 3f7bd94

9 files changed

Lines changed: 25 additions & 26 deletions

File tree

src/vs/platform/clipboard/browser/clipboardService.ts renamed to src/vs/workbench/services/clipboard/browser/clipboardService.ts

File renamed without changes.

src/vs/platform/clipboard/electron-browser/clipboardService.ts renamed to src/vs/workbench/services/clipboard/electron-browser/clipboardService.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
77
import { clipboard } from 'electron';
88
import { URI } from 'vs/base/common/uri';
99
import { isMacintosh } from 'vs/base/common/platform';
10+
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
1011

11-
export class ClipboardService implements IClipboardService {
12+
export class NativeClipboardService implements IClipboardService {
1213

1314
private static FILE_FORMAT = 'code/file-list'; // Clipboard format for files
1415

@@ -42,16 +43,16 @@ export class ClipboardService implements IClipboardService {
4243

4344
writeResources(resources: URI[]): void {
4445
if (resources.length) {
45-
clipboard.writeBuffer(ClipboardService.FILE_FORMAT, this.resourcesToBuffer(resources));
46+
clipboard.writeBuffer(NativeClipboardService.FILE_FORMAT, this.resourcesToBuffer(resources));
4647
}
4748
}
4849

4950
readResources(): URI[] {
50-
return this.bufferToResources(clipboard.readBuffer(ClipboardService.FILE_FORMAT));
51+
return this.bufferToResources(clipboard.readBuffer(NativeClipboardService.FILE_FORMAT));
5152
}
5253

5354
hasResources(): boolean {
54-
return clipboard.has(ClipboardService.FILE_FORMAT);
55+
return clipboard.has(NativeClipboardService.FILE_FORMAT);
5556
}
5657

5758
private resourcesToBuffer(resources: URI[]): Buffer {
@@ -75,3 +76,5 @@ export class ClipboardService implements IClipboardService {
7576
}
7677
}
7778
}
79+
80+
registerSingleton(IClipboardService, NativeClipboardService, true);

src/vs/platform/issue/electron-browser/issueService.ts renamed to src/vs/workbench/services/issue/electron-browser/issueService.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import { IIssueService } from 'vs/platform/issue/node/issue';
77
import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
88
import { createChannelSender } from 'vs/base/parts/ipc/node/ipc';
9+
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
910

1011
export class IssueService {
1112

@@ -15,3 +16,5 @@ export class IssueService {
1516
return createChannelSender<IIssueService>(mainProcessService.getChannel('issue'));
1617
}
1718
}
19+
20+
registerSingleton(IIssueService, IssueService, true);

‎src/vs/workbench/services/localizations/electron-browser/localizationsService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ export class LocalizationsService {
1919
}
2020
}
2121

22-
registerSingleton(ILocalizationsService, LocalizationsService);
22+
registerSingleton(ILocalizationsService, LocalizationsService, true);

src/vs/platform/menubar/electron-browser/menubarService.ts renamed to src/vs/workbench/services/menubar/electron-browser/menubarService.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import { IMenubarService } from 'vs/platform/menubar/node/menubar';
77
import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
88
import { createChannelSender } from 'vs/base/parts/ipc/node/ipc';
9+
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
910

1011
export class MenubarService {
1112

@@ -15,3 +16,5 @@ export class MenubarService {
1516
return createChannelSender<IMenubarService>(mainProcessService.getChannel('menubar'));
1617
}
1718
}
19+
20+
registerSingleton(IMenubarService, MenubarService, true);

‎src/vs/workbench/services/update/browser/updateService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface IUpdateProvider {
2424
checkForUpdate(): Promise<IUpdate | null>;
2525
}
2626

27-
export class UpdateService extends Disposable implements IUpdateService {
27+
export class BrowserUpdateService extends Disposable implements IUpdateService {
2828

2929
_serviceBrand: undefined;
3030

@@ -92,4 +92,4 @@ export class UpdateService extends Disposable implements IUpdateService {
9292
}
9393
}
9494

95-
registerSingleton(IUpdateService, UpdateService);
95+
registerSingleton(IUpdateService, BrowserUpdateService);

src/vs/platform/update/electron-browser/updateService.ts renamed to src/vs/workbench/services/update/electron-browser/updateService.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc';
77
import { Event, Emitter } from 'vs/base/common/event';
88
import { IUpdateService, State } from 'vs/platform/update/common/update';
99
import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
10+
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
1011

11-
export class UpdateService implements IUpdateService {
12+
export class NativeUpdateService implements IUpdateService {
1213

1314
_serviceBrand: undefined;
1415

@@ -56,3 +57,5 @@ export class UpdateService implements IUpdateService {
5657
return this.channel.call('isLatestVersion');
5758
}
5859
}
60+
61+
registerSingleton(IUpdateService, NativeUpdateService);

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,10 @@ import 'vs/workbench/services/lifecycle/electron-browser/lifecycleService';
5757
import 'vs/workbench/services/sharedProcess/electron-browser/sharedProcessService';
5858
import 'vs/workbench/services/electron/electron-browser/electronService';
5959
import 'vs/workbench/services/localizations/electron-browser/localizationsService';
60-
61-
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
62-
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
63-
import { ClipboardService } from 'vs/platform/clipboard/electron-browser/clipboardService';
64-
import { IUpdateService } from 'vs/platform/update/common/update';
65-
import { UpdateService } from 'vs/platform/update/electron-browser/updateService';
66-
import { IIssueService } from 'vs/platform/issue/node/issue';
67-
import { IssueService } from 'vs/platform/issue/electron-browser/issueService';
68-
import { IMenubarService } from 'vs/platform/menubar/node/menubar';
69-
import { MenubarService } from 'vs/platform/menubar/electron-browser/menubarService';
70-
71-
registerSingleton(IClipboardService, ClipboardService, true);
72-
registerSingleton(IUpdateService, UpdateService);
73-
registerSingleton(IIssueService, IssueService);
74-
registerSingleton(IMenubarService, MenubarService);
60+
import 'vs/workbench/services/clipboard/electron-browser/clipboardService';
61+
import 'vs/workbench/services/update/electron-browser/updateService';
62+
import 'vs/workbench/services/issue/electron-browser/issueService';
63+
import 'vs/workbench/services/menubar/electron-browser/menubarService';
7564

7665
//#endregion
7766

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ import 'vs/workbench/services/dialogs/browser/fileDialogService';
4747
import 'vs/workbench/services/host/browser/browserHostService';
4848
import 'vs/workbench/services/request/browser/requestService';
4949
import 'vs/workbench/services/lifecycle/browser/lifecycleService';
50+
import 'vs/workbench/services/clipboard/browser/clipboardService';
5051

5152
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
52-
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
53-
import { BrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
5453
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
5554
import { BrowserAccessibilityService } from 'vs/platform/accessibility/common/accessibilityService';
5655
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -70,7 +69,6 @@ import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyn
7069

7170
registerSingleton(IExtensionManagementService, ExtensionManagementService);
7271
registerSingleton(IBackupFileService, BackupFileService);
73-
registerSingleton(IClipboardService, BrowserClipboardService, true);
7472
registerSingleton(IAccessibilityService, BrowserAccessibilityService, true);
7573
registerSingleton(IContextMenuService, ContextMenuService);
7674
registerSingleton(ITunnelService, NoOpTunnelService, true);

0 commit comments

Comments
 (0)