SONARPY-2042: Feed IPythonTreeMaker with GeneratedIPythonFile data (#1892)

Author: joke1196

python-frontend/src/main/java/org/sonar/python/tree/IPythonTreeMaker.java

@@ -48,9 +48,9 @@ public class IPythonTreeMaker extends PythonTreeMaker {
   private Map<Integer, IPythonLocation> offsetMap;
 
   public IPythonTreeMaker() {
-    this(null);
+    this(Map.of());
   }
-  public IPythonTreeMaker(@Nullable Map<Integer, IPythonLocation> offsetMap) {
+  public IPythonTreeMaker(Map<Integer, IPythonLocation> offsetMap) {
     this.offsetMap = offsetMap;
   }
 
@@ -59,7 +59,7 @@ protected Token toPyToken(@Nullable com.sonar.sslr.api.Token token) {
     if (token == null) {
       return null;
     }
-    if (this.offsetMap != null) {
+    if (this.offsetMap != null && !this.offsetMap.isEmpty()) {
       return TokenEnricher.enrichToken(token, offsetMap);
     }
     return new TokenImpl(token);

python-frontend/src/test/java/org/sonar/python/tree/IPythonTreeMakerTest.java

@@ -301,8 +301,8 @@ void enrichTokens() {
     assertThat(stringLiteral).hasSize(1);
     assertThat(stringLiteral.get(0).firstToken().line()).isEqualTo(7);
     assertThat(stringLiteral.get(0).firstToken().column()).isEqualTo(14);
-
   }
+
   @Test 
   void toPyTokenShouldReturnNull(){
     //when the token is null

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

@@ -61,6 +61,7 @@
 import org.sonar.plugins.python.api.tree.FileInput;
 import org.sonar.plugins.python.cpd.PythonCpdAnalyzer;
 import org.sonar.plugins.python.indexer.PythonIndexer;
+import org.sonar.python.IPythonLocation;
 import org.sonar.python.SubscriptionVisitor;
 import org.sonar.python.metrics.FileLinesVisitor;
 import org.sonar.python.metrics.FileMetrics;
@@ -150,7 +151,14 @@ protected void scanFile(PythonInputFile inputFile) throws IOException {
   }
 
   private static PythonTreeMaker getTreeMaker(PythonInputFile inputFile) {
-    return Python.KEY.equals(inputFile.wrappedFile().language()) ? new PythonTreeMaker() : new IPythonTreeMaker();
+    return Python.KEY.equals(inputFile.wrappedFile().language()) ? new PythonTreeMaker() : new IPythonTreeMaker(getOffsetLocations(inputFile));
+  }
+
+  private static Map<Integer, IPythonLocation> getOffsetLocations(PythonInputFile inputFile) {
+    if(inputFile.kind() == PythonInputFile.Kind.IPYTHON){
+      return ((GeneratedIPythonFile) inputFile).locationMap();
+    }
+    return Map.of();
   }
 
   @Override