Revert addition of Uri to InlineCompletion (microsoft#261633)

DonJayamanne · web-flow · commit 13191959bda1 · 2025-08-14T17:21:52.000+02:00
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
@@ -832,10 +832,6 @@ export interface InlineCompletion {
 	readonly warning?: InlineCompletionWarning;
 
 	readonly displayLocation?: InlineCompletionDisplayLocation;
-	/**
-	 * The Uri of the document this completion item is associated with.
-	 */
-	readonly uri?: UriComponents;
 }
 
 export interface InlineCompletionWarning {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -50,7 +50,6 @@ import { IInlineCompletionsService } from '../../../../browser/services/inlineCo
 import { TypingInterval } from './typingSpeed.js';
 import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
-import { isEqual } from '../../../../../base/common/resources.js';
 
 export class InlineCompletionsModel extends Disposable {
 	private readonly _source;
@@ -838,10 +837,7 @@ export class InlineCompletionsModel extends Disposable {
 
 		try {
 			editor.pushUndoStop();
-			const isCompletionInAnotherDocument = completion.uri && !isEqual(completion.uri, editor.getModel()?.uri);
-			if (isCompletionInAnotherDocument) {
-				// Do not apply the edits if they belong to another document.
-			} else if (completion.snippetInfo) {
+			if (completion.snippetInfo) {
 				const mainEdit = TextReplacement.delete(completion.editRange);
 				const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
 				const edit = TextEdit.fromParallelReplacementsUnsorted([mainEdit, ...additionalEdits]);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts
@@ -25,7 +25,6 @@ import { IDisplayLocation, InlineSuggestData, InlineSuggestionList, PartialAccep
 import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
 import { InlineCompletionViewData, InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
-import { URI } from '../../../../../base/common/uri.js';
 
 export type InlineSuggestionItem = InlineEditItem | InlineCompletionItem;
 
@@ -46,8 +45,7 @@ abstract class InlineSuggestionItemBase {
 	constructor(
 		protected readonly _data: InlineSuggestData,
 		public readonly identity: InlineSuggestionIdentity,
-		public readonly displayLocation: InlineSuggestDisplayLocation | undefined,
-		public readonly uri: URI | undefined
+		public readonly displayLocation: InlineSuggestDisplayLocation | undefined
 	) { }
 
 	/**
@@ -203,7 +201,7 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 
 		const displayLocation = data.displayLocation ? InlineSuggestDisplayLocation.create(data.displayLocation) : undefined;
 
-		return new InlineCompletionItem(edit, trimmedEdit, textEdit, textEdit.range, data.snippetInfo, data.additionalTextEdits, data, identity, displayLocation, data.uri);
+		return new InlineCompletionItem(edit, trimmedEdit, textEdit, textEdit.range, data.snippetInfo, data.additionalTextEdits, data, identity, displayLocation);
 	}
 
 	public readonly isInlineEdit = false;
@@ -219,9 +217,8 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 		data: InlineSuggestData,
 		identity: InlineSuggestionIdentity,
 		displayLocation: InlineSuggestDisplayLocation | undefined,
-		uri: URI | undefined
 	) {
-		super(data, identity, displayLocation, uri);
+		super(data, identity, displayLocation);
 	}
 
 	override get hash(): string {
@@ -240,8 +237,7 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 			this.additionalTextEdits,
 			this._data,
 			identity,
-			this.displayLocation,
-			this.uri
+			this.displayLocation
 		);
 	}
 
@@ -273,8 +269,7 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 			this.additionalTextEdits,
 			this._data,
 			this.identity,
-			newDisplayLocation,
-			this.uri
+			newDisplayLocation
 		);
 	}
 
@@ -351,7 +346,7 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 			return SingleUpdatedNextEdit.create(edit, replacedText);
 		});
 		const displayLocation = data.displayLocation ? InlineSuggestDisplayLocation.create(data.displayLocation) : undefined;
-		return new InlineEditItem(offsetEdit, singleTextEdit, data, identity, edits, displayLocation, false, textModel.getVersionId(), data.uri);
+		return new InlineEditItem(offsetEdit, singleTextEdit, data, identity, edits, displayLocation, false, textModel.getVersionId());
 	}
 
 	public readonly snippetInfo: SnippetInfo | undefined = undefined;
@@ -369,9 +364,8 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 		displayLocation: InlineSuggestDisplayLocation | undefined,
 		private readonly _lastChangePartOfInlineEdit = false,
 		private readonly _inlineEditModelVersion: number,
-		uri: URI | undefined
 	) {
-		super(data, identity, displayLocation, uri);
+		super(data, identity, displayLocation);
 	}
 
 	public get updatedEditModelVersion(): number { return this._inlineEditModelVersion; }
@@ -391,7 +385,6 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 			this.displayLocation,
 			this._lastChangePartOfInlineEdit,
 			this._inlineEditModelVersion,
-			this.uri
 		);
 	}
 
@@ -450,7 +443,6 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 			newDisplayLocation,
 			lastChangePartOfInlineEdit,
 			inlineEditModelVersion,
-			this.uri
 		);
 	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -28,7 +28,6 @@ import { CachedFunction } from '../../../../../base/common/cache.js';
 import { InlineCompletionViewData, InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
 import { isDefined } from '../../../../../base/common/types.js';
 import { inlineCompletionIsVisible } from './inlineSuggestionItem.js';
-import { URI } from '../../../../../base/common/uri.js';
 
 export type InlineCompletionContextWithoutUuid = Omit<InlineCompletionContext, 'requestUuid'>;
 
@@ -242,7 +241,6 @@ function toInlineSuggestData(
 		inlineCompletion.isInlineEdit ?? false,
 		requestInfo,
 		providerRequestInfo,
-		URI.revive(inlineCompletion.uri)
 	);
 }
 
@@ -302,7 +300,6 @@ export class InlineSuggestData {
 
 		private readonly _requestInfo: InlineSuggestRequestInfo,
 		private readonly _providerRequestInfo: InlineSuggestProviderRequestInfo,
-		public readonly uri: URI | undefined
 	) {
 		this._viewData = { editorType: _requestInfo.editorType };
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
@@ -16,7 +16,6 @@ import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
 import { InlineCompletionItem } from '../../model/inlineSuggestionItem.js';
 import { IInlineEditHost, IInlineEditModel, InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
-import { URI } from '../../../../../../base/common/uri.js';
 
 export class InlineEditModel implements IInlineEditModel {
 
@@ -26,7 +25,6 @@ export class InlineEditModel implements IInlineEditModel {
 	readonly isInDiffEditor: boolean;
 
 	readonly displayLocation: InlineCompletionDisplayLocation | undefined;
-	readonly uri: URI | undefined;
 	readonly showCollapsed: IObservable<boolean>;
 
 	constructor(
@@ -41,7 +39,6 @@ export class InlineEditModel implements IInlineEditModel {
 
 		this.displayLocation = this.inlineEdit.inlineCompletion.displayLocation;
 		this.showCollapsed = this._model.showCollapsed;
-		this.uri = this.inlineEdit.inlineCompletion.uri;
 	}
 
 	accept() {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -36,7 +36,6 @@ import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from
 import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils/utils.js';
 import './view.css';
 import { $ } from '../../../../../../base/browser/dom.js';
-import { isEqual } from '../../../../../../base/common/resources.js';
 
 
 export class InlineEditsView extends Disposable {
@@ -394,7 +393,7 @@ export class InlineEditsView extends Disposable {
 			return this._previousView!.view;
 		}
 
-		if (model.displayLocation || (model.uri && !isEqual(model.uri, this._editor.getModel()?.uri))) {
+		if (model.displayLocation) {
 			return InlineCompletionViewKind.Custom;
 		}
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
@@ -6,7 +6,6 @@
 import { IMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { IObservable } from '../../../../../../base/common/observable.js';
-import { URI } from '../../../../../../base/common/uri.js';
 import { Command, InlineCompletionCommand, InlineCompletionDisplayLocation } from '../../../../../common/languages.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
 
@@ -36,7 +35,6 @@ export interface IInlineEditModel {
 	tabAction: IObservable<InlineEditTabAction>;
 	showCollapsed: IObservable<boolean>;
 	displayLocation: InlineCompletionDisplayLocation | undefined;
-	uri: URI | undefined;
 
 	handleInlineEditShown(viewKind: string, viewData?: InlineCompletionViewData): void;
 	accept(): void;
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -7527,10 +7527,6 @@ declare namespace monaco.languages {
 		readonly showRange?: IRange;
 		readonly warning?: InlineCompletionWarning;
 		readonly displayLocation?: InlineCompletionDisplayLocation;
-		/**
-		 * The Uri of the document this completion item is associated with.
-		 */
-		readonly uri?: UriComponents;
 	}
 
 	export interface InlineCompletionWarning {
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -1428,7 +1428,6 @@ class InlineCompletionAdapter {
 					completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
 					isInlineEdit: this._isAdditionsProposedApiEnabled ? item.isInlineEdit : false,
 					showInlineEditMenu: this._isAdditionsProposedApiEnabled ? item.showInlineEditMenu : false,
-					uri: item.uri ? URI.revive(item.uri) : undefined,
 					displayLocation: (item.displayLocation && this._isAdditionsProposedApiEnabled) ? {
 						range: typeConvert.Range.from(item.displayLocation.range),
 						label: item.displayLocation.label,
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
@@ -1793,7 +1793,6 @@ export class CompletionItem implements vscode.CompletionItem {
 	textEdit?: TextEdit;
 	additionalTextEdits?: TextEdit[];
 	command?: vscode.Command;
-	uri?: vscode.Uri;
 
 	constructor(label: string | CompletionItemLabel, kind?: CompletionItemKind) {
 		this.label = label;
diff --git a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -46,10 +46,6 @@ declare module 'vscode' {
 		action?: Command;
 
 		displayLocation?: InlineCompletionDisplayLocation;
-		/**
-		 * The Uri of the document this completion item is associated with.
-		 */
-		uri?: Uri;
 	}
 
 	export interface InlineCompletionDisplayLocation {

Original file line number	Diff line number	Diff line change
`@@ -832,10 +832,6 @@ export interface InlineCompletion {`
`832`	`832`	`readonly warning?: InlineCompletionWarning;`
`833`	`833`
`834`	`834`	`readonly displayLocation?: InlineCompletionDisplayLocation;`
`835`		`- /**`
`836`		`- * The Uri of the document this completion item is associated with.`
`837`		`- */`
`838`		`- readonly uri?: UriComponents;`
`839`	`835`	`}`
`840`	`836`
`841`	`837`	`export interface InlineCompletionWarning {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from`
`36`	`36`	`import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils/utils.js';`
`37`	`37`	`import './view.css';`
`38`	`38`	`import { $ } from '../../../../../../base/browser/dom.js';`
`39`		`-import { isEqual } from '../../../../../../base/common/resources.js';`
`40`	`39`
`41`	`40`
`42`	`41`	`export class InlineEditsView extends Disposable {`
`@@ -394,7 +393,7 @@ export class InlineEditsView extends Disposable {`
`394`	`393`	`return this._previousView!.view;`
`395`	`394`	`}`
`396`	`395`
`397`		`- if (model.displayLocation \|\| (model.uri && !isEqual(model.uri, this._editor.getModel()?.uri))) {`
	`396`	`+ if (model.displayLocation) {`
`398`	`397`	`return InlineCompletionViewKind.Custom;`
`399`	`398`	`}`
`400`	`399`