Skip to content

Commit ff5eabc

Browse files
author
Benjamin Pasero
committed
debt - updateTouchBar is electron only
1 parent 81fed9c commit ff5eabc

10 files changed

Lines changed: 12 additions & 42 deletions

File tree

‎src/vs/platform/electron/electron-main/electronMainService.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifec
99
import { OpenContext, INativeOpenDialogOptions } from 'vs/platform/windows/common/windows';
1010
import { isMacintosh } from 'vs/base/common/platform';
1111
import { IElectronService } from 'vs/platform/electron/node/electron';
12+
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1213

1314
type ElectronServiceInterface = {
1415
// Every property of service: IF property is a FUNCTION ADD windowId as first parameter and original parameters afterwards with same return type ELSE preserve as is
@@ -107,6 +108,13 @@ export class ElectronMainService implements ElectronServiceInterface {
107108
return this.windowsMainService.openExternal(url);
108109
}
109110

111+
async updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Promise<void> {
112+
const window = this.windowsMainService.getWindowById(windowId);
113+
if (window) {
114+
window.updateTouchBar(items);
115+
}
116+
}
117+
110118
//#endregion
111119

112120
//#region Lifecycle

‎src/vs/platform/electron/node/electron.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, SaveDialogOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogReturnValue } from 'electron';
77
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
88
import { INativeOpenDialogOptions } from 'vs/platform/windows/common/windows';
9+
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
910

1011
export const IElectronService = createDecorator<IElectronService>('electronService');
1112

@@ -34,6 +35,7 @@ export interface IElectronService {
3435
setRepresentedFilename(path: string): Promise<void>;
3536
setDocumentEdited(edited: boolean): Promise<void>;
3637
openExternal(url: string): Promise<boolean>;
38+
updateTouchBar(items: ISerializableCommandAction[][]): Promise<void>;
3739

3840
// Lifecycle
3941
relaunch(options?: { addArgs?: string[], removeArgs?: string[] }): Promise<void>;

‎src/vs/platform/windows/common/windows.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { IProcessEnvironment, isMacintosh, isLinux, isWeb } from 'vs/base/common
1010
import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
1111
import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
1212
import { IRecentlyOpened, IRecent } from 'vs/platform/history/common/history';
13-
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1413
import { ExportData } from 'vs/base/common/performance';
1514
import { LogLevel } from 'vs/platform/log/common/log';
1615
import { DisposableStore, Disposable } from 'vs/base/common/lifecycle';
@@ -114,9 +113,6 @@ export interface IWindowsService {
114113
mergeAllWindowTabs(): Promise<void>;
115114
toggleWindowTabsBar(): Promise<void>;
116115

117-
// macOS TouchBar
118-
updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Promise<void>;
119-
120116
// Shared process
121117
whenSharedProcessReady(): Promise<void>;
122118
toggleSharedProcess(): Promise<void>;
@@ -185,7 +181,6 @@ export interface IWindowService {
185181

186182
readonly windowId: number;
187183

188-
updateTouchBar(items: ISerializableCommandAction[][]): Promise<void>;
189184
enterWorkspace(path: URI): Promise<IEnterWorkspaceResult | undefined>;
190185
getRecentlyOpened(): Promise<IRecentlyOpened>;
191186
addRecentlyOpened(recents: IRecent[]): Promise<void>;

‎src/vs/platform/windows/common/windowsIpc.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ export class WindowsChannel implements IServerChannel {
6262
case 'moveWindowTabToNewWindow': return this.service.moveWindowTabToNewWindow();
6363
case 'mergeAllWindowTabs': return this.service.mergeAllWindowTabs();
6464
case 'toggleWindowTabsBar': return this.service.toggleWindowTabsBar();
65-
case 'updateTouchBar': return this.service.updateTouchBar(arg[0], arg[1]);
6665
case 'getRecentlyOpened': return this.service.getRecentlyOpened(arg);
6766
case 'focusWindow': return this.service.focusWindow(arg);
6867
case 'closeWindow': return this.service.closeWindow(arg);

‎src/vs/platform/windows/electron-browser/windowsService.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc';
88
import { IWindowsService, IEnterWorkspaceResult, CrashReporterStartOptions, IURIToOpen, IOpenSettings } from 'vs/platform/windows/common/windows';
99
import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, reviveWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
1010
import { IRecentlyOpened, IRecent, isRecentWorkspace } from 'vs/platform/history/common/history';
11-
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1211
import { URI } from 'vs/base/common/uri';
1312
import { ParsedArgs } from 'vs/platform/environment/common/environment';
1413
import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
@@ -157,8 +156,4 @@ export class WindowsService implements IWindowsService {
157156
startCrashReporter(config: CrashReporterStartOptions): Promise<void> {
158157
return this.channel.call('startCrashReporter', config);
159158
}
160-
161-
updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Promise<void> {
162-
return this.channel.call('updateTouchBar', [windowId, items]);
163-
}
164159
}

‎src/vs/platform/windows/electron-main/legacyWindowsMainService.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { IWindowsMainService, ISharedProcess, ICodeWindow } from 'vs/platform/wi
1515
import { IRecentlyOpened, IRecent } from 'vs/platform/history/common/history';
1616
import { IHistoryMainService } from 'vs/platform/history/electron-main/historyMainService';
1717
import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
18-
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1918
import { Schemas } from 'vs/base/common/network';
2019
import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
2120
import { ILogService } from 'vs/platform/log/common/log';
@@ -75,12 +74,6 @@ export class LegacyWindowsMainService extends Disposable implements IWindowsServ
7574
return this.withWindow(windowId, codeWindow => this.windowsMainService.showOpenDialog(options, codeWindow), () => this.windowsMainService.showOpenDialog(options))!;
7675
}
7776

78-
async updateTouchBar(windowId: number, items: ISerializableCommandAction[][]): Promise<void> {
79-
this.logService.trace('windowsService#updateTouchBar', windowId);
80-
81-
return this.withWindow(windowId, codeWindow => codeWindow.updateTouchBar(items));
82-
}
83-
8477
async enterWorkspace(windowId: number, path: URI): Promise<IEnterWorkspaceResult | undefined> {
8578
this.logService.trace('windowsService#enterWorkspace', windowId);
8679

‎src/vs/workbench/browser/web.simpleservices.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
1313
import { IWindowService, IEnterWorkspaceResult, IURIToOpen, IWindowsService, IOpenSettings, IWindowSettings, CrashReporterStartOptions } from 'vs/platform/windows/common/windows';
1414
import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
1515
import { IRecentlyOpened, IRecent, isRecentFile, isRecentFolder } from 'vs/platform/history/common/history';
16-
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1716
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
1817
import { addDisposableListener, EventType } from 'vs/base/browser/dom';
1918
import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
@@ -204,10 +203,6 @@ export class SimpleWindowService extends Disposable implements IWindowService {
204203

205204
return Promise.resolve();
206205
}
207-
208-
updateTouchBar(_items: ISerializableCommandAction[][]): Promise<void> {
209-
return Promise.resolve();
210-
}
211206
}
212207

213208
registerSingleton(IWindowService, SimpleWindowService);
@@ -322,10 +317,6 @@ export class SimpleWindowsService implements IWindowsService {
322317
return Promise.resolve();
323318
}
324319

325-
updateTouchBar(_windowId: number, _items: ISerializableCommandAction[][]): Promise<void> {
326-
return Promise.resolve();
327-
}
328-
329320
getActiveWindowId(): Promise<number | undefined> {
330321
return Promise.resolve(0);
331322
}

‎src/vs/workbench/electron-browser/window.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ export class ElectronWindow extends Disposable {
539539
// Only update if the actions have changed
540540
if (!equals(this.lastInstalledTouchedBar, items)) {
541541
this.lastInstalledTouchedBar = items;
542-
this.windowService.updateTouchBar(items);
542+
this.electronService.updateTouchBar(items);
543543
}
544544
}
545545

‎src/vs/workbench/services/window/electron-browser/windowService.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import { Event } from 'vs/base/common/event';
77
import { IWindowService, IWindowsService, IEnterWorkspaceResult, IOpenSettings, IURIToOpen, isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/windows/common/windows';
88
import { IRecentlyOpened, IRecent } from 'vs/platform/history/common/history';
9-
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
109
import { URI } from 'vs/base/common/uri';
1110
import { Disposable } from 'vs/base/common/lifecycle';
1211
import { ILabelService } from 'vs/platform/label/common/label';
@@ -104,10 +103,6 @@ export class WindowService extends Disposable implements IWindowService {
104103
return this.windowsService.minimizeWindow(this.windowId);
105104
}
106105

107-
updateTouchBar(items: ISerializableCommandAction[][]): Promise<void> {
108-
return this.windowsService.updateTouchBar(this.windowId, items);
109-
}
110-
111106
private getRecentLabel(u: IURIToOpen): string {
112107
if (isFolderToOpen(u)) {
113108
return this.labelService.getWorkspaceLabel(u.folderUri, { verbose: true });

‎src/vs/workbench/test/workbenchTestServices.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderW
4545
import { IRecentlyOpened, IRecent } from 'vs/platform/history/common/history';
4646
import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
4747
import { IPosition, Position as EditorPosition } from 'vs/editor/common/core/position';
48-
import { IMenuService, MenuId, IMenu, ISerializableCommandAction } from 'vs/platform/actions/common/actions';
48+
import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
4949
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
5050
import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
5151
import { ITextBufferFactory, DefaultEndOfLine, EndOfLinePreference, IModelDecorationOptions, ITextModel, ITextSnapshot } from 'vs/editor/common/model';
@@ -1238,10 +1238,6 @@ export class TestWindowService implements IWindowService {
12381238
closeWindow(): Promise<void> {
12391239
return Promise.resolve();
12401240
}
1241-
1242-
updateTouchBar(_items: ISerializableCommandAction[][]): Promise<void> {
1243-
return Promise.resolve();
1244-
}
12451241
}
12461242

12471243
export class TestLifecycleService implements ILifecycleService {
@@ -1390,10 +1386,6 @@ export class TestWindowsService implements IWindowsService {
13901386
return Promise.resolve();
13911387
}
13921388

1393-
updateTouchBar(_windowId: number, _items: ISerializableCommandAction[][]): Promise<void> {
1394-
return Promise.resolve();
1395-
}
1396-
13971389
getActiveWindowId(): Promise<number | undefined> {
13981390
return Promise.resolve(undefined);
13991391
}

0 commit comments

Comments
 (0)