Merge pull request #115 from rudrakshi/develop

Fixing Code Coverage
EXXETA · Feb 15, 2020 · 0379794 · 0379794
2 parents fe99c0d + ef8b26d
commit 0379794
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/esql-plugin/src/main/java/com/exxeta/iss/sonar/esql/EsqlSensor.java b/esql-plugin/src/main/java/com/exxeta/iss/sonar/esql/EsqlSensor.java
@@ -92,6 +92,7 @@ public class EsqlSensor implements Sensor {
     private final ActionParser<Tree> parser;
     // parsingErrorRuleKey equals null if ParsingErrorCheck is not activated
     private RuleKey parsingErrorRuleKey = null;
+	private MetricsVisitor metricsVisitor = null;
 
     public EsqlSensor(
             CheckFactory checkFactory, FileLinesContextFactory fileLinesContextFactory, FileSystem fileSystem, NoSonarFilter noSonarFilter) {
@@ -134,7 +135,7 @@ protected void analyseFiles(
             success = true;
         } catch (CancellationException e) {
             // do not propagate the exception
-            LOG.debug(e.toString(), e);
+            LOG.debug("Error while file analysis in code coverage" + e.toString(), e);
         } finally {
             stopProgressReport(progressReport, success);
         }
@@ -311,7 +312,7 @@ public void execute(SensorContext context) {
     public List<TreeVisitor> getTreeVisitors(SensorContext context) {
         boolean ignoreHeaderComments = ignoreHeaderComments(context);
 
-        MetricsVisitor metricsVisitor = new MetricsVisitor(
+        metricsVisitor = new MetricsVisitor(
                 context,
                 ignoreHeaderComments,
                 fileLinesContextFactory);
@@ -328,12 +329,10 @@ public void highlightSymbols(InputFile inputFile, TreeVisitorContext treeVisitor
     }
 
     public void executeCoverageSensors(SensorContext context) {
-        boolean ignoreHeaderComments = ignoreHeaderComments(context);
-
-        MetricsVisitor metricsVisitor = new MetricsVisitor(
-                context,
-                ignoreHeaderComments,
-                fileLinesContextFactory);
+    //Removed re-initialization of metriccvisitor as executable lines were empty
+      if (metricsVisitor == null) {
+	  	LOG.debug("metricVisitor null");
+	  }
 
         executeCoverageSensors(context, metricsVisitor.executableLines());
     }