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

Merge pull request #73049 from mjbvz/markdown-check-pending

Browse source 
Double check pending markdown version before updating preview
This commit is contained in:
Matt Bierner 2019-05-10 16:26:26 -07:00 committed by GitHub
parent 60cd4bd73b 4470b868a3
commit fb0d5150d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
extensions/markdown-language-features/src/features/preview.ts
View file

@ -60,6 +60,18 @@ interface PreviewStyleLoadErrorMessage extends WebviewMessage {
}; };
} }
export class PreviewDocumentVersion {
public constructor(
public readonly resource: vscode.Uri,
public readonly version: number,
) { }
public equals(other: PreviewDocumentVersion): boolean {
return this.resource.fsPath === other.resource.fsPath
&& this.version === other.version;
}
}
export class MarkdownPreview extends Disposable { export class MarkdownPreview extends Disposable {
public static viewType = 'markdown.preview'; public static viewType = 'markdown.preview';
@ -71,7 +83,7 @@ export class MarkdownPreview extends Disposable {
private throttleTimer: any; private throttleTimer: any;
private line: number | undefined = undefined; private line: number | undefined = undefined;
private firstUpdate = true; private firstUpdate = true;
private currentVersion?: { resource: vscode.Uri, version: number }; private currentVersion?: PreviewDocumentVersion;
private forceUpdate = false; private forceUpdate = false;
private isScrolling = false; private isScrolling = false;
private _disposed: boolean = false; private _disposed: boolean = false;
@ -389,7 +401,8 @@ export class MarkdownPreview extends Disposable {
return; return;
} }
if (!this.forceUpdate && this.currentVersion && this.currentVersion.resource.fsPath === resource.fsPath && this.currentVersion.version === document.version) { const pendingVersion = new PreviewDocumentVersion(resource, document.version);
if (!this.forceUpdate && this.currentVersion && this.currentVersion.equals(pendingVersion)) {
if (this.line) { if (this.line) {
this.updateForView(resource, this.line); this.updateForView(resource, this.line);
} }
@ -397,10 +410,14 @@ export class MarkdownPreview extends Disposable {
} }
this.forceUpdate = false; this.forceUpdate = false;
this.currentVersion = { resource, version: document.version }; this.currentVersion = pendingVersion;
if (this._resource === resource) { if (this._resource === resource) {
const content = await this._contentProvider.provideTextDocumentContent(document, this._previewConfigurations, this.line, this.state); const content = await this._contentProvider.provideTextDocumentContent(document, this._previewConfigurations, this.line, this.state);
this.setContent(content); // Another call to `doUpdate` may have happened.
// Make sure we are still updating for the correct document
if (this.currentVersion && this.currentVersion.equals(pendingVersion)) {
this.setContent(content);
}
} }
} }