improvements as suggested

Author: 4m4n-x-B4w4ne

clang-tools-extra/clang-tidy/modernize/CMakeLists.txt

@@ -31,7 +31,6 @@ add_clang_library(clangTidyModernizeModule STATIC
   UseAutoCheck.cpp
   UseBoolLiteralsCheck.cpp
   UseConstraintsCheck.cpp
-  UseCppStyleCommentsCheck.cpp
   UseDefaultMemberInitCheck.cpp
   UseDesignatedInitializersCheck.cpp
   UseEmplaceCheck.cpp

clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp

@@ -32,7 +32,6 @@
 #include "UseAutoCheck.h"
 #include "UseBoolLiteralsCheck.h"
 #include "UseConstraintsCheck.h"
-#include "UseCppStyleCommentsCheck.h"
 #include "UseDefaultMemberInitCheck.h"
 #include "UseDesignatedInitializersCheck.h"
 #include "UseEmplaceCheck.h"
@@ -108,8 +107,6 @@ class ModernizeModule : public ClangTidyModule {
         "modernize-use-bool-literals");
     CheckFactories.registerCheck<UseConstraintsCheck>(
         "modernize-use-constraints");
-    CheckFactories.registerCheck<UseCppStyleCommentsCheck>(
-        "modernize-use-cpp-style-comments");
     CheckFactories.registerCheck<UseDefaultMemberInitCheck>(
         "modernize-use-default-member-init");
     CheckFactories.registerCheck<UseEmplaceCheck>("modernize-use-emplace");

clang-tools-extra/clang-tidy/readability/UseCppStyleCommentsCheck.cpp

@@ -1,5 +1,4 @@
 //===--- UseCppStyleCommentsCheck.cpp - clang-tidy-------------------------===//
-
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,7 +10,7 @@
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Lex/Lexer.h"
 #include "clang/Lex/Preprocessor.h"
-#include <sstream.h>
+#include <sstream>
 
 using namespace clang::ast_matchers;
 
@@ -67,17 +66,20 @@ class UseCppStyleCommentsCheck::CStyleCommentHandler : public CommentHandler {
     unsigned StartLine = SM.getSpellingLineNumber(CommentStart);
     unsigned EndLine = SM.getSpellingLineNumber(CommentEnd);
 
+    const StringRef Text = Lexer::getSourceText(
+        CharSourceRange::getCharRange(Range), SM, PP.getLangOpts());
+    
     if (StartLine == EndLine) {
-      SourceLocation LineBegin =
+      const SourceLocation LineBegin =
           SM.translateLineCol(SM.getFileID(CommentStart), StartLine, 1);
-      SourceLocation LineEnd =
+      const SourceLocation LineEnd =
           SM.translateLineCol(SM.getFileID(CommentEnd), EndLine,
                               std::numeric_limits<unsigned>::max());
-      StringRef LineContent = Lexer::getSourceText(
+      const StringRef LineContent = Lexer::getSourceText(
           CharSourceRange::getCharRange(LineBegin, LineEnd), SM,
           PP.getLangOpts());
-      size_t CommentStartOffset = SM.getSpellingColumnNumber(CommentStart) - 1;
-      StringRef AfterComment =
+      const size_t CommentStartOffset = SM.getSpellingColumnNumber(CommentStart) - 1;
+      const StringRef AfterComment =
           LineContent.drop_front(CommentStartOffset + Text.size());
 
       if (!AfterComment.trim().empty()) {

clang-tools-extra/clang-tidy/readability/UseCppStyleCommentsCheck.h

@@ -10,6 +10,7 @@
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_USECPPSTYLECOMMENTSCHECK_H
 
 #include "../ClangTidyCheck.h"
+#include <memory>
 
 namespace clang::tidy::readability {
 /// Detects C Style comments and suggests to use C++ style comments instead.

clang-tools-extra/docs/ReleaseNotes.rst

@@ -174,17 +174,17 @@ New checks
   Replace comparisons between signed and unsigned integers with their safe
   C++20 ``std::cmp_*`` alternative, if available.
 
-- New :doc:`modernize-use-cpp-style-comments
-  <clang-tidy/checks/modernize/use-cpp-style-comments>` check.
-
-  Detects C Style comments and suggests to use C++ style comments instead.
-
 - New :doc:`portability-template-virtual-member-function
   <clang-tidy/checks/portability/template-virtual-member-function>` check.
 
   Finds cases when an uninstantiated virtual member function in a template class
   causes cross-compiler incompatibility.
 
+- New :doc:`readability-use-cpp-style-comments
+  <clang-tidy/checks/readability/use-cpp-style-comments>` check.
+
+  Replace C-style comments with C++-style comments.
+  
 New check aliases
 ^^^^^^^^^^^^^^^^^
 

clang-tools-extra/docs/clang-tidy/checks/list.rst

@@ -403,6 +403,7 @@ Clang-Tidy Checks
    :doc:`readability-uniqueptr-delete-release <readability/uniqueptr-delete-release>`, "Yes"
    :doc:`readability-uppercase-literal-suffix <readability/uppercase-literal-suffix>`, "Yes"
    :doc:`readability-use-anyofallof <readability/use-anyofallof>`,
+   :doc:`readability-use-cpp-style-comments <readability/use-cpp-style-comments>`, "Yes"
    :doc:`readability-use-std-min-max <readability/use-std-min-max>`, "Yes"
    :doc:`zircon-temporary-objects <zircon/temporary-objects>`,
 

…cks/modernize/use-cpp-style-comments.rst …s/readability/use-cpp-style-comments.rstclang-tools-extra/docs/clang-tidy/checks/modernize/use-cpp-style-comments.rst renamed to clang-tools-extra/docs/clang-tidy/checks/readability/use-cpp-style-comments.rst clang-tools-extra/docs/clang-tidy/checks/modernize/use-cpp-style-comments.rst renamed to clang-tools-extra/docs/clang-tidy/checks/readability/use-cpp-style-comments.rst

@@ -1,7 +1,7 @@
 .. title:: clang-tidy - use-cpp-style-comments
 
-modernize-use-cpp-style-comments
-================================
+readability-use-cpp-style-comments
+==================================
 
 Replace C-style comments with C++-style comments.
 C-style comments (``/* ... */``) are inherited from C, while C++ introduces 
@@ -37,4 +37,3 @@ Output:
   Example:
   .. code-block:: c++
     int a = /* this is a comment */ 5;
-

…ers/modernize/use-cpp-style-comments.cpp …s/readability/use-cpp-style-comments.cppclang-tools-extra/test/clang-tidy/checkers/modernize/use-cpp-style-comments.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/readability/use-cpp-style-comments.cpp clang-tools-extra/test/clang-tidy/checkers/modernize/use-cpp-style-comments.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/readability/use-cpp-style-comments.cpp

@@ -1,8 +1,8 @@
-// RUN: %check_clang_tidy -std=c++11 %s modernize-use-cpp-style-comments %t -- --
+// RUN: %check_clang_tidy -std=c++11 %s readability-use-cpp-style-comments %t -- --
 
 // Single-line full C-style comment
 static const int CONSTANT = 42; /* Important constant value */
-// CHECK-MESSAGES: :[[@LINE-1]]:33: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+// CHECK-MESSAGES: :[[@LINE-1]]:33: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
 // CHECK-FIXES: static const int CONSTANT = 42; // Important constant value
 
 // Inline comment that should NOT be transformed
@@ -12,7 +12,7 @@ int a = /* inline comment */ 5;
 /* This is a multiline comment
    that spans several lines
    and should be converted to C++ style */
-// CHECK-MESSAGES: :[[@LINE-3]]:1: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+// CHECK-MESSAGES: :[[@LINE-3]]:1: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
 // CHECK-FIXES: // This is a multiline comment
 // CHECK-FIXES: // that spans several lines
 // CHECK-FIXES: // and should be converted to C++ style
@@ -29,40 +29,40 @@ void processData(int data /* input data */,
  * Block comment with asterisks
  * Should be converted to C++ style
  *******************************/
-// CHECK-MESSAGES: :[[@LINE-4]]:1: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+// CHECK-MESSAGES: :[[@LINE-4]]:1: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
 // CHECK-FIXES: // ******************************
 // CHECK-FIXES: // * Block comment with asterisks
 // CHECK-FIXES: // * Should be converted to C++ style
 // CHECK-FIXES: // ******************************
 int calculateSomething() { return 1;}
 // Comment at end of complex line
 int complexCalculation = calculateSomething(); /* Result of complex calculation */
-// CHECK-MESSAGES: :[[@LINE-1]]:48: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+// CHECK-MESSAGES: :[[@LINE-1]]:48: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
 // CHECK-FIXES: int complexCalculation = calculateSomething(); // Result of complex calculation
 
 // Nested comments and edge cases
 void edgeCaseFunction() {
     int x = 10 /* First value */ + 20 /* Second value */;  // Inline comments should not transform
 
     /* Comment with special characters !@#$%^&*()_+ */
-    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
     // CHECK-FIXES: // Comment with special characters !@#$%^&*()_+
 }
 
 // Multiline comment with various indentations
     /* This comment is indented
        and should preserve indentation when converted */
-// CHECK-MESSAGES: :[[@LINE-2]]:5: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+// CHECK-MESSAGES: :[[@LINE-2]]:5: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
 // CHECK-FIXES:     // This comment is indented
 // CHECK-FIXES:     // and should preserve indentation when converted
 
 // Complex function with mixed comment types
 void complexFunction() {
     /* Full line comment at start of block */
-    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
     // CHECK-FIXES: // Full line comment at start of block
 
     int x = 10; /* Inline comment not to be transformed */
-    // CHECK-MESSAGES: :[[@LINE-1]]:17: warning: use C++ style comments '//' instead of C style comments '/*...*/' [modernize-use-cpp-style-comments]
+    // CHECK-MESSAGES: :[[@LINE-1]]:17: warning: use C++ style comments '//' instead of C style comments '/*...*/' [readability-use-cpp-style-comments]
     // CHECK-FIXES: int x = 10; // Inline comment not to be transformed
-}
+}