Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -329,7 +329,9 @@ export class TextModel extends Disposable implements model.ITextModel {
this._isTooLargeForSyncing = (bufferTextLength > TextModel.MODEL_SYNC_LIMIT);
this._setVersionId(1);
this._versionId = 1;
this._alternativeVersionId = 1;
this._isDisposed = false;
this._isDisposing = false;
@@ -693,11 +695,7 @@ export class TextModel extends Disposable implements model.ITextModel {
}
private _increaseVersionId(): void {
this._setVersionId(this._versionId + 1);
}
private _setVersionId(newVersionId: number): void {
this._versionId = newVersionId;
this._versionId = this._versionId + 1;
this._alternativeVersionId = this._versionId;
}