Fix duplicate project roots in multi-root workspaces - #1061
Draft
wenyt (wenytang-ms) wants to merge 10 commits into
Draft
Fix duplicate project roots in multi-root workspaces#1061wenyt (wenytang-ms) wants to merge 10 commits into
wenyt (wenytang-ms) wants to merge 10 commits into
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes duplicate or misplaced Java project roots in multi-root workspaces, addressing #1060 and related issue #4478.
Changes:
- Restricts progressive insertion to single-root workspaces and normalizes URI deduplication.
- Refreshes normally for post-readiness import events.
- Adds integration and AutoTest regression coverage.
Reviewed changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
.github/workflows/e2eUI.yml |
Uses Node.js 22 for AutoTest jobs. |
src/languageServerApi/languageServerApiManager.ts |
Refreshes after ready-state imports. |
src/views/dependencyDataProvider.ts |
Guards progressive insertion and normalizes URIs. |
test/e2e-plans/java-dep-project-explorer.yaml |
Adds mixed multi-root UI coverage. |
test/index.ts |
Runs the new multi-root suite. |
test/maven-suite/projectView.test.ts |
Tests equivalent-URI deduplication. |
test/multiple-suite/index.ts |
Configures the multi-root test runner. |
test/multiple-suite/projectView.test.ts |
Tests multi-root node structure. |
test/multiple/multiple-project.code-workspace |
Adds a non-Java workspace root. |
test/non-java/package.json |
Provides the non-Java fixture. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 15fc06b3-db1a-46df-9a34-7e8cd1128ba4
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 15fc06b3-db1a-46df-9a34-7e8cd1128ba4
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
WorkspaceNodeandProjectNoderootsMulti-root workspaces now wait for the final server-ready refresh instead of showing incorrectly grouped progressive placeholders. Single-root progressive loading remains unchanged.
Testing
npm run compilenpm run tslintFixes #1060
Related to redhat-developer/vscode-java#4478
UI verification
Before (#4478): the Java project
genAicmaais incorrectly nested under the non-JavaSagApkGenworkspace folder.After: workspace-folder ownership is preserved:
my-appis undermaven, whilenon-javaremains an empty workspace root.The visibility of an empty non-Java workspace root is separate behavior tracked by #758.