From d8928b995252b7c3d44c514b269ac01cdc55ad3c Mon Sep 17 00:00:00 2001 From: "Andrew Lindesay [Canva]" <143454275+andponlin-canva@users.noreply.github.com> Date: Sat, 19 Oct 2024 02:49:53 +1300 Subject: [PATCH] Python code-gen; rename query methods (#6887) The class `TargetTagFilter` is about filtering targets by tag and is agnostic about its use for the code-gen filtering. This commit renames the methods to make this more obvious. --- .../blaze/base/dependencies/BlazeQueryTargetTagFilter.java | 2 +- .../idea/blaze/base/dependencies/TargetTagFilter.java | 6 +++--- .../idea/blaze/base/sync/SyncProjectTargetsHelper.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryTargetTagFilter.java b/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryTargetTagFilter.java index f22c100bd57..ff6cda3c763 100644 --- a/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryTargetTagFilter.java +++ b/base/src/com/google/idea/blaze/base/dependencies/BlazeQueryTargetTagFilter.java @@ -64,7 +64,7 @@ public class BlazeQueryTargetTagFilter implements TargetTagFilter { @Nullable @Override - public List doFilterCodeGen( + public List doFilter( Project project, BlazeContext context, List targets, diff --git a/base/src/com/google/idea/blaze/base/dependencies/TargetTagFilter.java b/base/src/com/google/idea/blaze/base/dependencies/TargetTagFilter.java index e82ea587f6d..222ee43b01b 100644 --- a/base/src/com/google/idea/blaze/base/dependencies/TargetTagFilter.java +++ b/base/src/com/google/idea/blaze/base/dependencies/TargetTagFilter.java @@ -49,13 +49,13 @@ static boolean hasProvider() { * @param targets is a list of Bazel targets to filter. * @return a subset of the supplied targets that include one of the supplied {code tags}. */ - static List filterCodeGen( + static List filter( Project project, BlazeContext context, List targets, Set tags) { return Arrays.stream(EP_NAME.getExtensions()) - .map(p -> p.doFilterCodeGen(project, context, targets, tags)) + .map(p -> p.doFilter(project, context, targets, tags)) .filter(Objects::nonNull) .findFirst() .orElse(ImmutableList.of()); @@ -65,7 +65,7 @@ static List filterCodeGen( * {@see #filterCodeGen} */ @Nullable - List doFilterCodeGen( + List doFilter( Project project, BlazeContext context, List targets, diff --git a/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java b/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java index 84f87d1aaeb..8c8e9a88616 100644 --- a/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java +++ b/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java @@ -199,7 +199,7 @@ private static ImmutableList deriveTargetsFromDirectories( .collect(Collectors.toSet()); if (!activeLanguageCodeGeneratorTags.isEmpty() && projectViewSet.getScalarValue(EnablePythonCodegenSupport.KEY).orElse(false)) { - retainedByCodeGen = TargetTagFilter.filterCodeGen( + retainedByCodeGen = TargetTagFilter.filter( project, context, rejectedByKind,