feedback

Author: hjanuschka

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

@@ -7,10 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "UseSpanFirstLastCheck.h"
-#include "../utils/ASTUtils.h"
 #include "../utils/Matchers.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Lex/Lexer.h"
@@ -25,6 +23,10 @@ void UseSpanFirstLastCheck::registerMatchers(MatchFinder *Finder) {
       hasType(hasUnqualifiedDesugaredType(recordType(hasDeclaration(
           classTemplateSpecializationDecl(hasName("::std::span"))))));
 
+  const auto SubspanDecl = cxxMethodDecl(
+      hasName("subspan"),
+      ofClass(classTemplateSpecializationDecl(hasName("::std::span"))));
+
   // Match span.subspan(0, n) -> first(n)
   Finder->addMatcher(
       cxxMemberCallExpr(
@@ -64,10 +66,6 @@ void UseSpanFirstLastCheck::check(const MatchFinder::MatchResult &Result) {
   if (!SpanObj)
     return;
 
-  StringRef SpanText = Lexer::getSourceText(
-      CharSourceRange::getTokenRange(SpanObj->getSourceRange()),
-      *Result.SourceManager, Result.Context->getLangOpts());
-
   const auto *SubSpan =
       Result.Nodes.getNodeAs<CXXMemberCallExpr>("first_subspan");
   bool IsFirst = true;
@@ -85,7 +83,9 @@ void UseSpanFirstLastCheck::check(const MatchFinder::MatchResult &Result) {
   StringRef CountText = Lexer::getSourceText(
       CharSourceRange::getTokenRange(Count->getSourceRange()),
       *Result.SourceManager, Result.Context->getLangOpts());
-
+  StringRef SpanText = Lexer::getSourceText(
+      CharSourceRange::getTokenRange(SpanObj->getSourceRange()),
+      *Result.SourceManager, Result.Context->getLangOpts());
   const StringRef FirstOrLast = IsFirst ? "first" : "last";
   std::string Replacement =
       (Twine(SpanText) + "." + FirstOrLast + "(" + CountText + ")").str();

clang-tools-extra/test/clang-tidy/checkers/readability/use-span-first-last.cpp

@@ -147,3 +147,4 @@ void test_different_spans() {
   // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer 'span::last()' over 'subspan()'
   // CHECK-FIXES: auto good2 = s2.last(3);
 }
+