Support Declaration and Definition tags

Author: chouzz

clang-tools-extra/clangd/AST.cpp

@@ -257,6 +257,23 @@ bool isVirtual(const Decl *D) {
   return false;
 }
 
+bool isUniqueDefinition(const NamedDecl *Decl) {
+  if (auto *Func = dyn_cast<FunctionDecl>(Decl))
+    return Func->isThisDeclarationADefinition();
+  if (auto *Klass = dyn_cast<CXXRecordDecl>(Decl))
+    return Klass->isThisDeclarationADefinition();
+  if (auto *Iface = dyn_cast<ObjCInterfaceDecl>(Decl))
+    return Iface->isThisDeclarationADefinition();
+  if (auto *Proto = dyn_cast<ObjCProtocolDecl>(Decl))
+    return Proto->isThisDeclarationADefinition();
+  if (auto *Var = dyn_cast<VarDecl>(Decl))
+    return Var->isThisDeclarationADefinition();
+  return isa<TemplateTypeParmDecl>(Decl) ||
+         isa<NonTypeTemplateParmDecl>(Decl) ||
+         isa<TemplateTemplateParmDecl>(Decl) || isa<ObjCCategoryDecl>(Decl) ||
+         isa<ObjCImplDecl>(Decl);
+}
+
 SourceLocation nameLocation(const clang::Decl &D, const SourceManager &SM) {
   auto L = D.getLocation();
   // For `- (void)foo` we want `foo` not the `-`.

clang-tools-extra/clangd/AST.h

@@ -184,7 +184,7 @@ bool isConst(const Decl *D);
 bool isStatic(const Decl *D);
 bool isAbstract(const Decl *D);
 bool isVirtual(const Decl *D);
-
+bool isUniqueDefinition(const NamedDecl *Decl);
 /// Returns a nested name specifier loc of \p ND if it was present in the
 /// source, e.g.
 ///     void ns::something::foo() -> returns 'ns::something'

clang-tools-extra/clangd/FindSymbols.cpp

@@ -188,34 +188,36 @@ std::string getSymbolName(ASTContext &Ctx, const NamedDecl &ND) {
   return printName(Ctx, ND);
 }
 
-std::vector<SymbolTag> getSymbolTags(const NamedDecl &ND)
-{
+std::vector<SymbolTag> getSymbolTags(const NamedDecl &ND) {
   std::vector<SymbolTag> Tags;
-  if (ND.isDeprecated()) 
+  if (ND.isDeprecated())
     Tags.push_back(SymbolTag::Deprecated);
-  if (isConst(&ND)) 
-      Tags.push_back(SymbolTag::Constant);
-  if (isStatic(&ND)) 
-      Tags.push_back(SymbolTag::Static);
+  if (isConst(&ND))
+    Tags.push_back(SymbolTag::Constant);
+  if (isStatic(&ND))
+    Tags.push_back(SymbolTag::Static);
   if (isVirtual(&ND))
-      Tags.push_back(SymbolTag::Virtual);
-  
+    Tags.push_back(SymbolTag::Virtual);
+  if (!isa<UnresolvedUsingValueDecl>(ND))
+    Tags.push_back(SymbolTag::Declaration);
+  if (isUniqueDefinition(&ND))
+    Tags.push_back(SymbolTag::Definition);
   if (const FieldDecl *FD = dyn_cast<FieldDecl>(&ND)) {
     switch (FD->getAccess()) {
-      case AS_public:
-        Tags.push_back(SymbolTag::Public);
-        break;
-      case AS_protected:
-        Tags.push_back(SymbolTag::Protected);
-        break;
-      case AS_private:
-        Tags.push_back(SymbolTag::Private);
-        break;
-      default:
-        break;
+    case AS_public:
+      Tags.push_back(SymbolTag::Public);
+      break;
+    case AS_protected:
+      Tags.push_back(SymbolTag::Protected);
+      break;
+    case AS_private:
+      Tags.push_back(SymbolTag::Private);
+      break;
+    default:
+      break;
     }
-  } 
-  
+  }
+
   return Tags;
 }
 

clang-tools-extra/clangd/SemanticHighlighting.cpp

@@ -78,23 +78,6 @@ bool canHighlightName(DeclarationName Name) {
   llvm_unreachable("invalid name kind");
 }
 
-bool isUniqueDefinition(const NamedDecl *Decl) {
-  if (auto *Func = dyn_cast<FunctionDecl>(Decl))
-    return Func->isThisDeclarationADefinition();
-  if (auto *Klass = dyn_cast<CXXRecordDecl>(Decl))
-    return Klass->isThisDeclarationADefinition();
-  if (auto *Iface = dyn_cast<ObjCInterfaceDecl>(Decl))
-    return Iface->isThisDeclarationADefinition();
-  if (auto *Proto = dyn_cast<ObjCProtocolDecl>(Decl))
-    return Proto->isThisDeclarationADefinition();
-  if (auto *Var = dyn_cast<VarDecl>(Decl))
-    return Var->isThisDeclarationADefinition();
-  return isa<TemplateTypeParmDecl>(Decl) ||
-         isa<NonTypeTemplateParmDecl>(Decl) ||
-         isa<TemplateTemplateParmDecl>(Decl) || isa<ObjCCategoryDecl>(Decl) ||
-         isa<ObjCImplDecl>(Decl);
-}
-
 std::optional<HighlightingKind> kindForType(const Type *TP,
                                             const HeuristicResolver *Resolver);
 std::optional<HighlightingKind> kindForDecl(const NamedDecl *D,