extend func

Author: HerrCai0907

clang-tools-extra/clang-tidy/ClangTidyOptions.cpp

@@ -8,6 +8,7 @@
 
 #include "ClangTidyOptions.h"
 #include "ClangTidyModuleRegistry.h"
+#include "clang/Basic/DiagnosticIDs.h"
 #include "clang/Basic/LLVM.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
@@ -71,7 +72,8 @@ struct NOptionMap {
   NOptionMap(IO &, const ClangTidyOptions::OptionMap &OptionMap) {
     Options.reserve(OptionMap.size());
     for (const auto &KeyValue : OptionMap)
-      Options.emplace_back(std::string(KeyValue.getKey()), KeyValue.getValue().Value);
+      Options.emplace_back(std::string(KeyValue.getKey()),
+                           KeyValue.getValue().Value);
   }
   ClangTidyOptions::OptionMap denormalize(IO &) {
     ClangTidyOptions::OptionMap Map;
@@ -135,13 +137,30 @@ template <> struct BlockScalarTraits<MultiLineString> {
   static void output(const MultiLineString &S, void *Ctxt, raw_ostream &OS) {
     OS << S.S;
   }
-
   static StringRef input(StringRef Str, void *Ctxt, MultiLineString &S) {
     S.S = Str;
     return "";
   }
 };
 
+template <> struct ScalarEnumerationTraits<clang::DiagnosticIDs::Level> {
+  static void enumeration(IO &IO, clang::DiagnosticIDs::Level &Level) {
+    IO.enumCase(Level, "Error", clang::DiagnosticIDs::Level::Error);
+    IO.enumCase(Level, "Warning", clang::DiagnosticIDs::Level::Warning);
+    IO.enumCase(Level, "Note", clang::DiagnosticIDs::Level::Note);
+  }
+};
+template <> struct SequenceElementTraits<ClangTidyOptions::CustomCheckDiag> {
+  static const bool flow = false;
+};
+template <> struct MappingTraits<ClangTidyOptions::CustomCheckDiag> {
+  static void mapping(IO &IO, ClangTidyOptions::CustomCheckDiag &D) {
+    IO.mapRequired("BindName", D.BindName);
+    MultiLineString MLS{D.Message};
+    IO.mapRequired("Message", MLS);
+    IO.mapOptional("Level", D.Level);
+  }
+};
 template <> struct SequenceElementTraits<ClangTidyOptions::CustomCheckValue> {
   static const bool flow = false;
 };
@@ -150,6 +169,7 @@ template <> struct MappingTraits<ClangTidyOptions::CustomCheckValue> {
     IO.mapRequired("Name", V.Name);
     MultiLineString MLS{V.Query};
     IO.mapRequired("Query", MLS);
+    IO.mapRequired("Diagnostic", V.Diags);
   }
 };
 

clang-tools-extra/clang-tidy/ClangTidyOptions.h

@@ -9,6 +9,7 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYOPTIONS_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYOPTIONS_H
 
+#include "clang/Basic/DiagnosticIDs.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringMap.h"
@@ -17,6 +18,7 @@
 #include "llvm/Support/MemoryBufferRef.h"
 #include "llvm/Support/VirtualFileSystem.h"
 #include <functional>
+#include <map>
 #include <optional>
 #include <string>
 #include <system_error>
@@ -129,10 +131,15 @@ struct ClangTidyOptions {
   /// Key-value mapping used to store check-specific options.
   OptionMap CheckOptions;
 
+  struct CustomCheckDiag {
+    std::string BindName;
+    std::string Message;
+    std::optional<DiagnosticIDs::Level> Level;
+  };
   struct CustomCheckValue {
     std::string Name;
     std::string Query;
-    // FIXME: extend more features here (e.g. isLanguageVersionSupported, Level)
+    llvm::SmallVector<CustomCheckDiag> Diags;
   };
   using CustomCheckValueList = llvm::SmallVector<CustomCheckValue>;
   std::optional<CustomCheckValueList> CustomChecks;

clang-tools-extra/clang-tidy/custom/CustomTidyModule.cpp

@@ -22,6 +22,7 @@ class CustomModule : public ClangTidyModule {
     for (const ClangTidyOptions::CustomCheckValue &V :
          Options->CustomChecks.value()) {
       CheckFactories.registerCheckFactory(
+          // add custom- prefix to avoid conflicts with builtin checks
           "custom-" + V.Name,
           [&V](llvm::StringRef Name, ClangTidyContext *Context) {
             return std::make_unique<custom::QueryCheck>(Name, V, Context);

clang-tools-extra/clang-tidy/custom/QueryCheck.cpp

@@ -10,6 +10,8 @@
 #include "../../clang-query/Query.h"
 #include "../../clang-query/QueryParser.h"
 #include "clang/ASTMatchers/Dynamic/VariantValue.h"
+#include "clang/Basic/DiagnosticIDs.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 
 using namespace clang::ast_matchers;
@@ -19,7 +21,13 @@ namespace clang::tidy::custom {
 QueryCheck::QueryCheck(llvm::StringRef Name,
                        const ClangTidyOptions::CustomCheckValue &V,
                        ClangTidyContext *Context)
-    : ClangTidyCheck(Name, Context), Matchers{} {
+    : ClangTidyCheck(Name, Context) {
+  for (const ClangTidyOptions::CustomCheckDiag &D : V.Diags) {
+    auto It = Diags.try_emplace(D.BindName, llvm::SmallVector<Diag>{}).first;
+    It->second.emplace_back(
+        Diag{D.Message, D.Level.value_or(DiagnosticIDs::Warning)});
+  }
+
   clang::query::QuerySession QS({});
   llvm::StringRef QueryStringRef{V.Query};
   while (!QueryStringRef.empty()) {
@@ -64,7 +72,9 @@ void QueryCheck::registerMatchers(MatchFinder *Finder) {
 
 void QueryCheck::check(const MatchFinder::MatchResult &Result) {
   for (auto &[Name, Node] : Result.Nodes.getMap())
-    diag(Node.getSourceRange().getBegin(), Name) << Node.getSourceRange();
+    if (Diags.contains(Name))
+      for (const Diag &D : Diags[Name])
+        diag(D.Message, D.Level) << Node.getSourceRange();
 }
 
 } // namespace clang::tidy::custom

clang-tools-extra/clang-tidy/custom/QueryCheck.h

@@ -12,6 +12,7 @@
 #include "../ClangTidyCheck.h"
 #include "clang/ASTMatchers/Dynamic/VariantValue.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringMap.h"
 
 namespace clang::tidy::custom {
 
@@ -28,6 +29,11 @@ class QueryCheck : public ClangTidyCheck {
 
 private:
   llvm::SmallVector<ast_matchers::dynamic::DynTypedMatcher> Matchers{};
+  struct Diag {
+    std::string Message;
+    DiagnosticIDs::Level Level;
+  };
+  llvm::StringMap<llvm::SmallVector<Diag>> Diags{};
 };
 
 } // namespace clang::tidy::custom