deduplicate python hovers and completions in core (cherry-pick from release/2025.12 branch) (#10977)

Cherry-pick #10955 onto the
main branch.

Author: austin3dickey

extensions/positron-python/python_files/posit/positron/positron_jedilsp.py

@@ -303,8 +303,6 @@ def lsp_initialize(self, params: InitializeParams) -> InitializeResult:
 
         # Remove LSP features that are redundant with Pyrefly.
         features_to_remove = [
-            "textDocument/hover",
-            "textDocument/signatureHelp",
             "textDocument/declaration",
             "textDocument/definition",
             "textDocument/typeDefinition",

src/vs/editor/common/languages.ts

@@ -193,6 +193,14 @@ export interface Hover {
 	 * Can decrease the verbosity of the hover
 	 */
 	canDecreaseVerbosity?: boolean;
+
+	// --- Start Positron ---
+	/**
+	 * Id of the extension that provided this hover.
+	 * Used to filter duplicate hovers from certain extensions.
+	 */
+	extensionId?: string;
+	// --- End Positron ---
 }
 
 /**

src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts

@@ -31,6 +31,10 @@ import { IHoverService, WorkbenchHoverDelegate } from '../../../../platform/hove
 import { AsyncIterableProducer } from '../../../../base/common/async.js';
 import { LanguageFeatureRegistry } from '../../../common/languageFeatureRegistry.js';
 import { getHoverProviderResultsAsAsyncIterable } from './getHover.js';
+// --- Start Positron ---
+// eslint-disable-next-line no-duplicate-imports
+import { HoverProviderResult } from './getHover.js';
+// --- End Positron ---
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { HoverStartSource } from './hoverOperation.js';
 import { ScrollEvent } from '../../../../base/common/scrollable.js';
@@ -168,13 +172,29 @@ export class MarkdownHoverParticipant implements IEditorHoverParticipant<Markdow
 		const position = anchor.range.getStartPosition();
 		const hoverProviderResults = getHoverProviderResultsAsAsyncIterable(hoverProviderRegistry, model, position, token);
 
+		// --- Start Positron ---
+		// Collect all hover results first so we can filter out Python extension hovers when other hovers exist
+		// (to avoid redundant hover content from other Python LSP extensions)
+		const allResults: { item: HoverProviderResult; hover: MarkdownHover }[] = [];
 		for await (const item of hoverProviderResults) {
 			if (!isEmptyMarkdownString(item.hover.contents)) {
 				const range = item.hover.range ? Range.lift(item.hover.range) : anchor.range;
 				const hoverSource = new HoverSource(item.hover, item.provider, position);
-				yield new MarkdownHover(this, range, item.hover.contents, false, item.ordinal, hoverSource);
+				const markdownHover = new MarkdownHover(this, range, item.hover.contents, false, item.ordinal, hoverSource);
+				allResults.push({ item, hover: markdownHover });
 			}
 		}
+
+		const msPythonExtensionId = 'ms-python.python';
+		const hasNonMsPythonHovers = allResults.some(r => r.item.hover.extensionId !== msPythonExtensionId);
+		const hasMsPythonHovers = allResults.some(r => r.item.hover.extensionId === msPythonExtensionId);
+		for (const result of allResults) {
+			if (hasNonMsPythonHovers && hasMsPythonHovers && result.item.hover.extensionId === msPythonExtensionId) {
+				continue;
+			}
+			yield result.hover;
+		}
+		// --- End Positron ---
 	}
 
 	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkdownHover[]): IRenderedHoverParts<MarkdownHover> {

src/vs/editor/contrib/suggest/browser/suggest.ts

@@ -326,8 +326,40 @@ export async function provideSuggestionItems(
 		return Promise.reject(new CancellationError());
 	}
 
+	// --- Start Positron ---
+	// Deduplicate completion items that have the same insertText.
+	// When duplicates are found:
+	//   - If one item is from our Python extension and the other is not, prefer the one not from our Python extension.
+	//   - If both items are from our Python extension, the first-seen item is kept.
+	//   - If both items are from other extensions, the first-seen item is kept.
+	const msPythonExtensionId = 'ms-python.python';
+	const deduplicatedResult: CompletionItem[] = [];
+	const seen = new Map<string, CompletionItem>();
+
+	for (const item of result) {
+		const key = item.completion.insertText;
+		const existing = seen.get(key);
+		if (existing) {
+			// If the existing item is from ms-python.python and the new one is not,
+			// replace with the new one
+			if (existing.extensionId?.value === msPythonExtensionId &&
+				item.extensionId?.value !== msPythonExtensionId) {
+				const existingIndex = deduplicatedResult.indexOf(existing);
+				if (existingIndex !== -1) {
+					deduplicatedResult[existingIndex] = item;
+					seen.set(key, item);
+				}
+			}
+		} else {
+			// Otherwise, keep the existing item (skip the duplicate)
+			seen.set(key, item);
+			deduplicatedResult.push(item);
+		}
+	}
+
 	return new CompletionItemModel(
-		result.sort(getSuggestionComparator(options.snippetSortOrder)),
+		deduplicatedResult.sort(getSuggestionComparator(options.snippetSortOrder)),
+		// --- End Positron ---
 		needsClipboard,
 		{ entries: durations, elapsed: sw.elapsed() },
 		disposables,

src/vs/monaco.d.ts

@@ -7229,6 +7229,11 @@ declare namespace monaco.languages {
 		 * Can decrease the verbosity of the hover
 		 */
 		canDecreaseVerbosity?: boolean;
+		/**
+		 * Id of the extension that provided this hover.
+		 * Used to filter duplicate hovers from certain extensions.
+		 */
+		extensionId?: string;
 	}
 
 	/**

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

@@ -1863,6 +1863,12 @@ export interface HoverWithId extends languages.Hover {
 	 * Id of the hover
 	 */
 	id: number;
+	// --- Start Positron ---
+	/**
+	 * Id of the extension that provided this hover
+	 */
+	extensionId?: string;
+	// --- End Positron ---
 }
 
 // -- extension host

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

@@ -42,6 +42,17 @@ import { IInlineCompletionsUnificationState } from '../../services/inlineComplet
 
 // --- Start Positron ---
 import type * as positron from 'positron';
+
+/**
+ * Extracts plain text from a markdown string by removing code block syntax.
+ */
+function extractPlainTextFromMarkdown(text: string): string {
+	return text
+		.trim()
+		.replace(/^```\w*\n?/gm, '')
+		.replace(/```$/gm, '')
+		.trim();
+}
 // --- End Positron ---
 
 // --- adapter
@@ -276,6 +287,9 @@ class HoverAdapter {
 	constructor(
 		private readonly _documents: ExtHostDocuments,
 		private readonly _provider: vscode.HoverProvider,
+		// --- Start Positron ---
+		private readonly _extensionId: string,
+		// --- End Positron ---
 	) { }
 
 	async provideHover(resource: URI, position: IPosition, context: languages.HoverContext<{ id: number }> | undefined, token: CancellationToken): Promise<extHostProtocol.HoverWithId | undefined> {
@@ -298,6 +312,18 @@ class HoverAdapter {
 		if (!value || isFalsyOrEmpty(value.contents)) {
 			return undefined;
 		}
+		// --- Start Positron ---
+		// Filter out hovers that only contain "Unknown" text (possibly in a markdown code block).
+		// This is because that's the literal message Pyrefly sends when it has no useful hover info to provide.
+		const contentsText = extractPlainTextFromMarkdown(
+			value.contents
+				.map(c => typeof c === 'string' ? c : typeof c === 'object' && 'value' in c ? c.value : '')
+				.join('')
+		);
+		if (contentsText === 'Unknown') {
+			return undefined;
+		}
+		// --- End Positron ---
 		if (!value.range) {
 			value.range = doc.getWordRangeAtPosition(pos);
 		}
@@ -315,7 +341,10 @@ class HoverAdapter {
 		this._hoverCounter += 1;
 		const hover: extHostProtocol.HoverWithId = {
 			...convertedHover,
-			id
+			id,
+			// --- Start Positron ---
+			extensionId: this._extensionId,
+			// --- End Positron ---
 		};
 		return hover;
 	}
@@ -1568,6 +1597,16 @@ class SignatureHelpAdapter {
 
 		const value = await this._provider.provideSignatureHelp(doc, pos, token, vscodeContext);
 		if (value) {
+			// --- Start Positron ---
+			// Filter out signature help that only contains "Unknown" text (possibly in a markdown code block).
+			// This is because that's the literal message Pyrefly sends when it has no useful info to provide.
+			const allSignaturesUnknown = value.signatures.length > 0 && value.signatures.every(sig =>
+				extractPlainTextFromMarkdown(sig.label) === 'Unknown'
+			);
+			if (allSignaturesUnknown) {
+				return undefined;
+			}
+			// --- End Positron ---
 			const id = this._cache.add([value]);
 			return { ...typeConvert.SignatureHelp.from(value), id };
 		}
@@ -2383,7 +2422,10 @@ export class ExtHostLanguageFeatures extends CoreDisposable implements extHostPr
 	// --- extra info
 
 	registerHoverProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.HoverProvider, extensionId?: ExtensionIdentifier): vscode.Disposable {
-		const handle = this._addNewAdapter(new HoverAdapter(this._documents, provider), extension);
+		// --- Start Positron ---
+		// added extensionId parameter to HoverAdapter
+		const handle = this._addNewAdapter(new HoverAdapter(this._documents, provider, extension.identifier.value), extension);
+		// --- End Positron ---
 		this._proxy.$registerHoverProvider(handle, this._transformDocumentSelector(selector, extension));
 		return this._createDisposable(handle);
 	}