Merge pull request #122 from codellm-devkit/103-extend-parameterincallable-class-to-capture-line-and-column-offsets

Address Issue 103: Extend `ParameterInCallable` class to capture line and column offsets

Author: rahlk

src/main/java/com/ibm/cldk/SymbolTable.java

@@ -401,6 +401,10 @@ private static ParameterInCallable processParameterDeclaration(Parameter paramDe
         parameter.setName(paramDecl.getName().toString());
         parameter.setAnnotations(paramDecl.getAnnotations().stream().map(a -> a.toString().strip()).collect(Collectors.toList()));
         parameter.setModifiers(paramDecl.getModifiers().stream().map(a -> a.toString().strip()).collect(Collectors.toList()));
+        parameter.setStartLine(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().begin.line : -1);
+        parameter.setStartColumn(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().begin.column : -1);
+        parameter.setEndLine(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().end.line : -1);
+        parameter.setEndColumn(paramDecl.getRange().isPresent() ? paramDecl.getRange().get().end.column : -1);
         return parameter;
     }
 

src/main/java/com/ibm/cldk/entities/ParameterInCallable.java

@@ -10,4 +10,8 @@ public class ParameterInCallable {
     private String name;
     private List<String> annotations;
     private List<String> modifiers;
+    private int startLine;
+    private int endLine;
+    private int startColumn;
+    private int endColumn;
 }

src/test/java/com/ibm/cldk/CodeAnalyzerIntegrationTest.java

@@ -299,4 +299,37 @@ void symbolTableShouldHaveDefaultRecordComponents() throws IOException, Interrup
             }
         }
     }
+
+    @Test
+    void parametersInCallableMustHaveStartAndEndLineAndColumns() throws IOException, InterruptedException {
+        var runCodeAnalyzerOnCallGraphTest = container.execInContainer(
+                "bash", "-c",
+                String.format(
+                        "export JAVA_HOME=%s && java -jar /opt/jars/codeanalyzer-%s.jar --input=/test-applications/record-class-test --analysis-level=1",
+                        javaHomePath, codeanalyzerVersion
+                )
+        );
+
+        // Read the output JSON
+        Gson gson = new Gson();
+        JsonObject jsonObject = gson.fromJson(runCodeAnalyzerOnCallGraphTest.getStdout(), JsonObject.class);
+        JsonObject symbolTable = jsonObject.getAsJsonObject("symbol_table");
+        for (Map.Entry<String, JsonElement> element : symbolTable.entrySet()) {
+            String key = element.getKey();
+            if (!key.endsWith("App.java")) {
+                continue;
+            }
+            JsonObject type = element.getValue().getAsJsonObject();
+            if (type.has("type_declarations")) {
+                JsonObject typeDeclarations = type.getAsJsonObject("type_declarations");
+                JsonObject mainMethod = typeDeclarations.getAsJsonObject("org.example.App").getAsJsonObject("callable_declarations").getAsJsonObject("main(String[])");
+                JsonArray parameters = mainMethod.getAsJsonArray("parameters");
+                // There should be 1 parameter
+                Assertions.assertEquals(1, parameters.size(), "Callable should have 1 parameter");
+                JsonObject parameter = parameters.get(0).getAsJsonObject();
+                // Start and end line and column should not be -1
+                Assertions.assertTrue(parameter.get("start_line").getAsInt() == 7 && parameter.get("end_line").getAsInt() == 7 && parameter.get("start_column").getAsInt() == 29 && parameter.get("end_column").getAsInt() == 41, "Parameter should have start and end line and columns");
+            }
+        }
+    }
 }