unify lines coverage logic

cenfun · Jun 14, 2024 · 964911c · 964911c
1 parent 99d08e8
commit 964911c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 54 deletions.
diff --git a/lib/converter/converter.js b/lib/converter/converter.js
@@ -74,32 +74,7 @@ const applyBytesToLines = (bytes, locator, lineMap) => {
 
         // update lines coverage
         const lines = Util.getRangeLines(sLoc, eLoc);
-
-        lines.forEach((it) => {
-            const lineItem = lineMap.get(it.line);
-            if (!lineItem) {
-                // not found line, could be comment or blank line
-                return;
-            }
-            if (lineItem.ignored) {
-                return;
-            }
-
-            it.count = count;
-
-            // default is covered, so only focus on
-            // 1, biggest covered count
-            // 2, uncovered entire and pieces
-            if (count > 0) {
-                lineItem.coveredCount = Math.max(lineItem.coveredCount, count);
-            } else {
-                if (it.entire) {
-                    lineItem.uncoveredEntire = it;
-                } else {
-                    lineItem.uncoveredPieces.push(it);
-                }
-            }
-        });
+        Util.updateLinesCoverage(lines, count, lineMap);
 
     });
 

diff --git a/lib/platform/share.js b/lib/platform/share.js
@@ -338,6 +338,37 @@ const Util = {
         return lines;
     },
 
+    updateLinesCoverage: (lines, count, lineMap) => {
+        lines.forEach((it) => {
+            const lineItem = lineMap.get(it.line);
+            if (!lineItem) {
+                // not found line, could be comment or blank line
+                return;
+            }
+
+            if (lineItem.ignored) {
+                return;
+            }
+
+            it.count = count;
+
+            // default is covered, so only focus on
+            // 1, biggest covered count
+            // 2, uncovered entire and pieces
+            if (count > 0) {
+                lineItem.coveredCount = Math.max(lineItem.coveredCount, count);
+            } else {
+                if (it.entire) {
+                    lineItem.uncoveredEntire = it;
+                } else {
+                    lineItem.uncoveredPieces.push(it);
+                }
+            }
+
+        });
+
+    },
+
     // =============================================================================
     // svg
 

diff --git a/packages/app/src/utils/coverage.js b/packages/app/src/utils/coverage.js
@@ -255,34 +255,7 @@ class CoverageParser {
 
         const lines = Util.getRangeLines(sLoc, eLoc);
         // console.log(lines);
-
-        lines.forEach((it) => {
-            const lineItem = lineMap.get(it.line);
-            if (!lineItem) {
-                // not found line, could be comment or blank line
-                return;
-            }
-
-            if (lineItem.ignored) {
-                return;
-            }
-
-            it.count = count;
-
-            // default is covered, so only focus on
-            // 1, last covered count
-            // 2, uncovered entire and pieces
-            if (count > 0) {
-                lineItem.coveredCount = count;
-            } else {
-                if (it.entire) {
-                    lineItem.uncoveredEntire = it;
-                } else {
-                    lineItem.uncoveredPieces.push(it);
-                }
-            }
-
-        });
+        Util.updateLinesCoverage(lines, count, lineMap);
 
     }