Cleanup CodeLocation[Extractor] and fill in end line and column (#135)

* Cleanup `CodeLocation[Extractor]` and fill in end line and column.

* Address review.

Author: fabsx00

build.sbt

@@ -3,7 +3,7 @@ organization := "io.shiftleft"
 scalaVersion := "2.12.10"
 enablePlugins(GitVersioning)
 
-val cpgVersion = "0.10.26"
+val cpgVersion = "0.10.78"
 
 libraryDependencies ++= Seq(
   "com.github.scopt"   %% "scopt"          % "3.7.0",

src/main/java/io/shiftleft/fuzzyc2cpg/ast/AstNode.java

@@ -12,7 +12,7 @@ public class AstNode {
 
   protected List<AstNode> children;
   protected int childNumber;
-  private CodeLocation location = new CodeLocation();
+  private CodeLocation location = CodeLocation.apply();
   private boolean isInCFG = false;
 
   // refers to the parsed source code, used for wiring goto labels

src/main/java/io/shiftleft/fuzzyc2cpg/ast/CodeLocation.java

@@ -10,7 +10,7 @@ object NodeProperty extends Enumeration {
   type NodeProperty = Value
   val ORDER, ARGUMENT_INDEX, NAME, FULL_NAME, CODE, EVALUATION_STRATEGY, TYPE_FULL_NAME, TYPE_DECL_FULL_NAME, SIGNATURE,
   DISPATCH_TYPE, METHOD_FULL_NAME, METHOD_INST_FULL_NAME, IS_EXTERNAL, PARSER_TYPE_NAME, AST_PARENT_TYPE,
-  AST_PARENT_FULL_NAME, LINE_NUMBER, COLUMN_NUMBER, ALIAS_TYPE_FULL_NAME = Value
+  AST_PARENT_FULL_NAME, LINE_NUMBER, COLUMN_NUMBER, LINE_NUMBER_END, COLUMN_NUMBER_END, ALIAS_TYPE_FULL_NAME = Value
 }
 
 object NodeKind extends Enumeration {

src/main/java/io/shiftleft/fuzzyc2cpg/parser/CodeLocationExtractor.java

@@ -95,6 +95,8 @@ class ProtoCpgAdapter(targetCpg: CpgStruct.Builder) extends CpgAdapter[Node.Buil
         NodePropertyName.AST_PARENT_FULL_NAME
       case NodeProperty.LINE_NUMBER          => NodePropertyName.LINE_NUMBER
       case NodeProperty.COLUMN_NUMBER        => NodePropertyName.COLUMN_NUMBER
+      case NodeProperty.LINE_NUMBER_END      => NodePropertyName.LINE_NUMBER_END
+      case NodeProperty.COLUMN_NUMBER_END    => NodePropertyName.COLUMN_NUMBER_END
       case NodeProperty.ALIAS_TYPE_FULL_NAME => NodePropertyName.ALIAS_TYPE_FULL_NAME
     }
   }

src/main/scala/io/shiftleft/fuzzyc2cpg/adapter/CpgAdapter.scala

@@ -0,0 +1,16 @@
+package io.shiftleft.fuzzyc2cpg.ast
+
+object CodeLocation {
+  def apply: CodeLocation = new CodeLocation()
+}
+
+case class CodeLocation(startLine: Option[Int] = None,
+                        startPos: Option[Int] = None,
+                        startIndex: Option[Int] = None,
+                        endIndex: Option[Int] = None,
+                        endLine: Option[Int] = None,
+                        endPos: Option[Int] = None) {
+
+  override def toString: String =
+    String.format("%d:%d:%d:%d:%d:%d", startLine, startPos, startIndex, endIndex, endLine, endPos)
+}

src/main/scala/io/shiftleft/fuzzyc2cpg/adapter/ProtoCpgAdapter.scala

@@ -62,6 +62,12 @@ class AstToCpgConverter[NodeBuilderType, NodeType, EdgeBuilderType, EdgeType](
       adapter.addNodeProperty(nodeBuilder, property, value)
       nodeBuilder
     }
+
+    def addProperty(property: NodeProperty, value: Option[Int]): NodeBuilderType = {
+      value.foreach(adapter.addNodeProperty(nodeBuilder, property, _))
+      nodeBuilder
+    }
+
     def addProperty(property: NodeProperty, value: Int): NodeBuilderType = {
       adapter.addNodeProperty(nodeBuilder, property, value)
       nodeBuilder
@@ -122,6 +128,8 @@ class AstToCpgConverter[NodeBuilderType, NodeType, EdgeBuilderType, EdgeType](
       .addProperty(NodeProperty.FULL_NAME, value = s"${astFunction.getName}")
       .addProperty(NodeProperty.LINE_NUMBER, astFunction.getLocation.startLine)
       .addProperty(NodeProperty.COLUMN_NUMBER, astFunction.getLocation.startPos)
+      .addProperty(NodeProperty.LINE_NUMBER_END, astFunction.getLocation.endLine)
+      .addProperty(NodeProperty.COLUMN_NUMBER_END, astFunction.getLocation.endPos)
       .addProperty(NodeProperty.SIGNATURE, signature)
       .createNode(astFunction)
 

src/main/scala/io/shiftleft/fuzzyc2cpg/ast/CodeLocation.scala

@@ -0,0 +1,18 @@
+package io.shiftleft.fuzzyc2cpg.parser
+
+import io.shiftleft.fuzzyc2cpg.ast.CodeLocation
+import org.antlr.v4.runtime.ParserRuleContext
+
+object CodeLocationExtractor {
+
+  def extractFromContext(ctx: ParserRuleContext): CodeLocation = {
+    val startLine = Some(ctx.start.getLine)
+    val startPos = Some(ctx.start.getCharPositionInLine)
+    val startIndex = Some(ctx.start.getStartIndex)
+    val endLine = Option(ctx.stop).map(_.getLine)
+    val endIndex = Option(ctx.stop).map(_.getStopIndex)
+    val endPos = Option(ctx.stop).map(_.getCharPositionInLine)
+    CodeLocation(startLine, startPos, startIndex, endIndex, endLine, endPos)
+  }
+
+}

src/main/scala/io/shiftleft/fuzzyc2cpg/astnew/AstToCpgConverter.scala

@@ -17,6 +17,8 @@ class MethodHeaderTests extends WordSpec with Matchers {
       methods.head.value2(NodeKeys.SIGNATURE) shouldBe "int(int,int)"
       methods.head.value2(NodeKeys.LINE_NUMBER) shouldBe 1
       methods.head.value2(NodeKeys.COLUMN_NUMBER) shouldBe 0
+      methods.head.value2(NodeKeys.LINE_NUMBER_END) shouldBe 3
+      methods.head.value2(NodeKeys.COLUMN_NUMBER_END) shouldBe 0
     }
 
     "have correct METHOD_PARAMETER_IN nodes for method foo" in {