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.

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

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

Merged
merged 1 commit into from
Nov 5, 2024
Merged

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

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
4 changes: 3 additions & 1 deletion querysync/java/com/google/idea/blaze/qsync/project/ProjectDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?

.findAny();

if (contentRoot.isEmpty()) {
return contentRoot;
Expand Down
Loading