Using Block Scope fix (#109)

* fix methodFullName inside using block * code refactoring * Try handling change * added curly braces
Privado-Inc · Oct 10, 2024 · 2811110 · 2811110
1 parent 148ed9e
commit 2811110
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/...rpsrc2cpg/src/main/scala/io/joern/csharpsrc2cpg/astcreation/AstForStatementsCreator.scala b/...rpsrc2cpg/src/main/scala/io/joern/csharpsrc2cpg/astcreation/AstForStatementsCreator.scala
@@ -300,10 +300,13 @@ trait AstForStatementsCreator(implicit withSchemaValidation: ValidationMode) { t
       .code(code(usingStmt))
       .lineNumber(line(usingStmt))
       .columnNumber(column(usingStmt))
+    val declAst = Try(createDotNetNodeInfo(usingStmt.json(ParserKeys.Declaration))) match {
+      case Success(declNodevalue) => astForNode(declNodevalue)
+      case _                      => Seq.empty[Ast]
+    }
+
     val tryNodeInfo = createDotNetNodeInfo(usingStmt.json(ParserKeys.Statement))
     val tryAst      = astForBlock(tryNodeInfo, Option("try"))
-    val declNode    = createDotNetNodeInfo(usingStmt.json(ParserKeys.Declaration))
-    val declAst     = astForNode(declNode)
 
     val finallyAst = declAst.flatMap(_.nodes).collectFirst { case x: NewIdentifier => x.copy }.map { id =>
       val callCode = s"${id.name}.Dispose()"

diff --git a/...arpsrc2cpg/src/test/scala/io/joern/csharpsrc2cpg/querying/ast/ControlStructureTests.scala b/...arpsrc2cpg/src/test/scala/io/joern/csharpsrc2cpg/querying/ast/ControlStructureTests.scala
@@ -173,4 +173,37 @@ class ControlStructureTests extends CSharpCode2CpgFixture {
 
   }
 
+  "having using statement" should {
+    val cpg = code("""
+        |namespace other
+        |{
+        |    public class General
+        |    {
+        |        public static void Call(string name)
+        |        {
+        |            using (SqlConnection connection = new SqlConnection(name))
+        |            {
+        |                try
+        |                {
+        |                    connection.Open();
+        |                }
+        |                catch (Exception ex)
+        |                {
+        |                    Console.WriteLine(ex.Message);
+        |                    connection.Close();
+        |                }
+        |            }
+        |        }
+        |    }
+        |}
+        |""".stripMargin)
+
+    "resolve methodFullName" in {
+      inside(cpg.call.name("Open").methodFullName.l) {
+        case x :: Nil => x shouldBe "SqlConnection.Open:<unresolvedSignature>"
+        case _        => fail("Unexpected call node structure")
+      }
+    }
+  }
+
 }