Skip to content

add workspace attribute to project setting #404

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 5 commits into from
May 16, 2025
Merged

add workspace attribute to project setting #404

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ec96d1
add workspace attribute to project setting
eleanorjboyd May 13, 2025
faa2fb0
Merge branch 'main' into add-workspace-to-project
eleanorjboyd May 13, 2025
02e5ce1
fix error
eleanorjboyd May 13, 2025
3f41a54
fix based on feedback
eleanorjboyd May 14, 2025
defe6cc
Merge branch 'main' into add-workspace-to-project
eleanorjboyd May 14, 2025
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
11 changes: 5 additions & 6 deletions src/features/projectManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class PythonProjectManagerImpl implements PythonProjectManager {

// For each override, resolve its path and add as a project if not already present
for (const o of overrides) {
let uri: Uri | undefined = undefined;
let UriFromWorkspace: Uri | undefined = undefined;
// if override has a workspace property, resolve the path relative to that workspace
if (o.workspace) {
//
Expand All @@ -76,14 +76,13 @@ export class PythonProjectManagerImpl implements PythonProjectManager {
if (workspaceFolder.uri.toString() !== w.uri.toString()) {
continue; // skip if the workspace is not the same as the current workspace
}
uri = Uri.file(path.resolve(workspaceFolder.uri.fsPath, o.path));
UriFromWorkspace = Uri.file(path.resolve(workspaceFolder.uri.fsPath, o.path));
}
}
if (uri === undefined) {
uri = Uri.file(path.resolve(w.uri.fsPath, o.path));
}
const uri = UriFromWorkspace ? UriFromWorkspace : Uri.file(path.resolve(w.uri.fsPath, o.path));

// Check if the project already exists in the newProjects array
if (!newProjects.some((p) => p.uri.toString() === uri.toString())) {
if (!newProjects.some((p) => p.uri.toString() === uri.toString())) {
newProjects.push(new PythonProjectsImpl(o.path, uri));
}
}
Expand Down