import result types for message exprs, catch explicit casts

Author: Richard Howell

ImportCallbacks.cpp

@@ -60,6 +60,13 @@ namespace import_tidy {
     }
   }
 
+  void CastExprCallback::run(const MatchFinder::MatchResult &Result) {
+    if (auto *CE = Result.Nodes.getNodeAs<CStyleCastExpr>(nodeKey)) {
+      auto &SM = *Result.SourceManager;
+      Matcher.addType(SM.getMainFileID(), CE->getType(), SM);
+    }
+  }
+
   void CategoryCallback::run(const MatchFinder::MatchResult &Result) {
     if (auto *CD = Result.Nodes.getNodeAs<ObjCCategoryDecl>(nodeKey)) {
       auto &SM = *Result.SourceManager;
@@ -150,13 +157,12 @@ namespace import_tidy {
     if (auto *E = Result.Nodes.getNodeAs<ObjCMessageExpr>(nodeKey)) {
       auto &SM = *Result.SourceManager;
       Matcher.addImport(SM.getMainFileID(), E->getMethodDecl(), SM);
+      Matcher.addType(SM.getMainFileID(), E->getType(), SM);
 
       if (auto *ID = E->getReceiverInterface()) {
         Matcher.addImport(SM.getMainFileID(), ID, SM);
-      } else if (auto *Ptr = E->getReceiverType()->getAs<ObjCObjectPointerType>()) {
-        for (auto i = Ptr->qual_begin(); i != Ptr->qual_end(); i++) {
-          Matcher.addImport(SM.getMainFileID(), *i, SM);
-        }
+      } else {
+        Matcher.addType(SM.getMainFileID(), E->getReceiverType(), SM);
       }
     }
   }

ImportCallbacks.h

@@ -29,6 +29,7 @@ namespace import_tidy {
   };
 
   IMPORTCALLBACK(CallExprCallback)
+  IMPORTCALLBACK(CastExprCallback)
   IMPORTCALLBACK(CategoryCallback)
   IMPORTCALLBACK(DeclRefCallback)
   IMPORTCALLBACK(FuncDeclCallback)

ImportMatcher.cpp

@@ -98,6 +98,7 @@ namespace import_tidy {
   std::unique_ptr<FrontendActionFactory>
   ImportMatcher::getActionFactory(MatchFinder& Finder) {
     auto CallMatcher = callExpr(isExpansionInMainFile()).bind(nodeKey);
+    auto CastMatcher = cStyleCastExpr(isExpansionInMainFile()).bind(nodeKey);
     auto CategoryMatcher = objcCategoryDecl(isImplementationInMainFile()).bind(nodeKey);
     auto DeclRefMatcher = declRefExpr(isNotInSystemHeader()).bind(nodeKey);
     auto InterfaceMatcher = interfaceDecl(isADefinition(),
@@ -114,6 +115,7 @@ namespace import_tidy {
                                  isNotInSystemHeader()).bind(nodeKey);
 
     Finder.addMatcher(CallMatcher, &CallCallback);
+    Finder.addMatcher(CastMatcher, &CastCallback);
     Finder.addMatcher(CategoryMatcher, &CategoryCallback);
     Finder.addMatcher(DeclRefMatcher, &DeclRefCallback);
     Finder.addMatcher(InterfaceMatcher, &InterfaceCallback);

ImportMatcher.h

@@ -15,8 +15,8 @@ namespace import_tidy {
   public:
     ImportMatcher(clang::tooling::Replacements &Replacements) :
       ImportRanges(), ImportMap(), LibraryCounts(),
-      CallCallback(*this), CategoryCallback(*this),
-      DeclRefCallback(*this),
+      CallCallback(*this), CastCallback(*this),
+      CategoryCallback(*this), DeclRefCallback(*this),
       FuncDeclCallback(*this), InterfaceCallback(*this),
       MsgCallback(*this), MtdCallback(*this), ProtoCallback(*this),
       StripCallback(*this), FileCallbacks(*this), Replacements(Replacements) {};
@@ -41,6 +41,7 @@ namespace import_tidy {
     std::set<clang::FileID> HeaderFiles;
     std::map<llvm::StringRef, unsigned> LibraryCounts;
     CallExprCallback CallCallback;
+    CastExprCallback CastCallback;
     CategoryCallback CategoryCallback;
     DeclRefCallback DeclRefCallback;
     FuncDeclCallback FuncDeclCallback;