[SourceKit] Report attributes of decls for the indexing request.

Author: akyrtzi

include/swift/Index/IndexSymbol.h

@@ -19,6 +19,7 @@
 
 namespace swift {
 class Decl;
+class ValueDecl;
 
 namespace index {
 
@@ -92,6 +93,7 @@ using SymbolRole = clang::index::SymbolRole;
 using SymbolRoleSet = clang::index::SymbolRoleSet;
 
 struct IndexSymbol {
+  const ValueDecl *decl;
   SymbolKind kind;
   SymbolSubKindSet subKinds = SymbolSubKindSet(0);
   SymbolRoleSet roles = SymbolRoleSet(0);

lib/Index/Index.cpp

@@ -761,6 +761,7 @@ bool IndexSwiftASTWalker::reportRef(ValueDecl *D, SourceLoc Loc) {
 bool IndexSwiftASTWalker::initIndexSymbol(ValueDecl *D, SourceLoc Loc,
                                           bool IsRef, IndexSymbol &Info) {
   assert(D);
+  Info.decl = D;
   Info.kind = getSymbolKindForDecl(D);
   if (Info.kind == SymbolKind::Unknown)
     return true;

test/SourceKit/Indexing/index.swift.response

@@ -676,6 +676,11 @@
               key.line: 77,
               key.column: 31
             }
+          ],
+          key.attributes: [
+            {
+              key.attribute: source.decl.attribute.override
+            }
           ]
         }
       ]
@@ -1052,6 +1057,11 @@
               key.column: 11,
               key.receiver_usr: "s:C5index2B1"
             }
+          ],
+          key.attributes: [
+            {
+              key.attribute: source.decl.attribute.override
+            }
           ]
         }
       ]
@@ -1228,6 +1238,11 @@
               key.receiver_usr: "s:C5index3CC4",
               key.is_dynamic: 1
             }
+          ],
+          key.attributes: [
+            {
+              key.attribute: source.decl.attribute.convenience
+            }
           ]
         }
       ]
@@ -1323,6 +1338,11 @@
                   key.line: 169,
                   key.column: 7
                 }
+              ],
+              key.attributes: [
+                {
+                  key.attribute: source.decl.attribute.final
+                }
               ]
             },
             {
@@ -1338,6 +1358,11 @@
                   key.line: 172,
                   key.column: 7
                 }
+              ],
+              key.attributes: [
+                {
+                  key.attribute: source.decl.attribute.final
+                }
               ]
             }
           ]
@@ -1370,7 +1395,12 @@
               key.kind: source.lang.swift.decl.function.accessor.didset,
               key.usr: "s:FC5index12rdar18640140W2S1Si",
               key.line: 186,
-              key.column: 5
+              key.column: 5,
+              key.attributes: [
+                {
+                  key.attribute: source.decl.attribute.final
+                }
+              ]
             }
           ]
         },
@@ -1427,14 +1457,24 @@
       key.name: "ConditionalUnavailableClass1",
       key.usr: "s:C5index28ConditionalUnavailableClass1",
       key.line: 204,
-      key.column: 7
+      key.column: 7,
+      key.attributes: [
+        {
+          key.attribute: source.decl.attribute.available
+        }
+      ]
     },
     {
       key.kind: source.lang.swift.decl.class,
       key.name: "ConditionalUnavailableClass2",
       key.usr: "s:C5index28ConditionalUnavailableClass2",
       key.line: 208,
-      key.column: 7
+      key.column: 7,
+      key.attributes: [
+        {
+          key.attribute: source.decl.attribute.available
+        }
+      ]
     }
   ]
 }

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -39,6 +39,7 @@ struct EntityInfo {
   bool IsTestCandidate = false;
   unsigned Line = 0;
   unsigned Column = 0;
+  ArrayRef<UIdent> Attrs;
 
   EntityInfo() = default;
 };

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -104,6 +104,12 @@ class SKIndexDataConsumer : public IndexDataConsumer {
     info.ReceiverUSR = symbol.receiverUSR;
     info.IsDynamic = symbol.roles & (unsigned)SymbolRole::Dynamic;
     info.IsTestCandidate = symbol.subKinds & SymbolSubKind::UnitTest;
+    std::vector<UIdent> uidAttrs;
+    if (!isRef) {
+      uidAttrs =
+        SwiftLangSupport::UIDsFromDeclAttributes(symbol.decl->getAttrs());
+      info.Attrs = uidAttrs;
+    }
     return func(info);
   }
 

tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp

@@ -889,6 +889,14 @@ bool SKIndexingConsumer::startSourceEntity(const EntityInfo &Info) {
   if (Info.IsTestCandidate)
     Elem.setBool(KeyIsTestCandidate, true);
 
+  if (!Info.Attrs.empty()) {
+    auto AttrArray = Elem.setArray(KeyAttributes);
+    for (auto Attr : Info.Attrs) {
+      auto AttrDict = AttrArray.appendDictionary();
+      AttrDict.set(KeyAttribute, Attr);
+    }
+  }
+
   EntitiesStack.push_back({ Info.Kind, Elem, ResponseBuilder::Array(),
                             ResponseBuilder::Array()});
   return true;