💄 actions

src/vs/workbench/browser/actions/listCommands.ts

@@ -17,8 +17,6 @@ import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree';
 import { DataTree } from 'vs/base/browser/ui/tree/dataTree';
 import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
 
-// --- List Commands
-
 function ensureDOMFocus(widget: ListWidget): void {
 	// it can happen that one of the commands is executed while
 	// DOM focus is within another focusable control within the

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -50,6 +50,7 @@ import { AllEditorsPicker, ActiveEditorGroupPicker } from 'vs/workbench/browser/
 import { Schemas } from 'vs/base/common/network';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { OpenWorkspaceButtonContribution } from 'vs/workbench/browser/parts/editor/editorWidgets';
+import { ZoomStatusbarItem } from 'vs/workbench/browser/parts/editor/resourceViewer';
 
 // Register String Editor
 Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
@@ -221,6 +222,9 @@ registerEditorContribution(OpenWorkspaceButtonContribution);
 const statusBar = Registry.as<IStatusbarRegistry>(StatusExtensions.Statusbar);
 statusBar.registerStatusbarItem(new StatusbarItemDescriptor(EditorStatus, StatusbarAlignment.RIGHT, 100 /* towards the left of the right hand side */));
 
+// Register Zoom Status
+statusBar.registerStatusbarItem(new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, 101 /* to the left of editor status (100) */));
+
 // Register Status Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ChangeModeAction, ChangeModeAction.ID, ChangeModeAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_M) }), 'Change Language Mode');

src/vs/workbench/browser/parts/editor/resourceViewer.ts

@@ -13,12 +13,10 @@ import { LRUCache } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import { clamp } from 'vs/base/common/numbers';
 import { Themable } from 'vs/workbench/common/theme';
-import { IStatusbarItem, StatusbarItemDescriptor, IStatusbarRegistry, Extensions } from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
+import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IDisposable, Disposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { memoize } from 'vs/base/common/decorators';
@@ -234,7 +232,7 @@ class FileSeemsBinaryFileView {
 
 type Scale = number | 'fit';
 
-class ZoomStatusbarItem extends Themable implements IStatusbarItem {
+export class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 
 	static instance: ZoomStatusbarItem;
 
@@ -314,10 +312,6 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 	}
 }
 
-Registry.as<IStatusbarRegistry>(Extensions.Statusbar).registerStatusbarItem(
-	new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, 101 /* to the left of editor status (100) */)
-);
-
 interface ImageState {
 	scale: Scale;
 	offsetX: number;

src/vs/workbench/browser/parts/editor/sideBySideEditor.ts

@@ -176,17 +176,18 @@ export class SideBySideEditor extends BaseEditor {
 	}
 
 	private setNewInput(newInput: SideBySideEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
-		const detailsEditor = this._createEditor(<EditorInput>newInput.details, this.detailsEditorContainer);
-		const masterEditor = this._createEditor(<EditorInput>newInput.master, this.masterEditorContainer);
+		const detailsEditor = this.doCreateEditor(<EditorInput>newInput.details, this.detailsEditorContainer);
+		const masterEditor = this.doCreateEditor(<EditorInput>newInput.master, this.masterEditorContainer);
 
 		return this.onEditorsCreated(detailsEditor, masterEditor, newInput.details, newInput.master, options, token);
 	}
 
-	private _createEditor(editorInput: EditorInput, container: HTMLElement): BaseEditor {
+	private doCreateEditor(editorInput: EditorInput, container: HTMLElement): BaseEditor {
 		const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(editorInput);
 		if (!descriptor) {
 			throw new Error('No descriptor for editor found');
 		}
+
 		const editor = descriptor.instantiate(this.instantiationService);
 		editor.create(container);
 		editor.setVisible(this.isVisible(), this.group);

src/vs/workbench/browser/parts/views/panelViewlet.ts

@@ -259,7 +259,7 @@ export class PanelViewlet extends Viewlet {
 		let title = Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlet(this.getId()).name;
 
 		if (this.isSingleView()) {
-			title += ': ' + this.panelItems[0].panel.title;
+			title = `${title}: ${this.panelItems[0].panel.title}`;
 		}
 
 		return title;

src/vs/workbench/common/contributions.ts

@@ -8,8 +8,6 @@ import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/
 import { Registry } from 'vs/platform/registry/common/platform';
 import { runWhenIdle, IdleDeadline } from 'vs/base/common/async';
 
-// --- Workbench Contribution Registry
-
 /**
  * A workbench contribution that will be loaded when the workbench starts and disposed when the workbench shuts down.
  */

src/vs/workbench/electron-browser/actions/developerActions.ts

@@ -16,8 +16,6 @@ import { Context } from 'vs/platform/contextkey/browser/contextKeyService';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { timeout } from 'vs/base/common/async';
 
-// --- actions
-
 export class ToggleDevToolsAction extends Action {
 
 	static readonly ID = 'workbench.action.toggleDevTools';

src/vs/workbench/electron-browser/actions/helpActions.ts

@@ -242,4 +242,3 @@ export class OpenPrivacyStatementUrlAction extends Action {
 		return Promise.resolve();
 	}
 }
-

src/vs/workbench/electron-browser/actions/windowActions.ts

@@ -26,8 +26,6 @@ import { IQuickInputService, IQuickPickItem, IQuickInputButton, IQuickPickSepara
 import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import product from 'vs/platform/node/product';
 
-// --- actions
-
 export class CloseCurrentWindowAction extends Action {
 
 	static readonly ID = 'workbench.action.closeWindow';
@@ -576,4 +574,4 @@ export class ToggleWindowTabsBar extends Action {
 	run(): Promise<boolean> {
 		return this.windowsService.toggleWindowTabsBar().then(() => true);
 	}
-}
\ No newline at end of file
+}

src/vs/workbench/services/extensions/electron-browser/extensionHostProcessManager.ts

@@ -353,7 +353,7 @@ function getLatencyTestProviders(): ExtHostLatencyProvider[] {
 
 export class MeasureExtHostLatencyAction extends Action {
 	public static readonly ID = 'editor.action.measureExtHostLatency';
-	public static readonly LABEL = nls.localize('measureExtHostLatency', "Developer: Measure Extension Host Latency");
+	public static readonly LABEL = nls.localize('measureExtHostLatency', "Measure Extension Host Latency");
 
 	constructor(
 		id: string,
@@ -384,4 +384,4 @@ export class MeasureExtHostLatencyAction extends Action {
 }
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-registry.registerWorkbenchAction(new SyncActionDescriptor(MeasureExtHostLatencyAction, MeasureExtHostLatencyAction.ID, MeasureExtHostLatencyAction.LABEL), 'Developer: Measure Extension Host Latency');
+registry.registerWorkbenchAction(new SyncActionDescriptor(MeasureExtHostLatencyAction, MeasureExtHostLatencyAction.ID, MeasureExtHostLatencyAction.LABEL), 'Developer: Measure Extension Host Latency', nls.localize('developer', "Developer"));