Skip to content
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.

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

fix(qsync): IJ incorrectly recognizes files as external and asks to a… #6964

Merged

Conversation

tpasternak
Copy link
Collaborator

…dd them the the PV

fixes #6963

Checklist

  • I have filed an issue about this change and discussed potential changes with the maintainers.
  • I have received the approval from the maintainers to make this change.
  • This is not a stylistic, refactoring, or cleanup change.

Please note that the maintainers will not be reviewing this change until all checkboxes are ticked. See
the Contributions section in the README for more
details.

Discussion thread for this change

Issue number: <please reference the issue number or url here>

Description of this change

@github-actions github-actions bot added the awaiting-review Awaiting review from Bazel team on PRs label Nov 5, 2024
Copy link
Collaborator

@LeFrosch LeFrosch left a comment

Choose a reason for hiding this comment

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

No conflicts with aosp. LGTM.

@tpasternak tpasternak merged commit a51558f into bazelbuild:master Nov 5, 2024
8 checks passed
@tpasternak tpasternak deleted the fix-incorrect-add-to-file-panel branch November 5, 2024 12:22
@github-actions github-actions bot removed the awaiting-review Awaiting review from Bazel team on PRs label Nov 5, 2024
@@ -172,7 +172,9 @@ public boolean isExcluded(Path workspacePath) {
*/
public Optional<Path> getIncludingContentRoot(Path workspacePath) {
Optional<Path> contentRoot =
projectIncludes().stream().filter(workspacePath::startsWith).findAny();
projectIncludes().stream()
.filter(projectInclude -> projectInclude.toString().isEmpty() || workspacePath.startsWith(projectInclude))
Copy link
Collaborator

Choose a reason for hiding this comment

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

@tpasternak what if the file is really outside the workspace, this means that if directories: . is used no file will get the "Add file to project" action?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

For projects containing directories: ., files can be incorrectly recognized as external ones
3 participants