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

Merge pull request #131185 from microsoft/hediet/fixes-npe

Browse source 
Don't restore selection from markers when there are no markers
This commit is contained in:
Alexandru Dima 2021-08-23 10:57:13 +02:00 committed by GitHub
parent f29238c5f4 e5e32317a2
commit f3d4130f2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -331,6 +331,10 @@ export class CursorsController extends Disposable {
public onModelContentChanged(eventsCollector: ViewModelEventsCollector, e: ModelRawContentChangedEvent | ModelInjectedTextChangedEvent): void {
if (e instanceof ModelInjectedTextChangedEvent) {
// If injected texts change, the view positions of all cursors need to be updated.
if (this._isHandling) {
// The view positions will be updated when handling finishes
return;
}
const selectionsFromMarkers = this._cursors.readSelectionFromMarkers();
const newState = CursorState.fromModelSelections(selectionsFromMarkers);