Consistent naming for view events

src/vs/editor/browser/controller/keyboardHandler.ts

@@ -75,7 +75,7 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 			let lineNumber = e.showAtLineNumber;
 			let column = e.showAtColumn;
 
-			this._context.privateViewEventBus.emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeEvent(
+			this._context.privateViewEventBus.emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeRequestEvent(
 				new Range(lineNumber, column, lineNumber, column),
 				editorCommon.VerticalRevealType.Simple,
 				true,
@@ -184,7 +184,7 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 		return false;
 	}
 
-	public onViewFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
+	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this.textAreaHandler.setHasFocus(e.isFocused);
 		return false;
 	}

src/vs/editor/browser/controller/mouseHandler.ts

@@ -214,7 +214,7 @@ export class MouseHandler extends ViewEventHandler implements IDisposable {
 		return false;
 	}
 	private _isFocused = false;
-	public onViewFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
+	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this._isFocused = e.isFocused;
 		return false;
 	}

src/vs/editor/browser/view/viewImpl.ts

@@ -454,16 +454,16 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
-		this.layoutProvider.onModelFlushed(this._context.model.getLineCount());
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
+		this.layoutProvider.onFlushed(this._context.model.getLineCount());
 		return false;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
-		this.layoutProvider.onModelLinesDeleted(e);
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+		this.layoutProvider.onLinesDeleted(e);
 		return false;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
-		this.layoutProvider.onModelLinesInserted(e);
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+		this.layoutProvider.onLinesInserted(e);
 		return false;
 	}
 	private _setLayout(): void {
@@ -506,7 +506,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 		this.outgoingEvents.emitScrollChanged(e);
 		return false;
 	}
-	public onViewFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
+	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		dom.toggleClass(this.domNode, 'focused', e.isFocused);
 		if (e.isFocused) {
 			this.outgoingEvents.emitViewFocusGained();
@@ -516,11 +516,11 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 		return false;
 	}
 
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return e.revealCursor ? this.revealCursor() : false;
 	}
 
-	public onCursorScrollRequest(e: editorCommon.ICursorScrollRequestEvent): boolean {
+	public onScrollRequest(e: editorCommon.ICursorScrollRequestEvent): boolean {
 		return e.revealCursor ? this.revealCursor() : false;
 	}
 

src/vs/editor/browser/view/viewLayer.ts

@@ -99,7 +99,7 @@ export class RenderedLinesCollection<T extends ILine> {
 	/**
 	 * @returns Lines that were removed from this collection
 	 */
-	public onModelLinesDeleted(deleteFromLineNumber: number, deleteToLineNumber: number): T[] {
+	public onLinesDeleted(deleteFromLineNumber: number, deleteToLineNumber: number): T[] {
 		if (this.getCount() === 0) {
 			// no lines
 			return null;
@@ -157,7 +157,7 @@ export class RenderedLinesCollection<T extends ILine> {
 		return deleted;
 	}
 
-	public onModelLineChanged(changedLineNumber: number): boolean {
+	public onLineChanged(changedLineNumber: number): boolean {
 		if (this.getCount() === 0) {
 			// no lines
 			return false;
@@ -176,7 +176,7 @@ export class RenderedLinesCollection<T extends ILine> {
 		return true;
 	}
 
-	public onModelLinesInserted(insertFromLineNumber: number, insertToLineNumber: number): T[] {
+	public onLinesInserted(insertFromLineNumber: number, insertToLineNumber: number): T[] {
 		if (this.getCount() === 0) {
 			// no lines
 			return null;
@@ -218,7 +218,7 @@ export class RenderedLinesCollection<T extends ILine> {
 		return deletedLines;
 	}
 
-	public onModelTokensChanged(ranges: { fromLineNumber: number; toLineNumber: number; }[]): boolean {
+	public onTokensChanged(ranges: { fromLineNumber: number; toLineNumber: number; }[]): boolean {
 		if (this.getCount() === 0) {
 			// no lines
 			return false;
@@ -292,15 +292,15 @@ export abstract class ViewLayer<T extends IVisibleLine> extends ViewPart {
 		return true;
 	}
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		this._linesCollection = new RenderedLinesCollection<T>(() => this._createLine());
 		this._scrollDomNode = null;
 		// No need to clear the dom node because a full .innerHTML will occur in ViewLayerRenderer._render
 		return true;
 	}
 
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
-		let deleted = this._linesCollection.onModelLinesDeleted(e.fromLineNumber, e.toLineNumber);
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+		let deleted = this._linesCollection.onLinesDeleted(e.fromLineNumber, e.toLineNumber);
 		if (deleted) {
 			// Remove from DOM
 			for (let i = 0, len = deleted.length; i < len; i++) {
@@ -314,12 +314,12 @@ export abstract class ViewLayer<T extends IVisibleLine> extends ViewPart {
 		return true;
 	}
 
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
-		return this._linesCollection.onModelLineChanged(e.lineNumber);
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+		return this._linesCollection.onLineChanged(e.lineNumber);
 	}
 
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
-		let deleted = this._linesCollection.onModelLinesInserted(e.fromLineNumber, e.toLineNumber);
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+		let deleted = this._linesCollection.onLinesInserted(e.fromLineNumber, e.toLineNumber);
 		if (deleted) {
 			// Remove from DOM
 			for (let i = 0, len = deleted.length; i < len; i++) {
@@ -333,8 +333,8 @@ export abstract class ViewLayer<T extends IVisibleLine> extends ViewPart {
 		return true;
 	}
 
-	public onModelTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
-		return this._linesCollection.onModelTokensChanged(e.ranges);
+	public onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
+		return this._linesCollection.onTokensChanged(e.ranges);
 	}
 
 

src/vs/editor/browser/view/viewOverlays.ts

@@ -75,7 +75,7 @@ export class ViewOverlays extends ViewLayer<ViewOverlayLine> {
 		return true;
 	}
 
-	public onViewFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
+	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this._isFocused = e.isFocused;
 		return true;
 	}

src/vs/editor/browser/viewLayout/layoutProvider.ts

@@ -55,18 +55,18 @@ export class LayoutProvider extends Disposable implements IViewLayout {
 
 	// ---- begin view event handlers
 
-	public onModelFlushed(lineCount: number): void {
-		this._linesLayout.onModelFlushed(lineCount);
+	public onFlushed(lineCount: number): void {
+		this._linesLayout.onFlushed(lineCount);
 		this._updateHeight();
 	}
 
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): void {
-		this._linesLayout.onModelLinesDeleted(e.fromLineNumber, e.toLineNumber);
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): void {
+		this._linesLayout.onLinesDeleted(e.fromLineNumber, e.toLineNumber);
 		this._updateHeight();
 	}
 
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): void {
-		this._linesLayout.onModelLinesInserted(e.fromLineNumber, e.toLineNumber);
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): void {
+		this._linesLayout.onLinesInserted(e.fromLineNumber, e.toLineNumber);
 		this._updateHeight();
 	}
 

src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts

@@ -85,20 +85,20 @@ export class ViewContentWidgets extends ViewPart {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		// true for inline decorations that can end up relayouting text
 		return true;//e.inlineDecorationsChanged;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -107,7 +107,7 @@ export class ViewContentWidgets extends ViewPart {
 	public onCursorSelectionChanged(e: viewEvents.ViewCursorSelectionChangedEvent): boolean {
 		return false;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts

@@ -45,16 +45,16 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		this._primaryCursorIsInEditableRange = true;
 		this._selectionIsEmpty = true;
 		this._primaryCursorLineNumber = 1;
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {

src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts

@@ -39,15 +39,15 @@ export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		this._primaryCursorIsInEditableRange = true;
 		this._primaryCursorLineNumber = 1;
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {

src/vs/editor/browser/viewParts/decorations/decorations.ts

@@ -36,19 +36,19 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -57,7 +57,7 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 	public onCursorSelectionChanged(e: viewEvents.ViewCursorSelectionChangedEvent): boolean {
 		return false;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts

@@ -102,19 +102,19 @@ export class GlyphMarginOverlay extends DedupOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -123,7 +123,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
 	public onCursorSelectionChanged(e: viewEvents.ViewCursorSelectionChangedEvent): boolean {
 		return false;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts

@@ -37,16 +37,16 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 	}
 
 	// --- begin event handlers
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts

@@ -43,19 +43,19 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		return false;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -67,7 +67,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 	public onCursorSelectionChanged(e: viewEvents.ViewCursorSelectionChangedEvent): boolean {
 		return false;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/lines/viewLine.ts

@@ -131,7 +131,7 @@ export class ViewLine implements IVisibleLine {
 	public onTokensChanged(): void {
 		this._isMaybeInvalid = true;
 	}
-	public onModelDecorationsChanged(): void {
+	public onDecorationsChanged(): void {
 		this._isMaybeInvalid = true;
 	}
 	public onOptionsChanged(newOptions: ViewLineOptions): void {

src/vs/editor/browser/viewParts/lines/viewLines.ts

@@ -73,7 +73,7 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 	private _maxLineWidth: number;
 	private _asyncUpdateLineWidths: RunOnceScheduler;
 
-	private _lastCursorRevealRangeHorizontallyEvent: viewEvents.ViewRevealRangeEvent;
+	private _lastCursorRevealRangeHorizontallyEvent: viewEvents.ViewRevealRangeRequestEvent;
 	private _lastRenderedData: LastRenderedData;
 
 	constructor(context: ViewContext, viewLayout: IViewLayout) {
@@ -155,25 +155,25 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		return true;
 	}
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
-		let shouldRender = super.onModelFlushed(e);
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
+		let shouldRender = super.onFlushed(e);
 		this._maxLineWidth = 0;
 		return shouldRender;
 	}
 
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
-		let shouldRender = super.onModelDecorationsChanged(e);
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+		let shouldRender = super.onDecorationsChanged(e);
 		if (true/*e.inlineDecorationsChanged*/) {
 			let rendStartLineNumber = this._linesCollection.getStartLineNumber();
 			let rendEndLineNumber = this._linesCollection.getEndLineNumber();
 			for (let lineNumber = rendStartLineNumber; lineNumber <= rendEndLineNumber; lineNumber++) {
-				this._linesCollection.getLine(lineNumber).onModelDecorationsChanged();
+				this._linesCollection.getLine(lineNumber).onDecorationsChanged();
 			}
 		}
 		return shouldRender || true;
 	}
 
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		let newScrollTop = this._computeScrollTopToRevealRange(this._viewLayout.getCurrentViewport(), e.range, e.verticalType);
 
 		if (e.revealHorizontal) {
@@ -187,7 +187,7 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		return true;
 	}
 
-	public onCursorScrollRequest(e: viewEvents.ViewScrollRequestEvent): boolean {
+	public onScrollRequest(e: viewEvents.ViewScrollRequestEvent): boolean {
 		let currentScrollTop = this._viewLayout.getScrollTop();
 		let newScrollTop = currentScrollTop + e.deltaLines * this._lineHeight;
 		this._viewLayout.setScrollPosition({

src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts

@@ -36,19 +36,19 @@ export class LinesDecorationsOverlay extends DedupOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -57,7 +57,7 @@ export class LinesDecorationsOverlay extends DedupOverlay {
 	public onCursorSelectionChanged(e: viewEvents.ViewCursorSelectionChangedEvent): boolean {
 		return false;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts

@@ -30,19 +30,19 @@ export class MarginViewLineDecorationsOverlay extends DedupOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -51,7 +51,7 @@ export class MarginViewLineDecorationsOverlay extends DedupOverlay {
 	public onCursorSelectionChanged(e: viewEvents.ViewCursorSelectionChangedEvent): boolean {
 		return false;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/minimap/minimap.ts

@@ -296,17 +296,17 @@ class RenderData {
 		};
 	}
 
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): void {
-		this._renderedLines.onModelLinesDeleted(e.fromLineNumber, e.toLineNumber);
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): void {
+		this._renderedLines.onLinesDeleted(e.fromLineNumber, e.toLineNumber);
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
-		return this._renderedLines.onModelLineChanged(e.lineNumber);
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+		return this._renderedLines.onLineChanged(e.lineNumber);
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): void {
-		this._renderedLines.onModelLinesInserted(e.fromLineNumber, e.toLineNumber);
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): void {
+		this._renderedLines.onLinesInserted(e.fromLineNumber, e.toLineNumber);
 	}
-	public onModelTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
-		return this._renderedLines.onModelTokensChanged(e.ranges);
+	public onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
+		return this._renderedLines.onTokensChanged(e.ranges);
 	}
 }
 
@@ -428,7 +428,7 @@ export class Minimap extends ViewPart {
 			let lineNumber = lineIndex + this._lastRenderData.renderedLayout.startLineNumber;
 			lineNumber = Math.min(lineNumber, this._context.model.getLineCount());
 
-			this._context.privateViewEventBus.emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeEvent(
+			this._context.privateViewEventBus.emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeRequestEvent(
 				new Range(lineNumber, 1, lineNumber, 1),
 				editorCommon.VerticalRevealType.Center,
 				false,
@@ -483,31 +483,31 @@ export class Minimap extends ViewPart {
 		return true;
 	}
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		this._lastRenderData = null;
 		return true;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		if (this._lastRenderData) {
-			this._lastRenderData.onModelLinesDeleted(e);
+			this._lastRenderData.onLinesDeleted(e);
 		}
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		if (this._lastRenderData) {
-			return this._lastRenderData.onModelLineChanged(e);
+			return this._lastRenderData.onLineChanged(e);
 		}
 		return false;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		if (this._lastRenderData) {
-			this._lastRenderData.onModelLinesInserted(e);
+			this._lastRenderData.onLinesInserted(e);
 		}
 		return true;
 	}
-	public onModelTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
+	public onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
 		if (this._lastRenderData) {
-			return this._lastRenderData.onModelTokensChanged(e);
+			return this._lastRenderData.onTokensChanged(e);
 		}
 		return false;
 	}

src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts

@@ -140,13 +140,13 @@ export class DecorationsOverviewRuler extends ViewPart {
 		return true;
 	}
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		this._shouldUpdateCursorPosition = true;
 		this._shouldUpdateDecorations = true;
 		return true;
 	}
 
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		this._shouldUpdateDecorations = true;
 		return true;
 	}

src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts

@@ -48,7 +48,7 @@ export class OverviewRuler extends ViewEventHandler implements IOverviewRuler {
 		return true;
 	}
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
 

src/vs/editor/browser/viewParts/selections/selections.ts

@@ -98,20 +98,20 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		// true for inline decorations that can end up relayouting text
 		return true;//e.inlineDecorationsChanged;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -122,7 +122,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 		this._selections = this._selections.concat(e.secondarySelections);
 		return true;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {

src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts

@@ -111,7 +111,7 @@ export class ViewCursor {
 		}
 	}
 
-	public onModelFlushed(): boolean {
+	public onFlushed(): boolean {
 		this.updatePosition(new Position(1, 1));
 		this._isInEditableRange = true;
 		return true;

src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts

@@ -74,8 +74,8 @@ export class ViewCursors extends ViewPart {
 
 	// --- begin event handlers
 
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
-		this._primaryCursor.onModelFlushed();
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
+		this._primaryCursor.onFlushed();
 		for (let i = 0, len = this._secondaryCursors.length; i < len; i++) {
 			let domNode = this._secondaryCursors[i].getDomNode();
 			domNode.parentNode.removeChild(domNode);
@@ -83,20 +83,20 @@ export class ViewCursors extends ViewPart {
 		this._secondaryCursors = [];
 		return true;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		// true for inline decorations that can end up relayouting text
 		return true;//e.inlineDecorationsChanged;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return true;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
-	public onModelTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
+	public onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
 		let shouldRender = (position: Position) => {
 			for (let i = 0, len = e.ranges.length; i < len; i++) {
 				if (e.ranges[i].fromLineNumber <= position.lineNumber && position.lineNumber <= e.ranges[i].toLineNumber) {
@@ -178,7 +178,7 @@ export class ViewCursors extends ViewPart {
 	public onZonesChanged(e: viewEvents.ViewZonesChangedEvent): boolean {
 		return true;
 	}
-	public onViewFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
+	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this._editorHasFocus = e.isFocused;
 		this._updateBlinking();
 		return false;

src/vs/editor/browser/viewParts/viewZones/viewZones.ts

@@ -104,7 +104,7 @@ export class ViewZones extends ViewPart {
 		return true;
 	}
 
-	public onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvents): boolean {
+	public onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvent): boolean {
 		return this._recomputeWhitespacesProps();
 	}
 
@@ -116,11 +116,11 @@ export class ViewZones extends ViewPart {
 		return true;
 	}
 
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return true;
 	}
 
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return true;
 	}
 

src/vs/editor/common/view/viewEvents.ts

@@ -29,21 +29,21 @@ export const ViewEventNames = {
 };
 
 export const enum ViewEventType {
-	ModelFlushedEvent = 1,
-	LinesDeletedEvent = 2,
-	LinesInsertedEvent = 3,
-	LineChangedEvent = 4,
-	TokensChangedEvent = 5,
-	DecorationsChangedEvent = 6,
-	CursorPositionChangedEvent = 7,
-	CursorSelectionChangedEvent = 8,
-	RevealRangeEvent = 9,
-	LineMappingChangedEvent = 10,
-	ScrollRequestEvent = 11,
+	ViewConfigurationChanged = 1,
+	ViewCursorPositionChanged = 2,
+	ViewCursorSelectionChanged = 3,
+	ViewDecorationsChanged = 4,
+	ViewFlushed = 5,
+	ViewFocusChanged = 6,
+	ViewLineChanged = 7,
+	ViewLineMappingChanged = 8,
+	ViewLinesDeleted = 9,
+	ViewLinesInserted = 10,
+	ViewRevealRangeRequest = 11,
 	ViewScrollChanged = 12,
-	ViewFocusChanged = 13,
-	ZonesChanged = 14,
-	ConfigurationChanged = 15
+	ViewScrollRequest = 13,
+	ViewTokensChanged = 14,
+	ViewZonesChanged = 15,
 }
 
 export interface IViewEvent {
@@ -53,7 +53,7 @@ export interface IViewEvent {
 export class ViewDecorationsChangedEvent implements IViewEvent {
 	_viewDecorationsChangedEventBrand: void;
 
-	public readonly type = ViewEventType.DecorationsChangedEvent;
+	public readonly type = ViewEventType.ViewDecorationsChanged;
 
 	constructor() {
 		// Nothing to do
@@ -63,7 +63,7 @@ export class ViewDecorationsChangedEvent implements IViewEvent {
 export class ViewLinesDeletedEvent implements IViewEvent {
 	_viewLinesDeletedEventBrand: void;
 
-	public readonly type = ViewEventType.LinesDeletedEvent;
+	public readonly type = ViewEventType.ViewLinesDeleted;
 
 	/**
 	 * At what line the deletion began (inclusive).
@@ -83,7 +83,7 @@ export class ViewLinesDeletedEvent implements IViewEvent {
 export class ViewLineChangedEvent implements IViewEvent {
 	_viewLineChangedEventBrand: void;
 
-	public readonly type = ViewEventType.LineChangedEvent;
+	public readonly type = ViewEventType.ViewLineChanged;
 
 	/**
 	 * The line that has changed.
@@ -98,7 +98,7 @@ export class ViewLineChangedEvent implements IViewEvent {
 export class ViewLinesInsertedEvent implements IViewEvent {
 	_viewLinesInsertedEventBrand: void;
 
-	public readonly type = ViewEventType.LinesInsertedEvent;
+	public readonly type = ViewEventType.ViewLinesInserted;
 
 	/**
 	 * Before what line did the insertion begin
@@ -118,7 +118,7 @@ export class ViewLinesInsertedEvent implements IViewEvent {
 export class ViewTokensChangedEvent implements IViewEvent {
 	_viewTokensChangedEventBrand: void;
 
-	public readonly type = ViewEventType.TokensChangedEvent;
+	public readonly type = ViewEventType.ViewTokensChanged;
 
 	public readonly ranges: {
 		/**
@@ -139,7 +139,7 @@ export class ViewTokensChangedEvent implements IViewEvent {
 export class ViewCursorPositionChangedEvent implements IViewEvent {
 	_viewCursorPositionChangedEventBrand: void;
 
-	public readonly type = ViewEventType.CursorPositionChangedEvent;
+	public readonly type = ViewEventType.ViewCursorPositionChanged;
 
 	/**
 	 * Primary cursor's position.
@@ -164,7 +164,7 @@ export class ViewCursorPositionChangedEvent implements IViewEvent {
 export class ViewCursorSelectionChangedEvent implements IViewEvent {
 	_viewCursorSelectionChangedEventBrand: void;
 
-	public readonly type = ViewEventType.CursorSelectionChangedEvent;
+	public readonly type = ViewEventType.ViewCursorSelectionChanged;
 
 	/**
 	 * The primary selection.
@@ -181,10 +181,10 @@ export class ViewCursorSelectionChangedEvent implements IViewEvent {
 	}
 }
 
-export class ViewRevealRangeEvent implements IViewEvent {
-	_viewRevealRangeEventBrand: void;
+export class ViewRevealRangeRequestEvent implements IViewEvent {
+	_viewRevealRangeRequestEventBrand: void;
 
-	public readonly type = ViewEventType.RevealRangeEvent;
+	public readonly type = ViewEventType.ViewRevealRangeRequest;
 
 	/**
 	 * Range to be reavealed.
@@ -213,7 +213,7 @@ export class ViewRevealRangeEvent implements IViewEvent {
 export class ViewScrollRequestEvent implements IViewEvent {
 	_viewScrollRequestEventBrand: void;
 
-	public readonly type = ViewEventType.ScrollRequestEvent;
+	public readonly type = ViewEventType.ViewScrollRequest;
 
 	public readonly deltaLines: number;
 	public readonly revealCursor: boolean;
@@ -224,20 +224,20 @@ export class ViewScrollRequestEvent implements IViewEvent {
 	}
 }
 
-export class ViewLineMappingChangedEvents implements IViewEvent {
+export class ViewLineMappingChangedEvent implements IViewEvent {
 	_viewLineMappingChangedEventBrand: void;
 
-	public readonly type = ViewEventType.LineMappingChangedEvent;
+	public readonly type = ViewEventType.ViewLineMappingChanged;
 
 	constructor() {
 		// Nothing to do
 	}
 }
 
-export class ViewModelFlushedEvent implements IViewEvent {
-	_viewModelFlushedEventBrand: void;
+export class ViewFlushedEvent implements IViewEvent {
+	_viewFlushedEventBrand: void;
 
-	public readonly type = ViewEventType.ModelFlushedEvent;
+	public readonly type = ViewEventType.ViewFlushed;
 
 	constructor() {
 		// Nothing to do
@@ -247,7 +247,7 @@ export class ViewModelFlushedEvent implements IViewEvent {
 export class ViewConfigurationChangedEvent implements IViewEvent {
 	_viewConfigurationChangedEventBrand: void;
 
-	public readonly type = ViewEventType.ConfigurationChanged;
+	public readonly type = ViewEventType.ViewConfigurationChanged;
 
 	public readonly lineHeight: boolean;
 	public readonly readOnly: boolean;
@@ -297,7 +297,7 @@ export class ViewScrollChangedEvent implements IViewEvent {
 export class ViewZonesChangedEvent implements IViewEvent {
 	_viewZonesChangedEventBrand: void;
 
-	public readonly type = ViewEventType.ZonesChanged;
+	public readonly type = ViewEventType.ViewZonesChanged;
 
 	constructor() {
 		// Nothing to do

src/vs/editor/common/viewLayout/linesLayout.ts

@@ -51,7 +51,7 @@ export class LinesLayout {
 	 *
 	 * @param lineCount New number of lines.
 	 */
-	public onModelFlushed(lineCount: number): void {
+	public onFlushed(lineCount: number): void {
 		this._lineCount = lineCount;
 	}
 
@@ -91,9 +91,9 @@ export class LinesLayout {
 	 * @param fromLineNumber The line number at which the deletion started, inclusive
 	 * @param toLineNumber The line number at which the deletion ended, inclusive
 	 */
-	public onModelLinesDeleted(fromLineNumber: number, toLineNumber: number): void {
+	public onLinesDeleted(fromLineNumber: number, toLineNumber: number): void {
 		this._lineCount -= (toLineNumber - fromLineNumber + 1);
-		this._whitespaces.onModelLinesDeleted(fromLineNumber, toLineNumber);
+		this._whitespaces.onLinesDeleted(fromLineNumber, toLineNumber);
 	}
 
 	/**
@@ -102,9 +102,9 @@ export class LinesLayout {
 	 * @param fromLineNumber The line number at which the insertion started, inclusive
 	 * @param toLineNumber The line number at which the insertion ended, inclusive.
 	 */
-	public onModelLinesInserted(fromLineNumber: number, toLineNumber: number): void {
+	public onLinesInserted(fromLineNumber: number, toLineNumber: number): void {
 		this._lineCount += (toLineNumber - fromLineNumber + 1);
-		this._whitespaces.onModelLinesInserted(fromLineNumber, toLineNumber);
+		this._whitespaces.onLinesInserted(fromLineNumber, toLineNumber);
 	}
 
 	/**

src/vs/editor/common/viewLayout/whitespaceComputer.ts

@@ -259,7 +259,7 @@ export class WhitespaceComputer {
 	 * @param fromLineNumber The line number at which the deletion started, inclusive
 	 * @param toLineNumber The line number at which the deletion ended, inclusive
 	 */
-	public onModelLinesDeleted(fromLineNumber: number, toLineNumber: number): void {
+	public onLinesDeleted(fromLineNumber: number, toLineNumber: number): void {
 		fromLineNumber = fromLineNumber | 0;
 		toLineNumber = toLineNumber | 0;
 
@@ -285,7 +285,7 @@ export class WhitespaceComputer {
 	 * @param fromLineNumber The line number at which the insertion started, inclusive
 	 * @param toLineNumber The line number at which the insertion ended, inclusive.
 	 */
-	public onModelLinesInserted(fromLineNumber: number, toLineNumber: number): void {
+	public onLinesInserted(fromLineNumber: number, toLineNumber: number): void {
 		fromLineNumber = fromLineNumber | 0;
 		toLineNumber = toLineNumber | 0;
 

src/vs/editor/common/viewModel/splitLinesCollection.ts

@@ -508,7 +508,7 @@ export class SplitLinesCollection {
 			}
 		}
 
-		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewModelFlushedEvent());
+		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewFlushedEvent());
 		return true;
 	}
 
@@ -527,7 +527,7 @@ export class SplitLinesCollection {
 		this.tabSize = newTabSize;
 
 		this._constructLines(false);
-		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewModelFlushedEvent());
+		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewFlushedEvent());
 
 		return true;
 	}
@@ -539,7 +539,7 @@ export class SplitLinesCollection {
 		this.wrappingIndent = newWrappingIndent;
 
 		this._constructLines(false);
-		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewModelFlushedEvent());
+		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewFlushedEvent());
 
 		return true;
 	}
@@ -551,14 +551,14 @@ export class SplitLinesCollection {
 		this.wrappingColumn = newWrappingColumn;
 		this.columnsForFullWidthChar = columnsForFullWidthChar;
 		this._constructLines(false);
-		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewModelFlushedEvent());
+		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewFlushedEvent());
 
 		return true;
 	}
 
 	public onModelFlushed(versionId: number, emit: (evenType: string, payload: any) => void): void {
 		this._constructLines(true);
-		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewModelFlushedEvent());
+		emit(viewEvents.ViewEventNames.ModelFlushedEvent, new viewEvents.ViewFlushedEvent());
 	}
 
 	public onModelLinesDeleted(versionId: number, fromLineNumber: number, toLineNumber: number, emit: (evenType: string, payload: any) => void): void {

src/vs/editor/common/viewModel/viewEventHandler.ts

@@ -33,25 +33,25 @@ export class ViewEventHandler {
 
 	// --- begin event handlers
 
-	public onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvents): boolean {
+	public onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvent): boolean {
 		return false;
 	}
-	public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean {
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
 		return false;
 	}
-	public onModelDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
+	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		return false;
 	}
-	public onModelLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
 		return false;
 	}
-	public onModelLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
+	public onLineChanged(e: viewEvents.ViewLineChangedEvent): boolean {
 		return false;
 	}
-	public onModelLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
 		return false;
 	}
-	public onModelTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
+	public onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
 		return false;
 	}
 	public onCursorPositionChanged(e: viewEvents.ViewCursorPositionChangedEvent): boolean {
@@ -60,10 +60,10 @@ export class ViewEventHandler {
 	public onCursorSelectionChanged(e: viewEvents.ViewCursorSelectionChangedEvent): boolean {
 		return false;
 	}
-	public onCursorRevealRange(e: viewEvents.ViewRevealRangeEvent): boolean {
+	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		return false;
 	}
-	public onCursorScrollRequest(e: viewEvents.ViewScrollRequestEvent): boolean {
+	public onScrollRequest(e: viewEvents.ViewScrollRequestEvent): boolean {
 		return false;
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
@@ -75,7 +75,7 @@ export class ViewEventHandler {
 	public onZonesChanged(e: viewEvents.ViewZonesChangedEvent): boolean {
 		return false;
 	}
-	public onViewFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
+	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		return false;
 	}
 
@@ -92,43 +92,43 @@ export class ViewEventHandler {
 			switch (e.getType()) {
 
 				case viewEvents.ViewEventNames.LineMappingChangedEvent:
-					if (this.onLineMappingChanged(<viewEvents.ViewLineMappingChangedEvents>data)) {
+					if (this.onLineMappingChanged(<viewEvents.ViewLineMappingChangedEvent>data)) {
 						shouldRender = true;
 					}
 					break;
 
 				case viewEvents.ViewEventNames.ModelFlushedEvent:
-					if (this.onModelFlushed(<viewEvents.ViewModelFlushedEvent>data)) {
+					if (this.onFlushed(<viewEvents.ViewFlushedEvent>data)) {
 						shouldRender = true;
 					}
 					break;
 
 				case viewEvents.ViewEventNames.LinesDeletedEvent:
-					if (this.onModelLinesDeleted(<viewEvents.ViewLinesDeletedEvent>data)) {
+					if (this.onLinesDeleted(<viewEvents.ViewLinesDeletedEvent>data)) {
 						shouldRender = true;
 					}
 					break;
 
 				case viewEvents.ViewEventNames.LinesInsertedEvent:
-					if (this.onModelLinesInserted(<viewEvents.ViewLinesInsertedEvent>data)) {
+					if (this.onLinesInserted(<viewEvents.ViewLinesInsertedEvent>data)) {
 						shouldRender = true;
 					}
 					break;
 
 				case viewEvents.ViewEventNames.LineChangedEvent:
-					if (this.onModelLineChanged(<viewEvents.ViewLineChangedEvent>data)) {
+					if (this.onLineChanged(<viewEvents.ViewLineChangedEvent>data)) {
 						shouldRender = true;
 					}
 					break;
 
 				case viewEvents.ViewEventNames.TokensChangedEvent:
-					if (this.onModelTokensChanged(<viewEvents.ViewTokensChangedEvent>data)) {
+					if (this.onTokensChanged(<viewEvents.ViewTokensChangedEvent>data)) {
 						shouldRender = true;
 					}
 					break;
 
 				case viewEvents.ViewEventNames.DecorationsChangedEvent:
-					if (this.onModelDecorationsChanged(<viewEvents.ViewDecorationsChangedEvent>data)) {
+					if (this.onDecorationsChanged(<viewEvents.ViewDecorationsChangedEvent>data)) {
 						shouldRender = true;
 					}
 					break;
@@ -146,13 +146,13 @@ export class ViewEventHandler {
 					break;
 
 				case viewEvents.ViewEventNames.RevealRangeEvent:
-					if (this.onCursorRevealRange(<viewEvents.ViewRevealRangeEvent>data)) {
+					if (this.onRevealRangeRequest(<viewEvents.ViewRevealRangeRequestEvent>data)) {
 						shouldRender = true;
 					}
 					break;
 
 				case viewEvents.ViewEventNames.ScrollRequestEvent:
-					if (this.onCursorScrollRequest(<viewEvents.ViewScrollRequestEvent>data)) {
+					if (this.onScrollRequest(<viewEvents.ViewScrollRequestEvent>data)) {
 						shouldRender = true;
 					}
 					break;
@@ -176,7 +176,7 @@ export class ViewEventHandler {
 					break;
 
 				case viewEvents.ViewEventNames.ViewFocusChanged:
-					if (this.onViewFocusChanged(<viewEvents.ViewFocusChangedEvent>data)) {
+					if (this.onFocusChanged(<viewEvents.ViewFocusChangedEvent>data)) {
 						shouldRender = true;
 					}
 					break;

src/vs/editor/common/viewModel/viewModelCursors.ts

@@ -72,7 +72,7 @@ export class ViewModelCursors {
 	}
 
 	public onCursorRevealRange(e: editorCommon.ICursorRevealRangeEvent, emit: (eventType: string, payload: any) => void): void {
-		emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeEvent(
+		emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeRequestEvent(
 			e.viewRange,
 			e.verticalType,
 			e.revealHorizontal,

src/vs/editor/common/viewModel/viewModelImpl.ts

@@ -140,7 +140,7 @@ export class ViewModel extends EventEmitter implements IViewModel {
 	private _setHiddenAreas(ranges: editorCommon.IRange[]): void {
 		let lineMappingChanged = this.lines.setHiddenAreas(ranges, (eventType: string, payload: any) => this.emit(eventType, payload));
 		if (lineMappingChanged) {
-			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvents());
+			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvent());
 			this.decorations.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 			this.cursors.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 		}
@@ -156,7 +156,7 @@ export class ViewModel extends EventEmitter implements IViewModel {
 	private _onTabSizeChange(newTabSize: number): boolean {
 		var lineMappingChanged = this.lines.setTabSize(newTabSize, (eventType: string, payload: any) => this.emit(eventType, payload));
 		if (lineMappingChanged) {
-			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvents());
+			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvent());
 			this.decorations.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 			this.cursors.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 		}
@@ -166,7 +166,7 @@ export class ViewModel extends EventEmitter implements IViewModel {
 	private _onWrappingIndentChange(newWrappingIndent: editorCommon.WrappingIndent): boolean {
 		var lineMappingChanged = this.lines.setWrappingIndent(newWrappingIndent, (eventType: string, payload: any) => this.emit(eventType, payload));
 		if (lineMappingChanged) {
-			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvents());
+			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvent());
 			this.decorations.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 			this.cursors.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 		}
@@ -178,7 +178,7 @@ export class ViewModel extends EventEmitter implements IViewModel {
 		var newCenteredViewRange = this.coordinatesConverter.convertModelRangeToViewRange(range);
 
 		// Send a reveal event to restore the centered content
-		this.emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeEvent(
+		this.emit(viewEvents.ViewEventNames.RevealRangeEvent, new viewEvents.ViewRevealRangeRequestEvent(
 			newCenteredViewRange,
 			editorCommon.VerticalRevealType.Center,
 			false,
@@ -189,7 +189,7 @@ export class ViewModel extends EventEmitter implements IViewModel {
 	private _onWrappingColumnChange(newWrappingColumn: number, columnsForFullWidthChar: number): boolean {
 		let lineMappingChanged = this.lines.setWrappingColumn(newWrappingColumn, columnsForFullWidthChar, (eventType: string, payload: any) => this.emit(eventType, payload));
 		if (lineMappingChanged) {
-			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvents());
+			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvent());
 			this.decorations.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 			this.cursors.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 		}
@@ -377,7 +377,7 @@ export class ViewModel extends EventEmitter implements IViewModel {
 		}
 
 		if (!hadOtherModelChange && hadModelLineChangeThatChangedLineMapping) {
-			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvents());
+			this.emit(viewEvents.ViewEventNames.LineMappingChangedEvent, new viewEvents.ViewLineMappingChangedEvent());
 			this.decorations.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 			this.cursors.onLineMappingChanged((eventType: string, payload: any) => this.emit(eventType, payload));
 		}

src/vs/editor/test/browser/view/viewLayer.test.ts

@@ -40,7 +40,7 @@ function assertState(col: RenderedLinesCollection<TestLine>, state: ILinesCollec
 	assert.deepEqual(actualState, state);
 }
 
-suite('RenderedLinesCollection onModelLinesDeleted', () => {
+suite('RenderedLinesCollection onLinesDeleted', () => {
 
 	function testOnModelLinesDeleted(deleteFromLineNumber: number, deleteToLineNumber: number, expectedDeleted: string[], expectedState: ILinesCollectionState): void {
 		let col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
@@ -50,7 +50,7 @@ suite('RenderedLinesCollection onModelLinesDeleted', () => {
 			new TestLine('old8'),
 			new TestLine('old9')
 		]);
-		let actualDeleted1 = col.onModelLinesDeleted(deleteFromLineNumber, deleteToLineNumber);
+		let actualDeleted1 = col.onLinesDeleted(deleteFromLineNumber, deleteToLineNumber);
 		let actualDeleted = [];
 		if (actualDeleted1) {
 			actualDeleted = actualDeleted1.map(line => line.id);
@@ -315,7 +315,7 @@ suite('RenderedLinesCollection onModelLinesDeleted', () => {
 	});
 });
 
-suite('RenderedLinesCollection onModelLineChanged', () => {
+suite('RenderedLinesCollection onLineChanged', () => {
 
 	function testOnModelLineChanged(changedLineNumber: number, expectedPinged: boolean, expectedState: ILinesCollectionState): void {
 		let col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
@@ -325,7 +325,7 @@ suite('RenderedLinesCollection onModelLineChanged', () => {
 			new TestLine('old8'),
 			new TestLine('old9')
 		]);
-		let actualPinged = col.onModelLineChanged(changedLineNumber);
+		let actualPinged = col.onLineChanged(changedLineNumber);
 		assert.deepEqual(actualPinged, expectedPinged);
 		assertState(col, expectedState);
 	}
@@ -396,7 +396,7 @@ suite('RenderedLinesCollection onModelLineChanged', () => {
 
 });
 
-suite('RenderedLinesCollection onModelLinesInserted', () => {
+suite('RenderedLinesCollection onLinesInserted', () => {
 
 	function testOnModelLinesInserted(insertFromLineNumber: number, insertToLineNumber: number, expectedDeleted: string[], expectedState: ILinesCollectionState): void {
 		let col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
@@ -406,7 +406,7 @@ suite('RenderedLinesCollection onModelLinesInserted', () => {
 			new TestLine('old8'),
 			new TestLine('old9')
 		]);
-		let actualDeleted1 = col.onModelLinesInserted(insertFromLineNumber, insertToLineNumber);
+		let actualDeleted1 = col.onLinesInserted(insertFromLineNumber, insertToLineNumber);
 		let actualDeleted = [];
 		if (actualDeleted1) {
 			actualDeleted = actualDeleted1.map(line => line.id);
@@ -672,7 +672,7 @@ suite('RenderedLinesCollection onModelLinesInserted', () => {
 });
 
 
-suite('RenderedLinesCollection onModelTokensChanged', () => {
+suite('RenderedLinesCollection onTokensChanged', () => {
 
 	function testOnModelTokensChanged(changedFromLineNumber: number, changedToLineNumber: number, expectedPinged: boolean, expectedState: ILinesCollectionState): void {
 		let col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
@@ -682,7 +682,7 @@ suite('RenderedLinesCollection onModelTokensChanged', () => {
 			new TestLine('old8'),
 			new TestLine('old9')
 		]);
-		let actualPinged = col.onModelTokensChanged([{ fromLineNumber: changedFromLineNumber, toLineNumber: changedToLineNumber }]);
+		let actualPinged = col.onTokensChanged([{ fromLineNumber: changedFromLineNumber, toLineNumber: changedToLineNumber }]);
 		assert.deepEqual(actualPinged, expectedPinged);
 		assertState(col, expectedState);
 	}

src/vs/editor/test/common/viewLayout/linesLayout.test.ts

@@ -173,7 +173,7 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		// Pretend that lines 5 and 6 were deleted
 		// 8 lines
 		// whitespace: - a(4,10)
-		linesLayout.onModelLinesDeleted(5, 6);
+		linesLayout.onLinesDeleted(5, 6);
 		assert.equal(linesLayout.getLinesTotalHeight(), 18);
 		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
 		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
@@ -187,7 +187,7 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		// Insert two lines at the beginning
 		// 10 lines
 		// whitespace: - a(6,10)
-		linesLayout.onModelLinesInserted(1, 2);
+		linesLayout.onLinesInserted(1, 2);
 		assert.equal(linesLayout.getLinesTotalHeight(), 20);
 		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
 		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);

src/vs/editor/test/common/viewLayout/whitespaceComputer.test.ts

@@ -191,7 +191,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
 		assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(5), 50);
 
 		// Delete line 1
-		whitespaceComputer.onModelLinesDeleted(1, 1);
+		whitespaceComputer.onLinesDeleted(1, 1);
 		// whitespaces: d(2, 30), c(3, 20)
 		assert.equal(whitespaceComputer.getCount(), 2);
 		assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 2);
@@ -208,7 +208,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
 		assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(5), 50);
 
 		// Insert a line before line 1
-		whitespaceComputer.onModelLinesInserted(1, 1);
+		whitespaceComputer.onLinesInserted(1, 1);
 		// whitespaces: d(3, 30), c(4, 20)
 		assert.equal(whitespaceComputer.getCount(), 2);
 		assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 3);
@@ -225,7 +225,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
 		assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(5), 50);
 
 		// Delete line 4
-		whitespaceComputer.onModelLinesDeleted(4, 4);
+		whitespaceComputer.onLinesDeleted(4, 4);
 		// whitespaces: d(3, 30), c(3, 20)
 		assert.equal(whitespaceComputer.getCount(), 2);
 		assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 3);