add more test case

Author: HerrCai0907

clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp

@@ -10,6 +10,8 @@
 #include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
+#include "clang/Basic/Diagnostic.h"
+#include "clang/Tooling/FixIt.h"
 
 using namespace clang::ast_matchers;
 
@@ -53,11 +55,29 @@ void UnintendedCharOstreamOutputCheck::check(
     const MatchFinder::MatchResult &Result) {
   const auto *Call = Result.Nodes.getNodeAs<CXXOperatorCallExpr>("x");
   const Expr *Value = Call->getArg(1);
-  diag(Call->getOperatorLoc(),
-       "%0 passed to 'operator<<' outputs as character instead of integer. "
-       "cast to 'unsigned' to print numeric value or cast to 'char' to print "
-       "as character")
-      << Value->getType() << Value->getSourceRange();
+  const SourceRange SourceRange = Value->getSourceRange();
+
+  DiagnosticBuilder Builder =
+      diag(Call->getOperatorLoc(),
+           "%0 passed to 'operator<<' outputs as character instead of integer. "
+           "cast to 'unsigned' to print numeric value or cast to 'char' to "
+           "print "
+           "as character")
+      << Value->getType() << SourceRange;
+
+  QualType T = Value->getType();
+  const Type *UnqualifiedDesugaredType = T->getUnqualifiedDesugaredType();
+
+  llvm::StringRef CastType;
+  if (UnqualifiedDesugaredType->isSpecificBuiltinType(BuiltinType::SChar))
+    CastType = "int";
+  else
+    CastType = "unsigned int";
+
+  Builder << FixItHint::CreateReplacement(
+      SourceRange, ("static_cast<" + CastType + ">(" +
+                    tooling::fixit::getText(*Value, *Result.Context) + ")")
+                       .str());
 }
 
 } // namespace clang::tidy::bugprone

clang-tools-extra/test/clang-tidy/checkers/bugprone/unintended-char-ostream-output.cpp

@@ -31,10 +31,12 @@ void origin_ostream(std::ostream &os) {
   unsigned char unsigned_value = 9;
   os << unsigned_value;
   // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'unsigned char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<unsigned int>(unsigned_value);
 
   signed char signed_value = 9;
   os << signed_value;
   // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'signed char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<int>(signed_value);
 
   char char_value = 9;
   os << char_value;
@@ -44,10 +46,12 @@ void based_on_ostream(A &os) {
   unsigned char unsigned_value = 9;
   os << unsigned_value;
   // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'unsigned char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<unsigned int>(unsigned_value);
 
   signed char signed_value = 9;
   os << signed_value;
   // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'signed char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<int>(signed_value);
 
   char char_value = 9;
   os << char_value;
@@ -69,17 +73,20 @@ void template_based_on_ostream(B<int> &os) {
   unsigned char unsigned_value = 9;
   os << unsigned_value;
   // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'unsigned char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<unsigned int>(unsigned_value);
 }
 
 template<class T> void template_fn_1(T &os) {
   unsigned char unsigned_value = 9;
   os << unsigned_value;
   // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'unsigned char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<unsigned int>(unsigned_value);
 }
 template<class T> void template_fn_2(std::ostream &os) {
   T unsigned_value = 9;
   os << unsigned_value;
   // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'unsigned char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<unsigned int>(unsigned_value);
 }
 template<class T> void template_fn_3(std::ostream &os) {
   T unsigned_value = 9;
@@ -91,3 +98,34 @@ void call_template_fn() {
   template_fn_2<unsigned char>(a);
   template_fn_3<char>(a);
 }
+
+using U8 = unsigned char;
+void alias_unsigned_char(std::ostream &os) {
+  U8 v = 9;
+  os << v;
+  // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'U8' (aka 'unsigned char') passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<unsigned int>(v);
+}
+
+using I8 = signed char;
+void alias_signed_char(std::ostream &os) {
+  I8 v = 9;
+  os << v;
+  // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'I8' (aka 'signed char') passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<int>(v);
+}
+
+using C8 = char;
+void alias_char(std::ostream &os) {
+  C8 v = 9;
+  os << v;
+}
+
+
+#define MACRO_VARIANT_NAME a
+void macro_variant_name(std::ostream &os) {
+  unsigned char MACRO_VARIANT_NAME = 9;
+  os << MACRO_VARIANT_NAME;
+  // CHECK-MESSAGES: [[@LINE-1]]:6: warning: 'unsigned char' passed to 'operator<<' outputs as character instead of integer
+  // CHECK-FIXES: os << static_cast<unsigned int>(MACRO_VARIANT_NAME);
+}