[SourceKit] Add builtin attribute tags

As promised, tag the whole attribute include all of its 'parameters'.

rdar://problem/24292226

Author: benlangmuir

include/swift/AST/ASTPrinter.h

@@ -60,6 +60,7 @@ enum class PrintStructureKind {
   GenericParameter,
   GenericRequirement,
   FunctionParameter,
+  BuiltinAttribute,
 };
 
 /// An abstract class used to print an AST.

lib/AST/Attr.cpp

@@ -20,6 +20,7 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Types.h"
+#include "swift/Basic/Defer.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/StringSwitch.h"
@@ -298,7 +299,9 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options)
     if (DeclAttribute::isDeclModifier(getKind())) {
       Printer.printKeyword(getAttrName());
     } else {
+      Printer.callPrintStructurePre(PrintStructureKind::BuiltinAttribute);
       Printer.printAttrName(getAttrName(), /*needAt=*/true);
+      Printer.printStructurePost(PrintStructureKind::BuiltinAttribute);
     }
     return true;
 
@@ -311,6 +314,9 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options)
     break;
   }
 
+  Printer.callPrintStructurePre(PrintStructureKind::BuiltinAttribute);
+  defer { Printer.printStructurePost(PrintStructureKind::BuiltinAttribute); };
+
   switch (getKind()) {
   case DAK_Semantics:
     Printer.printAttrName("@_semantics");

test/SourceKit/DocSupport/doc_clang_module.swift.response

@@ -3656,15 +3656,15 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     key.usr: "c:@F@fooFuncNoreturn1",
     key.offset: 1606,
     key.length: 33,
-    key.fully_annotated_decl: "<decl.function.free><syntaxtype.attribute.name>@noreturn</syntaxtype.attribute.name> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncNoreturn1</decl.name>()</decl.function.free>"
+    key.fully_annotated_decl: "<decl.function.free><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@noreturn</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncNoreturn1</decl.name>()</decl.function.free>"
   },
   {
     key.kind: source.lang.swift.decl.function.free,
     key.name: "fooFuncNoreturn2()",
     key.usr: "c:@F@fooFuncNoreturn2",
     key.offset: 1640,
     key.length: 33,
-    key.fully_annotated_decl: "<decl.function.free><syntaxtype.attribute.name>@noreturn</syntaxtype.attribute.name> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncNoreturn2</decl.name>()</decl.function.free>"
+    key.fully_annotated_decl: "<decl.function.free><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@noreturn</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncNoreturn2</decl.name>()</decl.function.free>"
   },
   {
     key.kind: source.lang.swift.decl.function.free,
@@ -4270,7 +4270,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
         key.usr: "c:objc(cs)FooClassPropertyOwnership(py)copyable",
         key.offset: 3701,
         key.length: 35,
-        key.fully_annotated_decl: "<decl.var.instance><syntaxtype.attribute.name>@NSCopying</syntaxtype.attribute.name> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>copyable</decl.name>: <decl.var.type><ref.protocol usr=\"s:Ps9AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
+        key.fully_annotated_decl: "<decl.var.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@NSCopying</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>copyable</decl.name>: <decl.var.type><ref.protocol usr=\"s:Ps9AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
       },
       {
         key.kind: source.lang.swift.decl.var.instance,

test/SourceKit/SourceDocInfo/cursor_info.swift

@@ -463,11 +463,11 @@ func genReq<U, V: P1 where V.T == U>(u: U, v: V) {}
 
 // RUN: %sourcekitd-test -req=cursor -pos=119:13 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK54
 // CHECK54: source.lang.swift.decl.class (119:13-119:15)
-// CHECK54: <decl.class><syntaxtype.attribute.name>@objc</syntaxtype.attribute.name> <syntaxtype.keyword>class
+// CHECK54: <decl.class><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@objc</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>class
 
 // RUN: %sourcekitd-test -req=cursor -pos=122:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK55
 // CHECK55: source.lang.swift.decl.function.method.instance (122:8-122:12)
-// CHECK55: <decl.function.method.instance><syntaxtype.attribute.name>@objc</syntaxtype.attribute.name>(mmm1) <syntaxtype.attribute.name>@noreturn</syntaxtype.attribute.name> <syntaxtype.keyword>func
+// CHECK55: <decl.function.method.instance><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@objc</syntaxtype.attribute.name>(mmm1)</syntaxtype.attribute.builtin> <syntaxtype.attribute.builtin><syntaxtype.attribute.name>@noreturn</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>func
 
 // RUN: %sourcekitd-test -req=cursor -pos=126:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK56
 // CHECK56: source.lang.swift.decl.var.instance (126:7-126:9)

tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp

@@ -78,6 +78,8 @@ static StringRef getTagForParameter(PrintStructureKind context) {
     return "decl.generic_type_param";
   case PrintStructureKind::GenericRequirement:
     return "decl.generic_type_requirement";
+  case PrintStructureKind::BuiltinAttribute:
+    return "syntaxtype.attribute.builtin";
   }
   llvm_unreachable("unexpected parameter kind");
 }
@@ -257,7 +259,8 @@ class FullyAnnotatedDeclarationPrinter final : public XMLEscapingPrinter {
       return parameterTypeTag;
     if (context.is(PrintStructureKind::GenericParameter))
       return genericParamTypeTag;
-    if (context.is(PrintStructureKind::GenericRequirement))
+    if (context.is(PrintStructureKind::GenericRequirement) ||
+        context.is(PrintStructureKind::BuiltinAttribute))
       return "";
 
     assert(context.getDecl() && "unexpected context kind");