bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(lib/vscode): conflicts in menubarControl.ts

This commit is contained in:
Akash Satheesan 2021-05-01 01:02:34 +05:30
parent 81357cf4b0
commit 532ae1451f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
View File

@ -303,6 +303,7 @@ export class CustomMenubarControl extends MenubarControl {
private readonly _onVisibilityChange: Emitter<boolean>; private readonly _onVisibilityChange: Emitter<boolean>;
private readonly _onFocusStateChange: Emitter<boolean>; private readonly _onFocusStateChange: Emitter<boolean>;
// NOTE@coder: add logService (used in logout)
constructor( constructor(
@IMenuService menuService: IMenuService, @IMenuService menuService: IMenuService,
@IWorkspacesService workspacesService: IWorkspacesService, @IWorkspacesService workspacesService: IWorkspacesService,
@ -318,14 +319,9 @@ export class CustomMenubarControl extends MenubarControl {
@IAccessibilityService accessibilityService: IAccessibilityService, @IAccessibilityService accessibilityService: IAccessibilityService,
@IThemeService private readonly themeService: IThemeService, @IThemeService private readonly themeService: IThemeService,
@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService, @IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
<<<<<<< HEAD @IHostService hostService: IHostService,
@IHostService protected readonly hostService: IHostService,
@ICommandService commandService: ICommandService, @ICommandService commandService: ICommandService,
@ILogService private readonly logService: ILogService @ILogService private readonly logService: ILogService
=======
@IHostService hostService: IHostService,
@ICommandService commandService: ICommandService
>>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
) { ) {
super(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, hostService, commandService); super(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, hostService, commandService);
@ -728,7 +724,7 @@ export class CustomMenubarControl extends MenubarControl {
} }
webNavigationActions.push(new Action('logout', localize('logout', "Log out"), undefined, true, webNavigationActions.push(new Action('logout', localize('logout', "Log out"), undefined, true,
async (event?: MouseEvent) => { async (_event?: any) => {
const COOKIE_KEY = Cookie.Key; const COOKIE_KEY = Cookie.Key;
const loginCookie = getCookieValue(COOKIE_KEY); const loginCookie = getCookieValue(COOKIE_KEY);