javasrc2cpg: Annotation Column Numbers (#2318)

Probably should have done this when I added line numbers, but added column numbers for annotations.
joernio · Feb 27, 2023 · de24046 · de24046
1 parent c86ad75
commit de24046
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/joern-cli/frontends/javasrc2cpg/src/main/scala/io/joern/javasrc2cpg/passes/AstCreator.scala b/joern-cli/frontends/javasrc2cpg/src/main/scala/io/joern/javasrc2cpg/passes/AstCreator.scala
@@ -951,6 +951,7 @@ class AstCreator(filename: String, javaParserAst: CompilationUnit, global: Globa
       .name(annotationExpr.getName.getIdentifier)
       .fullName(expressionReturnTypeFullName(annotationExpr).getOrElse(fallbackType))
       .lineNumber(line(annotationExpr))
+      .columnNumber(column(annotationExpr))
   }
 
   private def astForAnnotationExpr(annotationExpr: AnnotationExpr): Ast = {
@@ -2698,6 +2699,7 @@ class AstCreator(filename: String, javaParserAst: CompilationUnit, global: Globa
           .evaluationStrategy(evalStrat)
           .typeFullName(typeFullName)
           .lineNumber(line(expr))
+          .columnNumber(column(expr))
         typeInfoCalc.registerType(typeFullName)
         paramNode
       }

diff --git a/.../frontends/javasrc2cpg/src/test/scala/io/joern/javasrc2cpg/querying/AnnotationTests.scala b/.../frontends/javasrc2cpg/src/test/scala/io/joern/javasrc2cpg/querying/AnnotationTests.scala
@@ -23,6 +23,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "NormalAnnotation"
       annotationNode.fullName shouldBe "some.NormalAnnotation"
       annotationNode.lineNumber shouldBe Some(5)
+      annotationNode.columnNumber shouldBe Some(3)
     }
 
     "test annotation node parameter assignment child" in {
@@ -63,6 +64,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "SingleAnnotation"
       annotationNode.fullName shouldBe "some.SingleAnnotation"
       annotationNode.lineNumber shouldBe Some(5)
+      annotationNode.columnNumber shouldBe Some(3)
     }
 
     "test annotation node parameter assignment child" in {
@@ -102,6 +104,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "MarkerAnnotation"
       annotationNode.fullName shouldBe "some.MarkerAnnotation"
       annotationNode.lineNumber shouldBe Some(5)
+      annotationNode.columnNumber shouldBe Some(3)
     }
 
     "test annotation node parameter assignment child" in {
@@ -127,6 +130,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "MarkerAnnotation"
       annotationNode.fullName shouldBe "some.MarkerAnnotation"
       annotationNode.lineNumber shouldBe Some(5)
+      annotationNode.columnNumber shouldBe Some(3)
     }
 
     "test annotation node parameter assignment child" in {
@@ -150,6 +154,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "MarkerAnnotation"
       annotationNode.fullName shouldBe "some.MarkerAnnotation"
       annotationNode.lineNumber shouldBe Some(5)
+      annotationNode.columnNumber shouldBe Some(17)
     }
   }
 
@@ -167,6 +172,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "MarkerAnnotation"
       annotationNode.fullName shouldBe "some.MarkerAnnotation"
       annotationNode.lineNumber shouldBe Some(4)
+      annotationNode.columnNumber shouldBe Some(3)
     }
   }
 
@@ -187,6 +193,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "NormalAnnotation"
       annotationNode.fullName shouldBe "some.NormalAnnotation"
       annotationNode.lineNumber shouldBe Some(5)
+      annotationNode.columnNumber shouldBe Some(3)
     }
 
     "test annotation node parameter value" in {
@@ -214,6 +221,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "NormalAnnotation"
       annotationNode.fullName shouldBe "some.NormalAnnotation"
       annotationNode.lineNumber shouldBe Some(5)
+      annotationNode.columnNumber shouldBe Some(3)
     }
 
     "test annotation node parameter assignment child" in {
@@ -263,6 +271,7 @@ class AnnotationTests extends JavaSrcCode2CpgFixture {
       annotationNode.name shouldBe "NormalAnnotation"
       annotationNode.fullName shouldBe "some.NormalAnnotation"
       annotationNode.lineNumber shouldBe Some(6)
+      annotationNode.columnNumber shouldBe Some(3)
     }
 
     "test annotation node parameter value" in {