Skip to content

Commit 56e4147

Browse files
committed
Add supprot for filter in aquery
1 parent 3fa0b1a commit 56e4147

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

refresh.template.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ def _get_commands(target: str, flags: str):
942942
# Aquery docs if you need em: https://docs.bazel.build/versions/master/aquery.html
943943
# Aquery output proto reference: https://github.com/bazelbuild/bazel/blob/master/src/main/protobuf/analysis_v2.proto
944944
# One bummer, not described in the docs, is that aquery filters over *all* actions for a given target, rather than just those that would be run by a build to produce a given output. This mostly isn't a problem, but can sometimes surface extra, unnecessary, misconfigured actions. Chris has emailed the authors to discuss and filed an issue so anyone reading this could track it: https://github.com/bazelbuild/bazel/issues/14156.
945-
f"mnemonic('(Objc|Cpp|Swift)Compile',deps({target}))",
945+
f"mnemonic('(Objc|Cpp|Swift)Compile', inputs('{input_filter}', deps({target})))",
946946
# We switched to jsonproto instead of proto because of https://github.com/bazelbuild/bazel/issues/13404. We could change back when fixed--reverting most of the commit that added this line and tweaking the build file to depend on the target in that issue. That said, it's kinda nice to be free of the dependency, unless (OPTIMNOTE) jsonproto becomes a performance bottleneck compated to binary protos.
947947
'--output=jsonproto',
948948
# We'll disable artifact output for efficiency, since it's large and we don't use them. Small win timewise, but dramatically less json output from aquery.

refresh_compile_commands.bzl

+5-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ def refresh_compile_commands(
6363
targets = None,
6464
exclude_headers = None,
6565
exclude_external_sources = False,
66+
input_filter = ".*",
6667
**kwargs): # For the other common attributes. Tags, compatible_with, etc. https://docs.bazel.build/versions/main/be/common-definitions.html#common-attributes.
6768
# Convert the various, acceptable target shorthands into the dictionary format
6869
# In Python, `type(x) == y` is an antipattern, but [Starlark doesn't support inheritance](https://bazel.build/rules/language), so `isinstance` doesn't exist, and this is the correct way to switch on type.
@@ -79,7 +80,7 @@ def refresh_compile_commands(
7980

8081
# Generate runnable python script from template
8182
script_name = name + ".py"
82-
_expand_template(name = script_name, labels_to_flags = targets, exclude_headers = exclude_headers, exclude_external_sources = exclude_external_sources, **kwargs)
83+
_expand_template(name = script_name, labels_to_flags = targets, exclude_headers = exclude_headers, exclude_external_sources = exclude_external_sources, input_filter = input_filter, **kwargs)
8384
native.py_binary(name = name, srcs = [script_name], **kwargs)
8485

8586
def _expand_template_impl(ctx):
@@ -94,7 +95,8 @@ def _expand_template_impl(ctx):
9495
" {target_flag_pairs}": "\n".join([" {},".format(pair) for pair in ctx.attr.labels_to_flags.items()]),
9596
" {windows_default_include_paths}": "\n".join([" %r," % path for path in find_cpp_toolchain(ctx).built_in_include_directories]), # find_cpp_toolchain is from https://docs.bazel.build/versions/main/integrating-with-rules-cc.html
9697
"{exclude_headers}": '"' + str(ctx.attr.exclude_headers) + '"',
97-
"{exclude_external_sources}": str(ctx.attr.exclude_external_sources)
98+
"{exclude_external_sources}": str(ctx.attr.exclude_external_sources),
99+
"{input_filter}": "'" + ctx.attr.input_filter + "'"
98100
},
99101
)
100102
return DefaultInfo(files = depset([script]))
@@ -104,6 +106,7 @@ _expand_template = rule(
104106
"labels_to_flags": attr.string_dict(mandatory = True), # string keys instead of label_keyed because Bazel doesn't support parsing wildcard target patterns (..., *, :all) in BUILD attributes.
105107
"exclude_external_sources": attr.bool(default = False),
106108
"exclude_headers": attr.string(values = ["all", "external", ""]), # "" needed only for compatibility with Bazel < 3.6.0
109+
"input_filter": attr.string(default = ".*"),
107110
"_script_template": attr.label(allow_single_file = True, default = "refresh.template.py"),
108111
"_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), # For Windows INCLUDE. If this were eliminated, for example by the resolution of https://github.com/clangd/clangd/issues/123, we'd be able to just use a macro and skylib's expand_template rule: https://github.com/bazelbuild/bazel-skylib/pull/330
109112
},

0 commit comments

Comments
 (0)