SONARPY-2027 IPynbParser doesn't create new lines when parsing multiline strings code cells (#1878)

Author: ghislainpiot

sonar-python-plugin/src/main/java/org/sonar/plugins/python/IpynbNotebookParser.java

@@ -30,7 +30,7 @@
 
 public class IpynbNotebookParser {
 
-  public static final String SONAR_PYTHON_NOTEBOOK_CELL_DELIMITER = "\n#SONAR_PYTHON_NOTEBOOK_CELL_DELIMITER\n";
+  public static final String SONAR_PYTHON_NOTEBOOK_CELL_DELIMITER = "#SONAR_PYTHON_NOTEBOOK_CELL_DELIMITER\n";
 
   public static GeneratedIPythonFile parseNotebook(PythonInputFile inputFile) {
     try {
@@ -96,6 +96,7 @@ private boolean parseSourceArray(JsonParser jParser, JsonToken jsonToken) throws
       var countEscapedChar = countEscapeCharacters(sourceLine, new LinkedHashMap<>(), tokenLocation.getColumnNr());
       addLineToSource(sourceLine, tokenLocation, countEscapedChar);
     }
+    aggregatedSource.append("\n");
     // Account for the last cell delimiter
     addDelimiterToSource();
     return true;
@@ -115,6 +116,7 @@ private boolean parseSourceMultilineString(JsonParser jParser, JsonToken jsonTok
       var currentCount = countEscapedChar.get(-1);
       addLineToSource(line, new IPythonLocation(tokenLocation.getLineNr(),
         tokenLocation.getColumnNr() + previousLen + previousExtraChars + 1, countEscapedChar));
+      aggregatedSource.append("\n");
       previousLen = line.length() + 2;
       previousExtraChars = currentCount;
     }

sonar-python-plugin/src/test/java/org/sonar/plugins/python/IpynbNotebookParserTest.java

@@ -40,6 +40,7 @@ void testParseNotebook() throws IOException {
     var result = IpynbNotebookParser.parseNotebook(inputFile);
 
     assertThat(result.locationMap().keySet()).hasSize(20);
+    assertThat(result.contents()).hasLineCount(27);
     assertThat(StringUtils.countMatches(result.contents(), IpynbNotebookParser.SONAR_PYTHON_NOTEBOOK_CELL_DELIMITER))
       .isEqualTo(7);
     assertThat(result.locationMap()).extracting(map -> map.get(17)).isEqualTo(new IpynbNotebookParser.IPythonLocation(64, 27, Map.of(6, 21, 20, 37, -1, 3)));