development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 10:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #81653

Browse source
This commit is contained in:
Benjamin Pasero 2019-10-02 15:45:03 +02:00
parent 75e6fa0797
commit fb10f85b4c
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/platform/electron/electron-main/electronMainService.ts
View file

@ -283,10 +283,10 @@ export class ElectronMainService implements AddFirstParameterToFunctions<IElectr
return this.lifecycleMainService.relaunch(options);
}
async reload(windowId: number): Promise<void> {
async reload(windowId: number, options?: { disableExtensions?: boolean }): Promise<void> {
const window = this.windowsMainService.getWindowById(windowId);
if (window) {
return this.windowsMainService.reload(window);
return this.windowsMainService.reload(window, options && options.disableExtensions ? { _: [], 'disable-extensions': true } : undefined);
}
}

2
src/vs/platform/electron/node/electron.ts
View file

@ -75,7 +75,7 @@ export interface IElectronService {
// Lifecycle
relaunch(options?: { addArgs?: string[], removeArgs?: string[] }): Promise<void>;
reload(): Promise<void>;
reload(options?: { disableExtensions?: boolean }): Promise<void>;
closeWorkspace(): Promise<void>;
closeWindow(): Promise<void>;
quit(): Promise<void>;

8
src/vs/workbench/electron-browser/actions/windowActions.ts
View file

@ -137,10 +137,10 @@ export class ZoomResetAction extends BaseZoomAction {
}
}
export class RestartWithExtensionsDisabledAction extends Action {
export class ReloadWindowWithExtensionsDisabledAction extends Action {
static readonly ID = 'workbench.action.restartWithExtensionsDisabled';
static LABEL = nls.localize('restartWithExtensionsDisabled', "Restart With Extensions Disabled");
static readonly ID = 'workbench.action.reloadWindowWithExtensionsDisabled';
static LABEL = nls.localize('reloadWindowWithExtensionsDisabled', "Reload With Extensions Disabled");
constructor(
id: string,
@ -151,7 +151,7 @@ export class RestartWithExtensionsDisabledAction extends Action {
}
async run(): Promise<boolean> {
await this.electronService.relaunch({ addArgs: ['--disable-extensions'] });
await this.electronService.reload({ disableExtensions: true });
return true;
}

4
src/vs/workbench/electron-browser/desktop.contribution.ts
View file

@ -12,7 +12,7 @@ import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/action
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
import { ToggleSharedProcessAction, ToggleDevToolsAction } from 'vs/workbench/electron-browser/actions/developerActions';
import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseCurrentWindowAction, SwitchWindow, QuickSwitchWindow, RestartWithExtensionsDisabledAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-browser/actions/windowActions';
import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseCurrentWindowAction, SwitchWindow, QuickSwitchWindow, ReloadWindowWithExtensionsDisabledAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-browser/actions/windowActions';
import { SaveWorkspaceAsAction, DuplicateWorkspaceInNewWindowAction } from 'vs/workbench/electron-browser/actions/workspaceActions';
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@ -98,7 +98,7 @@ import { IElectronService } from 'vs/platform/electron/node/electron';
(function registerDeveloperActions(): void {
const developerCategory = nls.localize('developer', "Developer");
registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSharedProcessAction, ToggleSharedProcessAction.ID, ToggleSharedProcessAction.LABEL), 'Developer: Toggle Shared Process', developerCategory);
registry.registerWorkbenchAction(new SyncActionDescriptor(RestartWithExtensionsDisabledAction, RestartWithExtensionsDisabledAction.ID, RestartWithExtensionsDisabledAction.LABEL), 'Developer: Restart With Extensions Disabled', developerCategory);
registry.registerWorkbenchAction(new SyncActionDescriptor(ReloadWindowWithExtensionsDisabledAction, ReloadWindowWithExtensionsDisabledAction.ID, ReloadWindowWithExtensionsDisabledAction.LABEL), 'Developer: Reload With Extensions Disabled', developerCategory);
registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleDevToolsAction, ToggleDevToolsAction.ID, ToggleDevToolsAction.LABEL), 'Developer: Toggle Developer Tools', developerCategory);
KeybindingsRegistry.registerKeybindingRule({