Skip to content

Fixes race condition where incomplete state of ViewModelLines could be observed by events fired during model access. #285602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmitrivMS wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −2
Open

Fixes race condition where incomplete state of ViewModelLines could be observed by events fired during model access. #285602

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/vs/editor/common/viewModel/viewModelLines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ export class ViewModelLinesFromProjectedModel implements IViewModelLines {
}

private _constructLines(resetHiddenAreas: boolean, previousLineBreaks: ((ModelLineProjectionData | null)[]) | null): void {
this.modelLineProjections = [];
// Build new projections in a local array to prevent partially updated state being observed.
const newProjections: IModelLineProjection[] = [];

if (resetHiddenAreas) {
this.hiddenAreasDecorationIds = this.model.deltaDecorations(this.hiddenAreasDecorationIds, []);
Expand Down Expand Up @@ -159,11 +160,13 @@ export class ViewModelLinesFromProjectedModel implements IViewModelLines {
const isInHiddenArea = (lineNumber >= hiddenAreaStart && lineNumber <= hiddenAreaEnd);
const line = createModelLineProjection(linesBreaks[i], !isInHiddenArea);
values[i] = line.getViewLineCount();
this.modelLineProjections[i] = line;
newProjections[i] = line;
}

this._validModelVersionId = this.model.getVersionId();

// Atomically replace the arrays at the very end to avoid exposing incomplete state.
this.modelLineProjections = newProjections;
this.projectedModelLineLineCounts = new ConstantTimePrefixSumComputer(values);
}

Expand Down
Loading