Skip to content

fix: try extensionId first in register{Environment,Package}Manager #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flying-sheep wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −15
Open

fix: try extensionId first in register{Environment,Package}Manager #1484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/common/utils/frameUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,28 @@ function getFrameData(): FrameData[] {
}

function getPathFromFrame(frame: FrameData): string {
if (frame.filePath && frame.filePath.startsWith('file://')) {
if (frame.filePath?.startsWith('file://')) {
return Uri.parse(frame.filePath).fsPath;
}
return frame.filePath;
}

export function getCallingExtension(extensionIdHint?: string): string {
export function getCallingExtension(extensionId?: string): string {
const pythonExts = [ENVS_EXTENSION_ID, PYTHON_EXTENSION_ID];
const extensions = allExtensions();

// Use the provided extensionId when available.
// Only accept if it matches an actually loaded extension so we can always return something.
if (extensionId) {
const hintExt = extensions.find((ext) => ext.id === extensionId);
if (hintExt) {
traceVerbose(`Using provided extensionId: ${extensionId}`);
return extensionId;
}
traceWarn(`Provided extensionId '${extensionId}' not found in loaded extensions, ignoring`);
}

// Search the stack as a fallback when no extensionId is provided
const otherExts = extensions.filter((ext) => !pythonExts.includes(ext.id));
const frames = getFrameData();

Expand Down Expand Up @@ -94,19 +107,6 @@ export function getCallingExtension(extensionIdHint?: string): string {
}
}

// Use the provided extensionId hint as a fallback (e.g., during F5 debugging where
// stack-based detection fails because the file path doesn't contain the extension ID).
// Only accept the hint if it matches an actually loaded extension for safety.
if (extensionIdHint) {
const hintExt = extensions.find((ext) => ext.id === extensionIdHint);
if (hintExt) {
traceVerbose(`Using provided extensionId hint: ${extensionIdHint}`);
extensionIdCache.set(cacheKey, extensionIdHint);
return extensionIdHint;
}
traceWarn(`Provided extensionId hint '${extensionIdHint}' not found in loaded extensions, ignoring`);
}

// Fallback - we're likely being called from Python extension or built-in managers
traceWarn(
`Could not determine calling extension from stack frames. ` +
Expand Down