From d0fbd6786030f8568646955e84b5329c182ffcc5 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 1 Jun 2016 11:00:09 +0200
Subject: [PATCH] less editorevent use

---
 src/vs/workbench/browser/layout.ts                    |  4 ++--
 src/vs/workbench/browser/parts/editor/editorStatus.ts | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 9aed6958fcc..aec08830fc6 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import {Dimension, Builder, Box} from 'vs/base/browser/builder';
-import {EditorEvent, EventType} from 'vs/workbench/common/events';
+import {EventType} from 'vs/workbench/common/events';
 import {Part} from 'vs/workbench/browser/part';
 import {QuickOpenController} from 'vs/workbench/browser/parts/quickopen/quickOpenController';
 import {Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation} from 'vs/base/browser/ui/sash/sash';
@@ -121,7 +121,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		this.panelHeight = this.storageService.getInteger(WorkbenchLayout.sashYHeightSettingsKey, StorageScope.GLOBAL, 0);
 
 		this.toUnbind.push(themeService.onDidThemeChange(_ => this.relayout()));
-		this.toUnbind.push(eventService.addListener2(EventType.EDITOR_INPUT_CHANGING, (e: EditorEvent) => this.onEditorInputChanging()));
+		this.toUnbind.push(eventService.addListener2(EventType.EDITOR_INPUT_CHANGING, () => this.onEditorInputChanging()));
 
 		this.registerSashListeners();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 04e1aade822..510c6074c22 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -29,7 +29,7 @@ import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser';
 import {TrimTrailingWhitespaceAction} from 'vs/editor/contrib/linesOperations/common/linesOperations';
 import {EndOfLineSequence, ITokenizedModel, EditorType, ITextModel, IDiffEditorModel, IEditor} from 'vs/editor/common/editorCommon';
 import {IndentUsingSpaces, IndentUsingTabs, DetectIndentation, IndentationToSpacesAction, IndentationToTabsAction} from 'vs/editor/contrib/indentation/common/indentation';
-import {EventType, ResourceEvent, EditorEvent} from 'vs/workbench/common/events';
+import {EventType, ResourceEvent} from 'vs/workbench/common/events';
 import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
 import {IEditor as IBaseEditor} from 'vs/platform/editor/common/editor';
 import {IWorkbenchEditorService}  from 'vs/workbench/services/editor/common/editorService';
@@ -292,7 +292,7 @@ export class EditorStatus implements IStatusbarItem {
 					}
 				}
 			},
-			this.eventService.addListener2(EventType.EDITOR_INPUT_CHANGED, (e: EditorEvent) => this.onEditorInputChanged(e.editor)),
+			this.eventService.addListener2(EventType.EDITOR_INPUT_CHANGED, () => this.onEditorInputChanged()),
 			this.eventService.addListener2(EventType.RESOURCE_ENCODING_CHANGED, (e: ResourceEvent) => this.onResourceEncodingChange(e.resource))
 		);
 
@@ -432,7 +432,7 @@ export class EditorStatus implements IStatusbarItem {
 		}
 	}
 
-	private onEditorInputChanged(e: IBaseEditor): void {
+	private onEditorInputChanged(): void {
 		let control: IEditor;
 		const activeEditor = this.editorService.getActiveEditor();
 		if (activeEditor instanceof BaseTextEditor) {
@@ -443,8 +443,8 @@ export class EditorStatus implements IStatusbarItem {
 		this.onSelectionChange(control);
 		this.onModeChange(control);
 		this.onEOLChange(control);
-		this.onEncodingChange(e);
-		this.onTabFocusModeChange(e);
+		this.onEncodingChange(activeEditor);
+		this.onTabFocusModeChange(activeEditor);
 		this.onIndentationChange(control);
 
 		// Dispose old active editor listeners