DiffInformation - adjust API + bug fixes (microsoft#234113)

Author: lszomoru

src/vs/platform/editor/common/editor.ts

@@ -389,7 +389,7 @@ export type ITextEditorDiff = [
 export interface ITextEditorDiffInformation {
 	readonly documentVersion: number;
 	readonly original: URI | undefined;
-	readonly modified: URI | undefined;
+	readonly modified: URI;
 	readonly diff: readonly ITextEditorDiff[];
 }
 

src/vs/workbench/api/browser/mainThreadEditors.ts

@@ -154,18 +154,16 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 				return constObservable(undefined);
 			}
 
-			return observableFromEvent(this, dirtyDiffModel.onDidChange, e => {
+			return observableFromEvent(this, dirtyDiffModel.onDidChange, () => {
 				const scmQuickDiff = dirtyDiffModel.quickDiffs.find(diff => diff.isSCM === true);
-				if (!e || !scmQuickDiff) {
+				if (!scmQuickDiff) {
 					return undefined;
 				}
 
-				return {
-					originalResource: scmQuickDiff.originalResource,
-					changes: e.changes
-						.filter(change => change.label === scmQuickDiff.label)
-						.map(change => change.change)
-				};
+				const scmQuickDiffChanges = dirtyDiffModel.mapChanges.get(scmQuickDiff.label) ?? [];
+				const changes = scmQuickDiffChanges.map(index => dirtyDiffModel.changes[index].change);
+
+				return { originalResource: scmQuickDiff.originalResource, changes };
 			});
 		});
 

src/vs/workbench/api/common/extHost.protocol.ts

@@ -1828,7 +1828,7 @@ export type ITextEditorDiff = [
 export interface ITextEditorDiffInformation {
 	readonly documentVersion: number;
 	readonly original: UriComponents | undefined;
-	readonly modified: UriComponents | undefined;
+	readonly modified: UriComponents;
 	readonly diff: readonly ITextEditorDiff[];
 }
 

src/vs/workbench/api/common/extHostTextEditors.ts

@@ -193,11 +193,16 @@ export class ExtHostEditors extends Disposable implements ExtHostEditorsShape {
 			} satisfies vscode.TextEditorDiff;
 		});
 
+		const that = this;
 		const result = Object.freeze({
 			documentVersion: diffInformation.documentVersion,
 			original,
 			modified,
-			diff
+			diff,
+			get isStale(): boolean {
+				const document = that._extHostDocumentsAndEditors.getDocument(modified);
+				return document?.version !== diffInformation.documentVersion;
+			}
 		});
 
 		textEditor._acceptDiffInformation(result);

src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts

@@ -23,8 +23,9 @@ declare module 'vscode' {
 	export interface TextEditorDiffInformation {
 		readonly documentVersion: number;
 		readonly original: Uri | undefined;
-		readonly modified: Uri | undefined;
+		readonly modified: Uri;
 		readonly diff: readonly TextEditorDiff[];
+		get isStale(): boolean;
 	}
 
 	export interface TextEditorDiffInformationChangeEvent {