Revert "Fixes microsoft#145872: Emit model events using the view model outgoing queue"

This reverts commit 00b43ac.

Author: alexdima

src/vs/editor/browser/editorBrowser.ts

@@ -14,7 +14,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { IIdentifiedSingleEditOperation, IModelDecoration, IModelDeltaDecoration, ITextModel, ICursorStateComputer, PositionAffinity } from 'vs/editor/common/model';
 import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent } from 'vs/editor/common/textModelEvents';
 import { OverviewRulerZone } from 'vs/editor/common/viewModel/overviewZoneManager';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorWhitespace, IViewModel } from 'vs/editor/common/viewModel';
@@ -531,11 +531,6 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 * @event
 	 */
 	readonly onDidChangeModelDecorations: Event<IModelDecorationsChangedEvent>;
-	/**
-	 * An event emitted when the tokens of the current model have changed.
-	 * @internal
-	 */
-	readonly onDidChangeModelTokens: Event<IModelTokensChangedEvent>;
 	/**
 	 * An event emitted when the text inside this editor gained focus (i.e. cursor starts blinking).
 	 * @event

src/vs/editor/browser/widget/codeEditorWidget.ts

@@ -37,7 +37,7 @@ import { EndOfLinePreference, IIdentifiedSingleEditOperation, IModelDecoration,
 import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
 import { ClassName } from 'vs/editor/common/model/intervalTree';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent } from 'vs/editor/common/textModelEvents';
 import { editorUnnecessaryCodeBorder, editorUnnecessaryCodeOpacity } from 'vs/editor/common/core/editorColorRegistry';
 import { editorErrorBorder, editorErrorForeground, editorHintBorder, editorHintForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, editorForeground, editorErrorBackground, editorInfoBackground, editorWarningBackground } from 'vs/platform/theme/common/colorRegistry';
 import { VerticalRevealType } from 'vs/editor/common/viewEvents';
@@ -134,9 +134,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 	private readonly _onDidChangeModelDecorations: Emitter<IModelDecorationsChangedEvent> = this._register(new Emitter<IModelDecorationsChangedEvent>());
 	public readonly onDidChangeModelDecorations: Event<IModelDecorationsChangedEvent> = this._onDidChangeModelDecorations.event;
 
-	private readonly _onDidChangeModelTokens: Emitter<IModelTokensChangedEvent> = this._register(new Emitter<IModelTokensChangedEvent>());
-	public readonly onDidChangeModelTokens: Event<IModelTokensChangedEvent> = this._onDidChangeModelTokens.event;
-
 	private readonly _onDidChangeConfiguration: Emitter<ConfigurationChangedEvent> = this._register(new Emitter<ConfigurationChangedEvent>());
 	public readonly onDidChangeConfiguration: Event<ConfigurationChangedEvent> = this._onDidChangeConfiguration.event;
 
@@ -1590,6 +1587,14 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 			this._themeService
 		);
 
+		listenersToRemove.push(model.onDidChangeDecorations((e) => this._onDidChangeModelDecorations.fire(e)));
+		listenersToRemove.push(model.onDidChangeLanguage((e) => {
+			this._domElement.setAttribute('data-mode-id', model.getLanguageId());
+			this._onDidChangeModelLanguage.fire(e);
+		}));
+		listenersToRemove.push(model.onDidChangeLanguageConfiguration((e) => this._onDidChangeModelLanguageConfiguration.fire(e)));
+		listenersToRemove.push(model.onDidChangeContent((e) => this._onDidChangeModelContent.fire(e)));
+		listenersToRemove.push(model.onDidChangeOptions((e) => this._onDidChangeModelOptions.fire(e)));
 		// Someone might destroy the model from under the editor, so prevent any exceptions by setting a null model
 		listenersToRemove.push(model.onWillDispose(() => this.setModel(null)));
 
@@ -1644,25 +1649,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 					break;
 				}
-				case OutgoingViewModelEventKind.ModelDecorationsChanged:
-					this._onDidChangeModelDecorations.fire(e.event);
-					break;
-				case OutgoingViewModelEventKind.ModelLanguageChanged:
-					this._domElement.setAttribute('data-mode-id', model.getLanguageId());
-					this._onDidChangeModelLanguage.fire(e.event);
-					break;
-				case OutgoingViewModelEventKind.ModelLanguageConfigurationChanged:
-					this._onDidChangeModelLanguageConfiguration.fire(e.event);
-					break;
-				case OutgoingViewModelEventKind.ModelContentChanged:
-					this._onDidChangeModelContent.fire(e.event);
-					break;
-				case OutgoingViewModelEventKind.ModelOptionsChanged:
-					this._onDidChangeModelOptions.fire(e.event);
-					break;
-				case OutgoingViewModelEventKind.ModelTokensChanged:
-					this._onDidChangeModelTokens.fire(e.event);
-					break;
 
 			}
 		}));

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

@@ -35,7 +35,7 @@ import { ILineBreaksComputer, ILineBreaksComputerFactory, InjectedText } from 'v
 import { ViewEventHandler } from 'vs/editor/common/viewEventHandler';
 import { ICoordinatesConverter, IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from 'vs/editor/common/viewModel';
 import { ViewModelDecorations } from 'vs/editor/common/viewModel/viewModelDecorations';
-import { FocusChangedEvent, ModelContentChangedEvent, ModelDecorationsChangedEvent, ModelLanguageChangedEvent, ModelLanguageConfigurationChangedEvent, ModelOptionsChangedEvent, ModelTokensChangedEvent, OutgoingViewModelEvent, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent } from 'vs/editor/common/viewModelEventDispatcher';
+import { FocusChangedEvent, OutgoingViewModelEvent, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent } from 'vs/editor/common/viewModelEventDispatcher';
 import { IViewModelLines, ViewModelLinesFromModelAsIs, ViewModelLinesFromProjectedModel } from 'vs/editor/common/viewModel/viewModelLines';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
@@ -399,10 +399,6 @@ export class ViewModel extends Disposable implements IViewModel {
 			this._tokenizeViewportSoon.schedule();
 		}));
 
-		this._register(this.model.onDidChangeContent((e) => {
-			this._eventDispatcher.emitOutgoingEvent(new ModelContentChangedEvent(e));
-		}));
-
 		this._register(this.model.onDidChangeTokens((e) => {
 			const viewRanges: { fromLineNumber: number; toLineNumber: number }[] = [];
 			for (let j = 0, lenJ = e.ranges.length; j < lenJ; j++) {
@@ -419,20 +415,17 @@ export class ViewModel extends Disposable implements IViewModel {
 			if (e.tokenizationSupportChanged) {
 				this._tokenizeViewportSoon.schedule();
 			}
-			this._eventDispatcher.emitOutgoingEvent(new ModelTokensChangedEvent(e));
 		}));
 
 		this._register(this.model.onDidChangeLanguageConfiguration((e) => {
 			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewLanguageConfigurationEvent());
 			this.cursorConfig = new CursorConfiguration(this.model.getLanguageId(), this.model.getOptions(), this._configuration, this.languageConfigurationService);
 			this._cursor.updateConfiguration(this.cursorConfig);
-			this._eventDispatcher.emitOutgoingEvent(new ModelLanguageConfigurationChangedEvent(e));
 		}));
 
 		this._register(this.model.onDidChangeLanguage((e) => {
 			this.cursorConfig = new CursorConfiguration(this.model.getLanguageId(), this.model.getOptions(), this._configuration, this.languageConfigurationService);
 			this._cursor.updateConfiguration(this.cursorConfig);
-			this._eventDispatcher.emitOutgoingEvent(new ModelLanguageChangedEvent(e));
 		}));
 
 		this._register(this.model.onDidChangeOptions((e) => {
@@ -454,14 +447,11 @@ export class ViewModel extends Disposable implements IViewModel {
 
 			this.cursorConfig = new CursorConfiguration(this.model.getLanguageId(), this.model.getOptions(), this._configuration, this.languageConfigurationService);
 			this._cursor.updateConfiguration(this.cursorConfig);
-
-			this._eventDispatcher.emitOutgoingEvent(new ModelOptionsChangedEvent(e));
 		}));
 
 		this._register(this.model.onDidChangeDecorations((e) => {
 			this._decorations.onModelDecorationsChanged();
 			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewDecorationsChangedEvent(e));
-			this._eventDispatcher.emitOutgoingEvent(new ModelDecorationsChangedEvent(e));
 		}));
 	}
 

src/vs/editor/common/viewModelEventDispatcher.ts

@@ -10,7 +10,6 @@ import { Emitter } from 'vs/base/common/event';
 import { Selection } from 'vs/editor/common/core/selection';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
 
 export class ViewModelEventDispatcher extends Disposable {
 
@@ -41,9 +40,8 @@ export class ViewModelEventDispatcher extends Disposable {
 
 	private _addOutgoingEvent(e: OutgoingViewModelEvent): void {
 		for (let i = 0, len = this._outgoingEvents.length; i < len; i++) {
-			const mergeResult = (this._outgoingEvents[i].kind === e.kind ? this._outgoingEvents[i].attemptToMerge(e) : null);
-			if (mergeResult) {
-				this._outgoingEvents[i] = mergeResult;
+			if (this._outgoingEvents[i].kind === e.kind) {
+				this._outgoingEvents[i] = this._outgoingEvents[i].merge(e);
 				return;
 			}
 		}
@@ -181,12 +179,6 @@ export type OutgoingViewModelEvent = (
 	| HiddenAreasChangedEvent
 	| ReadOnlyEditAttemptEvent
 	| CursorStateChangedEvent
-	| ModelDecorationsChangedEvent
-	| ModelLanguageChangedEvent
-	| ModelLanguageConfigurationChangedEvent
-	| ModelContentChangedEvent
-	| ModelOptionsChangedEvent
-	| ModelTokensChangedEvent
 );
 
 export const enum OutgoingViewModelEventKind {
@@ -197,12 +189,6 @@ export const enum OutgoingViewModelEventKind {
 	HiddenAreasChanged,
 	ReadOnlyEditAttempt,
 	CursorStateChanged,
-	ModelDecorationsChanged,
-	ModelLanguageChanged,
-	ModelLanguageConfigurationChanged,
-	ModelContentChanged,
-	ModelOptionsChanged,
-	ModelTokensChanged,
 }
 
 export class ContentSizeChangedEvent implements IContentSizeChangedEvent {
@@ -230,9 +216,10 @@ export class ContentSizeChangedEvent implements IContentSizeChangedEvent {
 		return (!this.contentWidthChanged && !this.contentHeightChanged);
 	}
 
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		if (other.kind !== this.kind) {
-			return null;
+
+	public merge(other: OutgoingViewModelEvent): ContentSizeChangedEvent {
+		if (other.kind !== OutgoingViewModelEventKind.ContentSizeChanged) {
+			return this;
 		}
 		return new ContentSizeChangedEvent(this._oldContentWidth, this._oldContentHeight, other.contentWidth, other.contentHeight);
 	}
@@ -254,9 +241,9 @@ export class FocusChangedEvent {
 		return (this.oldHasFocus === this.hasFocus);
 	}
 
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		if (other.kind !== this.kind) {
-			return null;
+	public merge(other: OutgoingViewModelEvent): FocusChangedEvent {
+		if (other.kind !== OutgoingViewModelEventKind.FocusChanged) {
+			return this;
 		}
 		return new FocusChangedEvent(this.oldHasFocus, other.hasFocus);
 	}
@@ -305,9 +292,9 @@ export class ScrollChangedEvent {
 		return (!this.scrollWidthChanged && !this.scrollLeftChanged && !this.scrollHeightChanged && !this.scrollTopChanged);
 	}
 
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		if (other.kind !== this.kind) {
-			return null;
+	public merge(other: OutgoingViewModelEvent): ScrollChangedEvent {
+		if (other.kind !== OutgoingViewModelEventKind.ScrollChanged) {
+			return this;
 		}
 		return new ScrollChangedEvent(
 			this._oldScrollWidth, this._oldScrollLeft, this._oldScrollHeight, this._oldScrollTop,
@@ -327,10 +314,7 @@ export class ViewZonesChangedEvent {
 		return false;
 	}
 
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		if (other.kind !== this.kind) {
-			return null;
-		}
+	public merge(other: OutgoingViewModelEvent): ViewZonesChangedEvent {
 		return this;
 	}
 }
@@ -346,10 +330,7 @@ export class HiddenAreasChangedEvent {
 		return false;
 	}
 
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		if (other.kind !== this.kind) {
-			return null;
-		}
+	public merge(other: OutgoingViewModelEvent): HiddenAreasChangedEvent {
 		return this;
 	}
 }
@@ -403,9 +384,9 @@ export class CursorStateChangedEvent {
 		);
 	}
 
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		if (other.kind !== this.kind) {
-			return null;
+	public merge(other: OutgoingViewModelEvent): CursorStateChangedEvent {
+		if (other.kind !== OutgoingViewModelEventKind.CursorStateChanged) {
+			return this;
 		}
 		return new CursorStateChangedEvent(
 			this.oldSelections, other.selections, this.oldModelVersionId, other.modelVersionId, other.source, other.reason, this.reachedMaxCursorCount || other.reachedMaxCursorCount
@@ -424,106 +405,7 @@ export class ReadOnlyEditAttemptEvent {
 		return false;
 	}
 
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		if (other.kind !== this.kind) {
-			return null;
-		}
+	public merge(other: OutgoingViewModelEvent): ReadOnlyEditAttemptEvent {
 		return this;
 	}
 }
-
-export class ModelDecorationsChangedEvent {
-	public readonly kind = OutgoingViewModelEventKind.ModelDecorationsChanged;
-
-	constructor(
-		public readonly event: IModelDecorationsChangedEvent
-	) { }
-
-	public isNoOp(): boolean {
-		return false;
-	}
-
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		return null;
-	}
-}
-
-export class ModelLanguageChangedEvent {
-	public readonly kind = OutgoingViewModelEventKind.ModelLanguageChanged;
-
-	constructor(
-		public readonly event: IModelLanguageChangedEvent
-	) { }
-
-	public isNoOp(): boolean {
-		return false;
-	}
-
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		return null;
-	}
-}
-
-export class ModelLanguageConfigurationChangedEvent {
-	public readonly kind = OutgoingViewModelEventKind.ModelLanguageConfigurationChanged;
-
-	constructor(
-		public readonly event: IModelLanguageConfigurationChangedEvent
-	) { }
-
-	public isNoOp(): boolean {
-		return false;
-	}
-
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		return null;
-	}
-}
-
-export class ModelContentChangedEvent {
-	public readonly kind = OutgoingViewModelEventKind.ModelContentChanged;
-
-	constructor(
-		public readonly event: IModelContentChangedEvent
-	) { }
-
-	public isNoOp(): boolean {
-		return false;
-	}
-
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		return null;
-	}
-}
-
-export class ModelOptionsChangedEvent {
-	public readonly kind = OutgoingViewModelEventKind.ModelOptionsChanged;
-
-	constructor(
-		public readonly event: IModelOptionsChangedEvent
-	) { }
-
-	public isNoOp(): boolean {
-		return false;
-	}
-
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		return null;
-	}
-}
-
-export class ModelTokensChangedEvent {
-	public readonly kind = OutgoingViewModelEventKind.ModelTokensChanged;
-
-	constructor(
-		public readonly event: IModelTokensChangedEvent
-	) { }
-
-	public isNoOp(): boolean {
-		return false;
-	}
-
-	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
-		return null;
-	}
-}

src/vs/editor/test/browser/testCodeEditor.ts

@@ -119,21 +119,21 @@ export interface TestCodeEditorInstantiationOptions extends TestCodeEditorCreati
 	serviceCollection?: ServiceCollection;
 }
 
-export function withTestCodeEditor(text: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: TestInstantiationService) => void): void {
+export function withTestCodeEditor(text: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: IInstantiationService) => void): void {
 	return _withTestCodeEditor(text, options, callback);
 }
 
-export async function withAsyncTestCodeEditor(text: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: TestInstantiationService) => Promise<void>): Promise<void> {
+export async function withAsyncTestCodeEditor(text: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: IInstantiationService) => Promise<void>): Promise<void> {
 	return _withTestCodeEditor(text, options, callback);
 }
 
 function isTextModel(arg: ITextModel | string | string[] | ITextBufferFactory): arg is ITextModel {
 	return Boolean(arg && (arg as ITextModel).uri);
 }
 
-function _withTestCodeEditor(arg: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: TestInstantiationService) => void): void;
-function _withTestCodeEditor(arg: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: TestInstantiationService) => Promise<void>): Promise<void>;
-function _withTestCodeEditor(arg: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: TestInstantiationService) => Promise<void> | void): Promise<void> | void {
+function _withTestCodeEditor(arg: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: IInstantiationService) => void): void;
+function _withTestCodeEditor(arg: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: IInstantiationService) => Promise<void>): Promise<void>;
+function _withTestCodeEditor(arg: ITextModel | string | string[] | ITextBufferFactory, options: TestCodeEditorInstantiationOptions, callback: (editor: ITestCodeEditor, viewModel: ViewModel, instantiationService: IInstantiationService) => Promise<void> | void): Promise<void> | void {
 	const disposables = new DisposableStore();
 	const instantiationService = createCodeEditorServices(disposables, options.serviceCollection);
 	delete options.serviceCollection;