FixIt

Author: segoon

clang-tools-extra/clang-tidy/performance/LostStdMoveCheck.cpp

@@ -9,6 +9,7 @@
 #include "LostStdMoveCheck.h"
 #include "../utils/DeclRefExprUtils.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/Lex/Lexer.h"
 
 using namespace clang::ast_matchers;
 
@@ -111,7 +112,14 @@ void LostStdMoveCheck::check(const MatchFinder::MatchResult& Result) {
     return;
   }
 
-  diag(LastUsage->getBeginLoc(), "could be std::move()");
+
+  const SourceManager &Source = Result.Context->getSourceManager();
+  const auto Range = CharSourceRange::getTokenRange(LastUsage->getSourceRange());
+  const StringRef NeedleExprCode = Lexer::getSourceText(
+      Range, Source,
+      Result.Context->getLangOpts());
+  diag(LastUsage->getBeginLoc(), "could be std::move()")
+	  << FixItHint::CreateReplacement(Range, ("std::move(" + NeedleExprCode + ")").str());
 }
 
 }  // namespace clang::tidy::performance

clang-tools-extra/test/clang-tidy/checkers/performance/lost-std-move.cpp

@@ -23,30 +23,30 @@ void f_arg(std::shared_ptr<int> ptr)
 {
   if (*ptr)
     f(ptr);
-  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: Could be std::move() [performance-lost-std-move]
+  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: could be std::move() [performance-lost-std-move]
 }
 
 void f_rvalue_ref(std::shared_ptr<int>&& ptr)
 {
   if (*ptr)
     f(ptr);
-  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: Could be std::move() [performance-lost-std-move]
+  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: could be std::move() [performance-lost-std-move]
 }
 
 using SharedPtr = std::shared_ptr<int>;
 void f_using(SharedPtr ptr)
 {
   if (*ptr)
     f(ptr);
-  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: Could be std::move() [performance-lost-std-move]
+  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: could be std::move() [performance-lost-std-move]
 }
 
 void f_local()
 {
   std::shared_ptr<int> ptr;
   if (*ptr)
     f(ptr);
-  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: Could be std::move() [performance-lost-std-move]
+  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: could be std::move() [performance-lost-std-move]
 }
 
 void f_move()