SONARPY-2058: Fix offset computation on single line JSON files (#1907)

Author: joke1196

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

@@ -169,8 +169,8 @@ private boolean parseSourceMultilineString(JsonParser jParser, JsonToken jsonTok
       addLineToSource(line, new IPythonLocation(tokenLocation.getLineNr(),
         tokenLocation.getColumnNr() + previousLen + previousExtraChars, countEscapedChar));
       aggregatedSource.append("\n");
-      previousLen = line.length() + 2;
-      previousExtraChars = currentCount;
+      previousLen = previousLen + line.length() + 2;
+      previousExtraChars = previousExtraChars + currentCount;
     }
     // Account for the last cell delimiter
     addDelimiterToSource(tokenLocation);

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

@@ -54,7 +54,6 @@ void testParseNotebook() throws IOException {
     //"source": "#Some code\nprint(\"hello world\\n\")",
     assertThat(result.locationMap()).extracting(map -> map.get(16)).isEqualTo(new IPythonLocation(64, 14, Map.of(-1, 0)));
     assertThat(result.locationMap()).extracting(map -> map.get(17)).isEqualTo(new IPythonLocation(64, 26, Map.of(6, 33, 18, 46, 20, 49, -1, 3)));
-
     //"source": "print(\"My\\ntext\")\nprint(\"Something else\\n\")"
     assertThat(result.locationMap()).extracting(map -> map.get(22)).isEqualTo(new IPythonLocation(83, 14, Map.of(6, 21, 9, 25, 15, 32, -1, 3)));
     assertThat(result.locationMap()).extracting(map -> map.get(23)).isEqualTo(new IPythonLocation(83, 36, Map.of(6, 43, 21, 59, 23, 62, -1, 3)));
@@ -127,4 +126,18 @@ void testParseNotebookWithExtraLineEndInArray() throws IOException {
     assertThat(result.contents()).hasLineCount(3);
   }
 
+  @Test
+  void testParseNotebookSingleLine() throws IOException {
+    var inputFile = createInputFile(baseDir, "notebook_single_line.ipynb", InputFile.Status.CHANGED, InputFile.Type.MAIN);
+
+    var resultOptional = IpynbNotebookParser.parseNotebook(inputFile);
+
+    assertThat(resultOptional).isPresent();
+
+    var result = resultOptional.get();
+    assertThat(result.locationMap()).hasSize(5);
+    assertThat(result.contents()).hasLineCount(5);
+    // position of variable t
+    assertThat(result.locationMap().get(4).column()).isEqualTo(451);
+  }
 }

sonar-python-plugin/src/test/resources/org/sonar/plugins/python/notebook_single_line.ipynb

@@ -0,0 +1,2 @@
+{"cells":[{"cell_type":"code","execution_count":null,"metadata":{"execution":{"iopub.execute_input":"2022-04-18T13:57:08.798932Z","iopub.status.busy":"2022-04-18T13:57:08.798479Z","iopub.status.idle":"2022-04-18T13:57:10.082993Z","shell.execute_reply":"2022-04-18T13:57:10.081937Z","shell.execute_reply.started":"2022-04-18T13:57:08.798842Z"},"trusted":true},"outputs":[],"source":"# Code you have previously used to load data\nimport pandas as pd\n\nt = '../input/home-data-for-ml-course/train.csv'"}],"metadata":{"kernelspec":{"display_name":"Python 3","language":"python","name":"python3"},"language_info":{"codemirror_mode":{"name":"ipython","version":3},"file_extension":".py","mimetype":"text/x-python","name":"python","nbconvert_exporter":"python","pygments_lexer":"ipython3","version":"3.6.4"}},"nbformat":4,"nbformat_minor":4}
+