maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Prevents cursor from entering injected text for good.

Browse source
This commit is contained in:
Henning Dieterichs 2021-08-24 00:30:38 +02:00
parent 9a3db30a7a
commit e898b8d0d0
No known key found for this signature in database
GPG key ID: 771381EFFDB9EC06
1 changed files with 9 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/vs/editor/common/controller/cursor.ts
View file

@ -335,15 +335,15 @@ export class CursorsController extends Disposable {
// The view positions will be updated when handling finishes
return;
}
const selectionsFromMarkers = this._cursors.readSelectionFromMarkers();
const newState = CursorState.fromModelSelections(selectionsFromMarkers);
if (didStateChange(this.getCursorStates(), newState || [])) {
// setStates might remove markers, which could trigger a decoration change.
// If there are injected text decorations for that line, `onModelContentChanged` is emitted again
// and an endless recursion happens.
// This is why we only call setStates if we really need to (this fixes recursion).
this.setStates(eventsCollector, 'modelChange', CursorChangeReason.RecoverFromMarkers, newState);
// setStates might remove markers, which could trigger a decoration change.
// If there are injected text decorations for that line, `onModelContentChanged` is emitted again
// and an endless recursion happens.
// _isHandling prevents that.
this._isHandling = true;
try {
this.setStates(eventsCollector, 'modelChange', CursorChangeReason.NotSet, this.getCursorStates());
} finally {
this._isHandling = false;
}
} else {
this._knownModelVersionId = e.versionId;
@ -731,28 +731,6 @@ export class CursorsController extends Disposable {
}
}
function didStateChange(currentStates: CursorState[], newStates: PartialCursorState[]): boolean {
if (currentStates.length !== newStates.length) {
return true;
}
for (let i = 0; i < currentStates.length; i++) {
const curState = currentStates[i];
const newState = newStates[i];
if (newState.modelState) {
if (!newState.modelState.equals(curState.modelState)) {
return true;
}
}
if (newState.viewState) {
if (!newState.viewState.equals(curState.viewState)) {
return true;
}
}
}
return false;
}
interface IExecContext {
readonly model: ITextModel;
readonly selectionsBefore: Selection[];