more fullname fixes

- fix fullnames with references to extension from libraries
- account for modifiers in compiler json output

Author: max-leuthaeuser

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

@@ -70,8 +70,8 @@ object AstCreatorHelper {
 
   def cleanType(rawType: String): String = {
     if (rawType == Defines.Any) return rawType
-    val normalizedTpe = StringUtils.normalizeSpace(rawType.stripSuffix(" ()"))
-    stripGenerics(normalizedTpe) match {
+    val normalizedName = StringUtils.normalizeSpace(rawType.stripSuffix(" ()"))
+    stripGenerics(normalizedName) match {
       // Empty or problematic types
       case ""                   => Defines.Any
       case t if t.contains("?") => Defines.Any

joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/utils/GsonTypeInfoReader.scala

@@ -31,6 +31,7 @@ object GsonTypeInfoReader {
     val CallExpr               = "call_expr"
     val ReturnStmt             = "return_stmt"
     val DotCallExpr            = "dot_syntax_call_expr"
+    val ClassDecl              = "class_decl"
   }
 
   /** Safely retrieves a string property from a JsonObject.
@@ -70,11 +71,28 @@ object GsonTypeInfoReader {
     val rangeObj = obj.get("range").getAsJsonObject
     val start    = rangeObj.get("start").getAsInt
     val end      = rangeObj.get("end").getAsInt
-    val offset = astNodeKind(obj) match {
+
+    // no adjustment needed for zero-length ranges, e.g., for member accesses:
+    if (start == end) return (start, end)
+
+    val endOffset = astNodeKind(obj) match {
       case NodeKinds.DotCallExpr => 3 // offsets are off by 2 from SwiftParser for simple dot calls
       case _                     => 1
     }
-    if (start == end) (start, end) else (start, end + offset)
+    val startWithModifiers = obj match {
+      case _ if obj.has("attrs") =>
+        /** Handles cases where attributes modify the start position of the range. For example, in the presence of
+          * attributes like `@escaping` or for access modifiers like `static` the start position may need to be adjusted
+          * to account for the attribute's position because swift-parser does include attributes in the range of the
+          * associated declaration while swiftc does not.
+          */
+        safeRange(obj.getAsJsonArray("attrs").get(0).getAsJsonObject) match {
+          case Some((s, e)) if s < start => s
+          case _                         => start
+        }
+      case _ => start
+    }
+    (startWithModifiers, end + endOffset)
   }
 
   /** Safely extracts the source range from a JSON object.

joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/utils/SwiftTypesProvider.scala

@@ -547,14 +547,7 @@ case class SwiftTypesProvider(config: Config, parsedSwiftInvocations: Seq[Seq[St
     *   Some(demangled type fullname) if successful, None otherwise
     */
   private def calculateTypeFullname(mangledName: String): Option[String] = {
-    mangledNameCache.computeIfAbsent(
-      mangledName,
-      _ =>
-        demangle(mangledName)
-          .map(removeModifier)
-          .map(AstCreatorHelper.stripGenerics)
-          .map(_.replace(" ", "").stripSuffix(".Type"))
-    )
+    calculateDeclFullname(mangledName).map(_.stripSuffix(".Type"))
   }
 
   /** This regex is designed to clean up Swift demangled type names by extracting meaningful parts and removing internal
@@ -578,7 +571,8 @@ case class SwiftTypesProvider(config: Config, parsedSwiftInvocations: Seq[Seq[St
     *
     * E.g., `(extension in FooExt)Foo.bar() -> Swift.String` becomes `FooExt.Foo.bar() -> Swift.String`.
     */
-  private val ExtensionNameRegex: Regex = """\(extension\sin\s([^)]+)\):(.*)""".r
+  private val ExtensionNameRegex: Regex      = """^(.*)\(extension\sin\s([^)]+)\):(.*)""".r
+  private val ExtensionNameStartRegex: Regex = """^\(extension\sin\s([^)]+)\):(.*)""".r
 
   /** Calculates a demangled declaration fullname from a mangled Swift declaration name.
     *
@@ -595,12 +589,13 @@ case class SwiftTypesProvider(config: Config, parsedSwiftInvocations: Seq[Seq[St
       mangledName,
       _ =>
         demangle(mangledName)
+          .map(n => AstCreatorHelper.stripGenerics(removeModifier(n)))
           .map {
-            case MemberNameRegex(parent, name, rest) => removeModifier(s"$parent$name$rest")
-            case ExtensionNameRegex(name, rest)      => removeModifier(s"$name$rest")
-            case other                               => removeModifier(other)
+            case ExtensionNameStartRegex(name, rest)  => s"$name.$rest"
+            case ExtensionNameRegex(head, name, rest) => s"$head$name.$rest"
+            case MemberNameRegex(parent, name, rest)  => s"$parent$name$rest"
+            case other                                => other
           }
-          .map(AstCreatorHelper.stripGenerics)
           .map(_.replace(" ", ""))
     )
   }

joern-cli/frontends/swiftsrc2cpg/src/test/scala/io/joern/swiftsrc2cpg/utils/SwiftCompilerTests.scala

@@ -260,7 +260,7 @@ class SwiftCompilerTests extends AnyWordSpec with Matchers {
       (
         "HelloWorldSwift.swift",
         "class_decl",
-        (27, 237),
+        (20, 237),
         Some("SwiftHelloWorldLib.HelloWorld"),
         Some("SwiftHelloWorldLib.HelloWorld")
       ),
@@ -441,7 +441,7 @@ class SwiftCompilerTests extends AnyWordSpec with Matchers {
       ),
       ("Main.swift", "return_stmt", (46, 46), Some("Swift.Void"), None),
       ("Main.swift", "string_literal_expr", (147, 147), Some("Swift.String"), None),
-      ("Main.swift", "struct_decl", (52, 158), Some("SwiftHelloWorld.Main"), Some("SwiftHelloWorld.Main")),
+      ("Main.swift", "struct_decl", (46, 158), Some("SwiftHelloWorld.Main"), Some("SwiftHelloWorld.Main")),
       ("Main.swift", "type_expr", (112, 112), Some("SwiftHelloWorldLib.HelloWorld"), None),
       ("Main.swift", "var_decl", (102, 102), Some("SwiftHelloWorldLib.HelloWorld"), None)
     )
@@ -618,18 +618,18 @@ class SwiftCompilerTests extends AnyWordSpec with Matchers {
           )
 
           helloWorldMappings should contain(
-            ("class_decl", (27, 497), Some("SwiftHelloWorldLib.HelloWorld"), Some("SwiftHelloWorldLib.HelloWorld"))
+            ("class_decl", (20, 497), Some("SwiftHelloWorldLib.HelloWorld"), Some("SwiftHelloWorldLib.HelloWorld"))
           )
           helloWorldMappings should contain(
             (
               "constructor_decl",
-              (381, 405),
+              (374, 405),
               Some("(SwiftHelloWorldLib.HelloWorld.Type)->()->SwiftHelloWorldLib.HelloWorld"),
               Some("SwiftHelloWorldLib.HelloWorld.init()->SwiftHelloWorldLib.HelloWorld")
             )
           )
           helloWorldMappings should contain(
-            ("func_decl", (415, 494), Some("()"), Some("SwiftHelloWorldLib.HelloWorld.greet(from:Swift.String)->()"))
+            ("func_decl", (408, 494), Some("()"), Some("SwiftHelloWorldLib.HelloWorld.greet(from:Swift.String)->()"))
           )
           helloWorldMappings should contain(
             (