Skip to content

Exclude no-ide targets from the initial sync query #7800

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exclude no-ide targets from the initial sync query #7800

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
8 changes: 5 additions & 3 deletions base/src/com/google/idea/blaze/base/dependencies/BlazeQueryDirectoryToTargetProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,19 @@ public static String getQueryString(ImportRoots directories, boolean allowManual
}
}

String query = String.format("attr('tags', '^((?!no-ide).)*$', %s)", targets);

if (allowManualTargetsSync) {
return targets.toString();
return query;
}

// exclude 'manual' targets, which shouldn't be built when expanding wildcard target patterns
if (SystemInfo.isWindows) {
// TODO(b/201974254): Windows support for Bazel sync (see
// https://github.com/bazelbuild/intellij/issues/113).
return String.format("attr('tags', '^((?!manual).)*$', %s)", targets);
return String.format("attr('tags', '^((?!manual).)*$', %s)", query);
}
return String.format("attr(\"tags\", \"^((?!manual).)*$\", %s)", targets);
return String.format("attr(\"tags\", \"^((?!manual).)*$\", %s)", query);
}

/**
Expand Down
5 changes: 3 additions & 2 deletions base/src/com/google/idea/blaze/base/sync/sharding/WildcardTargetExpander.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,9 @@ private static String queryString(List<TargetExpression> targets, boolean exclud
if (targetList.isEmpty()) {
return targetList;
}
String query = String.format("attr('tags', '^((?!no-ide).)*$', %s)", targetList);
return excludeManualTargets
? String.format("attr('tags', '%s', %s)", MANUAL_EXCLUDE_TAG, targetList)
: targetList;
? String.format("attr('tags', '%s', %s)", MANUAL_EXCLUDE_TAG, query)
: query;
}
}
6 changes: 5 additions & 1 deletion ...com/google/idea/blaze/java/base/dependencies/BlazeQueryDirectoryToTargetProviderTest.java
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

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

It would be nice to have an integration test for this, or at least an example project.

Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ public void test() {
true,
workspacePathResolver);

String expQueryString = String.format(
"attr('tags', '^((?!no-ide).)*$', %s - %s)",
TargetExpression.allFromPackageRecursive(included),
TargetExpression.allFromPackageRecursive(excluded));

assertThat(queryString).isEqualTo(TargetExpression.allFromPackageRecursive(included) + " - " + TargetExpression.allFromPackageRecursive(excluded));
assertThat(queryString).isEqualTo(expQueryString);
}
}