development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 19:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes #51669 and #56636

Browse source
This commit is contained in:
Alex Dima 2018-08-27 15:36:16 +02:00
parent da40432b85
commit c3ff42d57a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/editor/common/model/textModel.ts
View file

@ -1323,7 +1323,12 @@ export class TextModel extends Disposable implements model.ITextModel {
for (let i = 0, len = contentChanges.length; i < len; i++) { for (let i = 0, len = contentChanges.length; i < len; i++) {
const change = contentChanges[i]; const change = contentChanges[i];
const [eolCount, firstLineLength] = TextModel._eolCount(change.text); const [eolCount, firstLineLength] = TextModel._eolCount(change.text);
this._tokens.applyEdits(change.range, eolCount, firstLineLength); try {
this._tokens.applyEdits(change.range, eolCount, firstLineLength);
} catch (err) {
// emergency recovery => reset tokens
this._tokens = new ModelLinesTokens(this._tokens.languageIdentifier, this._tokens.tokenizationSupport);
}
this._onDidChangeDecorations.fire(); this._onDidChangeDecorations.fire();
this._decorationsTree.acceptReplace(change.rangeOffset, change.rangeLength, change.text.length, change.forceMoveMarkers); this._decorationsTree.acceptReplace(change.rangeOffset, change.rangeLength, change.text.length, change.forceMoveMarkers);