Skip to content

Avoid prefixing with home when unnecessary #24230

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

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Avoid prefixing with home when unnecessary #24230

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
5 changes: 4 additions & 1 deletion src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,10 @@ function getCustomVirtualEnvDirs(): string[] {
const venvFolders = getPythonSettingAndUntildify<string[]>(VENVFOLDERS_SETTING_KEY) ?? [];
const homeDir = getUserHomeDir();
if (homeDir) {
venvFolders.map((item) => path.join(homeDir, item)).forEach((d) => venvDirs.push(d));
venvFolders
.map((item) => (item.startsWith(homeDir) ? item : path.join(homeDir, item)))
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the path was already rooted with home dir, we'd still prefix with home dir

.forEach((d) => venvDirs.push(d));
venvFolders.forEach((item) => venvDirs.push(untildify(item)));
}
return Array.from(new Set(venvDirs));
}
Expand Down
5 changes: 4 additions & 1 deletion src/client/pythonEnvironments/base/locators/lowLevel/customVirtualEnvLocator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ async function getCustomVirtualEnvDirs(): Promise<string[]> {
const venvFolders = getPythonSetting<string[]>(VENVFOLDERS_SETTING_KEY) ?? [];
const homeDir = getUserHomeDir();
if (homeDir && (await pathExists(homeDir))) {
venvFolders.map((item) => path.join(homeDir, item)).forEach((d) => venvDirs.push(d));
venvFolders
.map((item) => (item.startsWith(homeDir) ? item : path.join(homeDir, item)))
.forEach((d) => venvDirs.push(d));
venvFolders.forEach((item) => venvDirs.push(untildify(item)));
}
return asyncFilter(uniq(venvDirs), pathExists);
}
Expand Down
Loading