Don't count lines containing only function definitions as uncovered

Author: emilydolson

fix_coverage.py

@@ -79,6 +79,13 @@ def main():
 
             force_cover_active += line.count("_FORCE_COVER_START_")
 
+            # Special case where region of forced coverage starts at 
+            # the end of this line
+            if line.endswith("_FORCE_COVER_START_") and \
+                    force_cover_active == line.count("_FORCE_COVER_START_"):
+                lines.append(line)
+                continue
+
             if not force_cover_active:  # Don't need to change line because
                 lines.append(line)      # we aren't in a template definition
                 continue

force_cover.cpp

@@ -43,7 +43,15 @@ class TemplateClassHandler : public MatchFinder::MatchCallback {
       return;
     }
 
-    Rewrite.InsertText(ClassNode->getLocStart(), "/*_FORCE_COVER_START_*/", true, true);
+    std::string source_range = clang::Lexer::getSourceText(clang::CharSourceRange::getCharRange(ClassNode->getSourceRange()), Rewrite.getSourceMgr(), Rewrite.getLangOpts()).str();
+    std::size_t loc = source_range.find_first_of("{");
+    if (loc == std::string::npos) {
+      loc = 0;
+    } else {
+      loc++;
+    }
+
+    Rewrite.InsertText(ClassNode->getLocStart().getLocWithOffset(loc), "/*_FORCE_COVER_START_*/", true, true);
     Rewrite.InsertText(ClassNode->getLocEnd().getLocWithOffset(1), "/*_FORCE_COVER_END_*/", true, true);
   }
 
@@ -64,7 +72,15 @@ class TemplateFunctionHandler : public MatchFinder::MatchCallback {
       return;
     }
 
-    Rewrite.InsertText(FunctionNode->getLocStart(), "/*_FORCE_COVER_START_*/", true, true);
+    std::string source_range = clang::Lexer::getSourceText(clang::CharSourceRange::getCharRange(FunctionNode->getSourceRange()), Rewrite.getSourceMgr(), Rewrite.getLangOpts()).str();
+    std::size_t loc = source_range.find_first_of("{");
+    if (loc == std::string::npos) {
+      loc = 0;
+    } else {
+      loc++;
+    }
+
+    Rewrite.InsertText(FunctionNode->getLocStart().getLocWithOffset(loc), "/*_FORCE_COVER_START_*/", true, true);
     Rewrite.InsertText(FunctionNode->getLocEnd().getLocWithOffset(1), "/*_FORCE_COVER_END_*/", true, true);
 
   }