Skip to content

Ensure that workspaceFolder field in API points to workspace folder when available. #20107

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

Closed
wants to merge 1 commit into from
Closed

Ensure that workspaceFolder field in API points to workspace folder when available. #20107

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion src/client/common/vscodeApis/workspaceApis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import { ConfigurationScope, workspace, WorkspaceConfiguration, WorkspaceFolder } from 'vscode';
import { ConfigurationScope, Uri, workspace, WorkspaceConfiguration, WorkspaceFolder } from 'vscode';

export function getWorkspaceFolder(resource: Uri | undefined): WorkspaceFolder | undefined {
return resource ? workspace.getWorkspaceFolder(resource) : resource;
}

export function getWorkspaceFolders(): readonly WorkspaceFolder[] | undefined {
return workspace.workspaceFolders;
Expand Down
3 changes: 2 additions & 1 deletion src/client/proposedApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
import { DeprecatedProposedAPI } from './deprecatedProposedApiTypes';
import { IEnvironmentVariablesProvider } from './common/variables/types';
import { IWorkspaceService } from './common/application/types';
import { getWorkspaceFolder } from './common/vscodeApis/workspaceApis';

type ActiveEnvironmentChangeEvent = {
resource: WorkspaceFolder | undefined;
Expand Down Expand Up @@ -280,7 +281,7 @@ export function convertCompleteEnvInfo(env: PythonEnvInfo): ResolvedEnvironment
type: convertEnvType(env.type),
name: env.name,
folderUri: Uri.file(env.location),
workspaceFolder: env.searchLocation,
workspaceFolder: getWorkspaceFolder(env.searchLocation)?.uri,
}
: undefined,
version: version as ResolvedEnvironment['version'],
Expand Down