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

Keep track of the diff computation state

Browse source
This commit is contained in:
Alex Dima 2019-10-14 21:18:19 +02:00
parent 0d9307ff59
commit e4a4ea2b26
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/editor/browser/editorBrowser.ts
View file

@ -835,6 +835,15 @@ export interface IDiffLineInformation {
readonly equivalentLineNumber: number;
}
/**
* @internal
*/
export const enum DiffEditorState {
Idle,
ComputingDiff,
DiffComputed
}
/**
* A rich diff editor.
*/

15
src/vs/editor/browser/widget/diffEditorWidget.ts
View file

@ -167,6 +167,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
public readonly onDidUpdateDiff: Event<void> = this._onDidUpdateDiff.event;
private readonly id: number;
private _state: editorBrowser.DiffEditorState;
private readonly _domElement: HTMLElement;
protected readonly _containerDomElement: HTMLElement;
@ -236,6 +237,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
this._notificationService = notificationService;
this.id = (++DIFF_EDITOR_ID);
this._state = editorBrowser.DiffEditorState.Idle;
this._domElement = domElement;
options = options || {};
@ -391,6 +393,13 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
return this._renderIndicators;
}
private _setState(newState: editorBrowser.DiffEditorState): void {
if (this._state !== newState) {
return;
}
this._state = newState;
}
public hasWidgetFocus(): boolean {
return dom.isAncestor(document.activeElement, this._domElement);
}
@ -678,14 +687,13 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
// Disable any diff computations that will come in
this._diffComputationResult = null;
this._diffComputationToken++;
this._setState(editorBrowser.DiffEditorState.Idle);
if (model) {
this._recreateOverviewRulers();
// Begin comparing
this._beginUpdateDecorations();
} else {
this._diffComputationResult = null;
}
this._layoutOverviewViewport();
@ -933,6 +941,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
// yet supported, so using tokens for now.
this._diffComputationToken++;
let currentToken = this._diffComputationToken;
this._setState(editorBrowser.DiffEditorState.ComputingDiff);
if (!this._editorWorkerService.canComputeDiff(currentOriginalModel.uri, currentModifiedModel.uri)) {
if (
@ -951,6 +960,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
&& currentOriginalModel === this.originalEditor.getModel()
&& currentModifiedModel === this.modifiedEditor.getModel()
) {
this._setState(editorBrowser.DiffEditorState.DiffComputed);
this._diffComputationResult = result;
this._updateDecorationsRunner.schedule();
this._onDidUpdateDiff.fire();
@ -960,6 +970,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
&& currentOriginalModel === this.originalEditor.getModel()
&& currentModifiedModel === this.modifiedEditor.getModel()
) {
this._setState(editorBrowser.DiffEditorState.DiffComputed);
this._diffComputationResult = null;
this._updateDecorationsRunner.schedule();
}