From ff5d037c0feadf8fc93ddbc0c40eece9cd009d5d Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@users.noreply.github.com>
Date: Thu, 6 Jun 2024 09:42:02 +0100
Subject: [PATCH] fix(coverage): Account for SHA in lcov DA parsing (#6463)

---
 .../java/run/coverage/BlazeCoverageData.java  | 12 ++++++----
 .../run/coverage/BlazeCoverageDataTest.java   | 24 +++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java b/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java
index 594af88f6c3..30da50bbf8a 100644
--- a/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java
+++ b/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java
@@ -82,12 +82,16 @@ private static TIntIntHashMap parseHits(BufferedReader reader) throws IOExceptio
           return hits;
         }
         if (line.startsWith(DA)) {
-          // DA:line,hits
-          int comma = line.indexOf(',');
+          // DA:line,hits,sha
+          String[] segments = line.substring(DA.length()).split(",");
+          if (segments.length < 2) {
+            logger.warn(String.format("Cannot parse LCOV line: Expected entry to have format DA:<number>,<number>, was: %s", line));
+            continue;
+          }
           try {
             hits.put(
-                Integer.parseInt(line.substring(DA.length(), comma)),
-                Integer.parseInt(line.substring(comma + 1)));
+                Integer.parseInt(segments[0]),
+                Integer.parseInt(segments[1]));
           } catch (NumberFormatException e) {
             logger.warn("Cannot parse LCOV line: " + line, e);
           }
diff --git a/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java b/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java
index 20d26c1c2d7..bf3784506fd 100644
--- a/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java
+++ b/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java
@@ -81,6 +81,30 @@ public void testEmptyFilesIgnored() throws IOException {
     assertThat(data.perFileData.keySet()).containsExactly("path/to/another/file.txt");
   }
 
+  /**
+   * Some test runners, such as the one for `py_test` in rules_python, append extra data to DA entries.
+   * This test data is taken from a run of one such `py_test`.
+   * @throws IOException
+   */
+  @Test
+  public void testDALinesWithShaCanBeParsed() throws IOException {
+    BlazeCoverageData data =
+       BlazeCoverageData.parse(
+           inputStream(
+               "SF:path/to/file.txt",
+              "DA:1,1,CjTuYq8+gnNfbQNgi09Ocg",
+              "DA:40,1,E/tvV9JPVDhEcTCkgrwOFw",
+              "DA:42,1,SZ/sLwIPxdnoU2xnoUB7pg",
+              "end_of_record"
+           ));
+
+    assertThat(data.perFileData).hasSize(1);
+    FileData fileData = data.perFileData.get("path/to/file.txt");
+    assertThat(fileData).isNotNull();
+    assertThat(fileData.source).isEqualTo("path/to/file.txt");
+    assertThat(toMap(fileData.lineHits)).containsExactly(1, 1, 40, 1, 42, 1);
+  }
+
   private static ImmutableMap<Integer, Integer> toMap(TIntIntHashMap troveMap) {
     return Arrays.stream(troveMap.keys())
         .boxed()