From 015e5954157a6c071b6118b3d9b9f51676ccc6f3 Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 14 Feb 2017 09:45:30 +0000 Subject: Remove special handling of name attribute. Fixes #278 The name attribute gets special treatment in the codebase, in that it's not simply yet another attribute but stored in it's own field. Thus, every callside dealing with attributes needs to be aware of this special case and explicitly handle the name attribute. It's easy to see that this can lead to bugs. For example, querying for the name attribute is currently broken due the querying code not being aware of the special case [1]. Discussions with experienced bazel developers came to the conclusion that there is no need (anymore) to treat the name attribute specially and thus we decided it's best to remove the special treatment and handle the name attribute as any other attribute. This change removes the handling of name attributes and also adds a test case to verify that bug [1] is fixed. [1] https://github.com/bazelbuild/bazel/issues/278 -- PiperOrigin-RevId: 147446345 MOS_MIGRATED_REVID=147446345 --- .../google/devtools/build/lib/query2/output/OutputFormatter.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java') diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java index 7b053163cc..81f2dd1183 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java @@ -418,6 +418,12 @@ public abstract class OutputFormatter implements Serializable { RawAttributeMapper attributeMap = RawAttributeMapper.of(rule); for (Attribute attr : rule.getAttributes()) { + // Ignore the "name" attribute here, as we already print it above. + // This is not strictly necessary, but convention has it that the + // name attribute is printed first. + if ("name".equals(attr.getName())) { + continue; + } if (attributeMap.isConfigurable(attr.getName(), attr.getType())) { continue; // TODO(bazel-team): handle configurable attributes. } -- cgit v1.2.3