fix for review comment

Author: max-leuthaeuser

joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/astcreation/AstForDeclSyntaxCreator.scala

@@ -8,8 +8,8 @@ import io.joern.x2cpg.frontendspecific.swiftsrc2cpg.Defines
 import io.joern.x2cpg.{Ast, ValidationMode}
 import io.shiftleft.codepropertygraph.generated.*
 import io.shiftleft.codepropertygraph.generated.nodes.*
+import io.shiftleft.semanticcpg.language.types.structure.NamespaceTraversal
 
-import scala.collection.mutable
 import scala.annotation.unused
 
 trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
@@ -631,12 +631,13 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
 
     val parameterAsts = node match {
       case f: FunctionDeclSyntax =>
-        val selfAst = if (isStaticMember(f)) {
-          val parameterNode =
-            parameterInNode(node, "self", "self", 0, false, EvaluationStrategies.BY_SHARING, parentFullName)
-          scope.addVariable("self", parameterNode, parentFullName, VariableScopeManager.ScopeType.MethodScope)
-          Seq(Ast(parameterNode))
-        } else Seq.empty
+        val selfAst =
+          if (!isStaticMember(f) && !typeForSelfExpression().endsWith(NamespaceTraversal.globalNamespaceName)) {
+            val parameterNode =
+              parameterInNode(node, "self", "self", 0, false, EvaluationStrategies.BY_SHARING, parentFullName)
+            scope.addVariable("self", parameterNode, parentFullName, VariableScopeManager.ScopeType.MethodScope)
+            Seq(Ast(parameterNode))
+          } else Seq.empty
         selfAst ++ f.signature.parameterClause.parameters.children.map(astForNode)
       case a: AccessorDeclSyntax =>
         val parameterNode =
@@ -659,10 +660,17 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
         scope.addVariable("self", parameterNode, parentFullName, VariableScopeManager.ScopeType.MethodScope)
         Ast(parameterNode) +: s.parameterClause.parameters.children.map(astForNode)
       case c: ClosureExprSyntax =>
-        c.signature.flatMap(_.parameterClause) match
+        val selfAst = if (!typeForSelfExpression().endsWith(NamespaceTraversal.globalNamespaceName)) {
+          val parameterNode =
+            parameterInNode(node, "self", "self", 0, false, EvaluationStrategies.BY_SHARING, parentFullName)
+          scope.addVariable("self", parameterNode, parentFullName, VariableScopeManager.ScopeType.MethodScope)
+          Seq(Ast(parameterNode))
+        } else Seq.empty
+        selfAst ++ (c.signature.flatMap(_.parameterClause) match {
           case Some(p: ClosureShorthandParameterListSyntax) => p.children.map(astForNode)
           case Some(p: ClosureParameterClauseSyntax)        => p.parameters.children.map(astForNode)
           case None                                         => Seq.empty
+        })
     }
 
     val body: Option[CodeBlockSyntax | AccessorDeclListSyntax | CodeBlockItemListSyntax] = node match {

joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/astcreation/AstForExprSyntaxCreator.scala

@@ -8,6 +8,7 @@ import io.joern.x2cpg.frontendspecific.swiftsrc2cpg.Defines
 import io.joern.x2cpg.{Ast, ValidationMode}
 import io.shiftleft.codepropertygraph.generated.*
 import io.shiftleft.codepropertygraph.generated.nodes.NewCall
+import io.shiftleft.semanticcpg.language.types.structure.NamespaceTraversal
 
 import scala.annotation.unused
 
@@ -277,7 +278,14 @@ trait AstForExprSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
     val trailingClosureAsts            = expr.trailingClosure.toList.map(astForNode)
     val additionalTrailingClosuresAsts = expr.additionalTrailingClosures.children.map(c => astForNode(c.closure))
 
-    val args = expr.arguments.children.map(astForNode) ++ trailingClosureAsts ++ additionalTrailingClosuresAsts
+    val selfTpe = typeForSelfExpression()
+    val selfNodeAst = if (!selfTpe.endsWith(NamespaceTraversal.globalNamespaceName)) {
+      val selfNode = identifierNode(expr, "self", "self", selfTpe)
+      scope.addVariableReference(selfNode.name, selfNode, selfTpe, EvaluationStrategies.BY_REFERENCE)
+      Seq(Ast(selfNode))
+    } else Seq.empty
+    val args =
+      selfNodeAst ++ expr.arguments.children.map(astForNode) ++ trailingClosureAsts ++ additionalTrailingClosuresAsts
 
     val callExprCode = code(expr)
     val callNode_ = callNode(

joern-cli/frontends/swiftsrc2cpg/src/test/scala/io/joern/swiftsrc2cpg/passes/ast/ClosureWithCompilerTests.scala

@@ -222,8 +222,9 @@ class ClosureWithCompilerTests extends SwiftCompilerSrc2CpgSuite {
       compareClosureCall.receiver.isIdentifier.typeFullName.l shouldBe List(
         "Swift.Function<(Swift.String,Swift.String)->Swift.Bool>"
       )
-      compareClosureCall.argument(1).code shouldBe """"1""""
-      compareClosureCall.argument(2).code shouldBe """"2""""
+      compareClosureCall.argument(1).code shouldBe "self"
+      compareClosureCall.argument(2).code shouldBe """"1""""
+      compareClosureCall.argument(3).code shouldBe """"2""""
     }
 
     "create type decls and bindings correctly (closure as function parameter)" in {

joern-cli/frontends/swiftsrc2cpg/src/test/scala/io/joern/swiftsrc2cpg/passes/ast/SimpleAstCreationPassTest.scala

@@ -298,11 +298,10 @@ class SimpleAstCreationPassTest extends AstSwiftSrc2CpgSuite {
         fieldName.canonicalName shouldBe "f"
       }
 
-      val List(fooMethod)          = cpg.method.nameExact("foo").l
-      val List(fooBlock)           = fooMethod.astChildren.isBlock.l
-      val List(barRef)             = fooBlock.astChildren.isMethodRef.l
-      val List(closureBindingSelf) = barRef.captureOut.l
-      closureBindingSelf.closureBindingId shouldBe Option("Test0.swift:<global>.Foo.foo.bar:self")
+      val List(fooMethod) = cpg.method.nameExact("foo").l
+      val List(fooBlock)  = fooMethod.astChildren.isBlock.l
+      val List(barRef)    = fooBlock.astChildren.isMethodRef.l
+      barRef.captureOut shouldBe empty
 
       val List(barMethod)      = cpg.method.nameExact("bar").l
       val List(barMethodBlock) = barMethod.astChildren.isBlock.l
@@ -331,15 +330,14 @@ class SimpleAstCreationPassTest extends AstSwiftSrc2CpgSuite {
         fLocal.name shouldBe "f"
         fLocal.typeFullName shouldBe Defines.String
       }
-      val List(fooMethod)                           = cpg.method.nameExact("foo").l
-      val List(fooBlock)                            = fooMethod.astChildren.isBlock.l
-      val List(fooLocalF)                           = fooBlock.astChildren.isLocal.nameExact("f").l
-      val List(barRef)                              = fooBlock.astChildren.isMethodRef.l
-      val List(closureBindingF, closureBindingSelf) = barRef.captureOut.l
+      val List(fooMethod)       = cpg.method.nameExact("foo").l
+      val List(fooBlock)        = fooMethod.astChildren.isBlock.l
+      val List(fooLocalF)       = fooBlock.astChildren.isLocal.nameExact("f").l
+      val List(barRef)          = fooBlock.astChildren.isMethodRef.l
+      val List(closureBindingF) = barRef.captureOut.l
       closureBindingF.closureBindingId shouldBe Option("Test0.swift:<global>.Foo.foo.bar:f")
       closureBindingF.refOut.head shouldBe fooLocalF
       closureBindingF.evaluationStrategy shouldBe EvaluationStrategies.BY_REFERENCE
-      closureBindingSelf.closureBindingId shouldBe Option("Test0.swift:<global>.Foo.foo.bar:self")
 
       val List(barMethod)      = cpg.method.nameExact("bar").l
       val List(barMethodBlock) = barMethod.astChildren.isBlock.l