diff --git a/src/vs/editor/browser/controller/keyboardHandler.ts b/src/vs/editor/browser/controller/keyboardHandler.ts index 23e2c0ad46fdefadbc1ceae91c7cb1592fd91a26..e05874cb03e40a71107d406945278751cc3099e7 100644 --- a/src/vs/editor/browser/controller/keyboardHandler.ts +++ b/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; } diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts index 946aa8fb1180589dfa59e683677527062b35a93b..f576a257ff3d45b868a05187f5daac61ce3ca2ae 100644 --- a/src/vs/editor/browser/controller/mouseHandler.ts +++ b/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; } diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index 3cd23b7726b81c63ddbfe2b7e09381a7572f782a..eebe9798015d5a82e3c7c96833a8c60ef47eb3a0 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/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; } diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts index 15093da67e9424838f7950bb6816bf55785df23e..301c181c2353f5fe156302731740e3e974ca2f89 100644 --- a/src/vs/editor/browser/view/viewLayer.ts +++ b/src/vs/editor/browser/view/viewLayer.ts @@ -99,7 +99,7 @@ export class RenderedLinesCollection { /** * @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 { 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 { 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 { 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 extends ViewPart { return true; } - public onModelFlushed(e: viewEvents.ViewModelFlushedEvent): boolean { + public onFlushed(e: viewEvents.ViewFlushedEvent): boolean { this._linesCollection = new RenderedLinesCollection(() => 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 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 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); } diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts index a5f0cc99deb52ed90f6152e92d55ccb99a08bdb6..7d9fef2e033149c2bb249020d6b13c826cc75f85 100644 --- a/src/vs/editor/browser/view/viewOverlays.ts +++ b/src/vs/editor/browser/view/viewOverlays.ts @@ -75,7 +75,7 @@ export class ViewOverlays extends ViewLayer { return true; } - public onViewFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean { + public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean { this._isFocused = e.isFocused; return true; } diff --git a/src/vs/editor/browser/viewLayout/layoutProvider.ts b/src/vs/editor/browser/viewLayout/layoutProvider.ts index a15406552e94bc3fe6fa35ea38fba4a69d021c4e..95dc717034a6f7462fba083209c89b3bbdbdc646 100644 --- a/src/vs/editor/browser/viewLayout/layoutProvider.ts +++ b/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(); } diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts index bc309bfc650e881bd2e3d98f8ce8b7000a66319e..e8ed65be756bb695e2d8ede5cfa0e3061444e6ea 100644 --- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts index fde70ca3a6337d14a7be6dceade47c5b17661d61..aa58628b4659fc583850bb18f9b0647bd52801ef 100644 --- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts index 2031e5cbca200ca057ad3e200f147a14c9397915..79230443dba5bc24f7cfc7b174102ad13354870f 100644 --- a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/decorations/decorations.ts b/src/vs/editor/browser/viewParts/decorations/decorations.ts index e6751ea90c240952d22472066111df439c3a63c0..82c6db3af368228b4ef1e7c95f7d01962e6594cd 100644 --- a/src/vs/editor/browser/viewParts/decorations/decorations.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts index 5005ddb72c8b43fbf76afa2acefc64a028f1eb21..0c6d234e43edcdb464c9452ea649c57db439704f 100644 --- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts index 68a14fbb96d5e609b9fa0aa0593dde83d1ef0d6f..8070465b7b67ae1a7cf802a1e1c3b6ce8d3e5ef1 100644 --- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts index 55fee1b6c1b9ea1e47498a4230a10a4c83131c8b..81e055bb73264289dacd804eac140a3e96d98faf 100644 --- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts index 91a00fb483cbce44e3873a6773a4832d98c1adda..82505a0187f9472982ff7dfeb317face18a38f68 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLine.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/lines/viewLines.ts index 286acc2162a7ba613aaf94cf7994bbc5b161690a..263948dc14734d80ff52c00f174d1ff555253eae 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLines.ts +++ b/src/vs/editor/browser/viewParts/lines/viewLines.ts @@ -73,7 +73,7 @@ export class ViewLines extends ViewLayer 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 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 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({ diff --git a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts index 56fb666f707b4e4ee5ac4d1e3d5a922656e6732a..63d7eb3fb8654d1159609cfefe54aa41b455632b 100644 --- a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts index 7d71a949756201931890dce0f8ba8f2693cce7cd..c515cb4b8547ab6b5d726a995b202ac6ecc90002 100644 --- a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts index 71478dfcf272c51300a00c0e1da837e7f67cd155..ee6486a02bc9581d4e6deabebfdfc0bb3a28ad86 100644 --- a/src/vs/editor/browser/viewParts/minimap/minimap.ts +++ b/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; } diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts index 8dd5ab9dbb701669379fc0fb5fd59df591220083..7bfb4da8b5bcd9e3eea022109ba487c3951af611 100644 --- a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts +++ b/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; } diff --git a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts index 4640fdff64f849629b7726c8aa6e16827b5ca959..6b1cb73b430c7b6caeea0e24a588c864e1770121 100644 --- a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts +++ b/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; } diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts index 9e6be6d72cbbf094611e3cda51e6f88210acc521..99e2d18769da517658ec0dd5b137bd190dbd507c 100644 --- a/src/vs/editor/browser/viewParts/selections/selections.ts +++ b/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 { diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts index 35bd03c5240177a739538c7d23f3453f9c82dcbb..da7d6117bfd51102cf3f6a3df668637bccffaa81 100644 --- a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts +++ b/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; diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts index b114bc571cf7c1cc9a73df68fd8cd2f8282d5aac..3bd5bf94299d883b840d0af1dd88a10f890ea6cd 100644 --- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts +++ b/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; diff --git a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts index c256113e0e7ca05bcf9f1d8f09b67f68db07a1df..049541dbc0ab8b55f640f20fb6a96204aabb3fe7 100644 --- a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts +++ b/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; } diff --git a/src/vs/editor/common/view/viewEvents.ts b/src/vs/editor/common/view/viewEvents.ts index a7be92cce4ffbc4fdf9769943bac0a29031524e8..f293d755cd94af25f13148f0276550c0b22fb389 100644 --- a/src/vs/editor/common/view/viewEvents.ts +++ b/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 diff --git a/src/vs/editor/common/viewLayout/linesLayout.ts b/src/vs/editor/common/viewLayout/linesLayout.ts index cbcde814d90486d49985c004bdc8215b2ba7e95b..a980a45ef1aec9f0f8d878dccb24e4171e3c6b28 100644 --- a/src/vs/editor/common/viewLayout/linesLayout.ts +++ b/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); } /** diff --git a/src/vs/editor/common/viewLayout/whitespaceComputer.ts b/src/vs/editor/common/viewLayout/whitespaceComputer.ts index 4216b2b69d5669fdf3d8c4f530d1253085587c63..946b01b1c8c9feb6feda3f49f696bbd6b9074c19 100644 --- a/src/vs/editor/common/viewLayout/whitespaceComputer.ts +++ b/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; diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts index f321a4aac542d61e492d25e708c0868b604387c0..ce5091acb20a5f04b765cae830319b5756e4c493 100644 --- a/src/vs/editor/common/viewModel/splitLinesCollection.ts +++ b/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 { diff --git a/src/vs/editor/common/viewModel/viewEventHandler.ts b/src/vs/editor/common/viewModel/viewEventHandler.ts index 6d2d28d6404e25a383fd1595cc966dd76febaf0c..d77fda5f3908d7da5ade80df0fb32dff3bd13b98 100644 --- a/src/vs/editor/common/viewModel/viewEventHandler.ts +++ b/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(data)) { + if (this.onLineMappingChanged(data)) { shouldRender = true; } break; case viewEvents.ViewEventNames.ModelFlushedEvent: - if (this.onModelFlushed(data)) { + if (this.onFlushed(data)) { shouldRender = true; } break; case viewEvents.ViewEventNames.LinesDeletedEvent: - if (this.onModelLinesDeleted(data)) { + if (this.onLinesDeleted(data)) { shouldRender = true; } break; case viewEvents.ViewEventNames.LinesInsertedEvent: - if (this.onModelLinesInserted(data)) { + if (this.onLinesInserted(data)) { shouldRender = true; } break; case viewEvents.ViewEventNames.LineChangedEvent: - if (this.onModelLineChanged(data)) { + if (this.onLineChanged(data)) { shouldRender = true; } break; case viewEvents.ViewEventNames.TokensChangedEvent: - if (this.onModelTokensChanged(data)) { + if (this.onTokensChanged(data)) { shouldRender = true; } break; case viewEvents.ViewEventNames.DecorationsChangedEvent: - if (this.onModelDecorationsChanged(data)) { + if (this.onDecorationsChanged(data)) { shouldRender = true; } break; @@ -146,13 +146,13 @@ export class ViewEventHandler { break; case viewEvents.ViewEventNames.RevealRangeEvent: - if (this.onCursorRevealRange(data)) { + if (this.onRevealRangeRequest(data)) { shouldRender = true; } break; case viewEvents.ViewEventNames.ScrollRequestEvent: - if (this.onCursorScrollRequest(data)) { + if (this.onScrollRequest(data)) { shouldRender = true; } break; @@ -176,7 +176,7 @@ export class ViewEventHandler { break; case viewEvents.ViewEventNames.ViewFocusChanged: - if (this.onViewFocusChanged(data)) { + if (this.onFocusChanged(data)) { shouldRender = true; } break; diff --git a/src/vs/editor/common/viewModel/viewModelCursors.ts b/src/vs/editor/common/viewModel/viewModelCursors.ts index 1e67d47f2b228bcf2edb09c072007370f9415541..1bb87854ef2340d4dcb717c9ebcd441ec02686e1 100644 --- a/src/vs/editor/common/viewModel/viewModelCursors.ts +++ b/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, diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts index fe856000655e8c023eec215be5357cb39049ae24..70ba30d44156d73ecb59495cb65b8a15cd5c11e9 100644 --- a/src/vs/editor/common/viewModel/viewModelImpl.ts +++ b/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)); } diff --git a/src/vs/editor/test/browser/view/viewLayer.test.ts b/src/vs/editor/test/browser/view/viewLayer.test.ts index 028eb4bc05fc79e3bff1f18f5ea3284d5a2e299e..ee591d813d8214cc4a0d86be66e1e30e0343e432 100644 --- a/src/vs/editor/test/browser/view/viewLayer.test.ts +++ b/src/vs/editor/test/browser/view/viewLayer.test.ts @@ -40,7 +40,7 @@ function assertState(col: RenderedLinesCollection, 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(() => 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(() => 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(() => 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(() => 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); } diff --git a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts b/src/vs/editor/test/common/viewLayout/linesLayout.test.ts index 0f0a556eb4e2009424d0a3dfe112d96e13d0fc5c..4dbdd65a516d8be11bef52af746d38370ead9708 100644 --- a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts +++ b/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); diff --git a/src/vs/editor/test/common/viewLayout/whitespaceComputer.test.ts b/src/vs/editor/test/common/viewLayout/whitespaceComputer.test.ts index dcb4cf65fa318502e3519314a50c66836f787bf0..54109d713d252eb587fcc36bd13e6a2511e821f4 100644 --- a/src/vs/editor/test/common/viewLayout/whitespaceComputer.test.ts +++ b/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);