diff --git a/unified/extractor/src/languages/swift/swift.rs b/unified/extractor/src/languages/swift/swift.rs
index 77b3d1e6dec..467d136a5b2 100644
--- a/unified/extractor/src/languages/swift/swift.rs
+++ b/unified/extractor/src/languages/swift/swift.rs
@@ -944,14 +944,19 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // an ordinary `declReferenceExpr`, already mapped to a `name_expr`.)
         rule!((superExpr) => (super_expr)),
         // Type expressions. A generic type applied with explicit arguments
-        // (`Set<Int>`) is represented opaquely, using the whole source text as
-        // the name (PARITY(tree-sitter): the generic arguments are not
-        // structured `type_argument`s). Matched before the plain `identifierType`
-        // rule, which would otherwise drop the arguments.
+        // (`Set<Int>`) becomes a `generic_type_expr` whose `base` is the type
+        // name and whose `type_argument`s are the (structured) arguments — the
+        // same shape the sugared `?`/`[]`/`[:]` types desugar to. Matched before
+        // the plain `identifierType` rule, which would otherwise drop the
+        // arguments.
         rule!(
-            (identifierType genericArgumentClause: (genericArgumentClause)) @@ty
+            (identifierType
+                name: @@name
+                genericArgumentClause: (genericArgumentClause arguments: (genericArgument argument: @args)*))
             =>
-            (named_type_expr name: (identifier #{ty}))
+            (generic_type_expr
+                base: (named_type_expr name: (identifier #{name}))
+                type_argument: {args})
         ),
         // A named type (`Int`). `identifierType.name` is the type-name token.
         rule!((identifierType name: @@n) => (named_type_expr name: (identifier #{n}))),
diff --git a/unified/extractor/tests/corpus/swift/collections/set-literal.output b/unified/extractor/tests/corpus/swift/collections/set-literal.output
index c29492c9bc0..a06670231eb 100644
--- a/unified/extractor/tests/corpus/swift/collections/set-literal.output
+++ b/unified/extractor/tests/corpus/swift/collections/set-literal.output
@@ -66,8 +66,13 @@ top_level
             name_pattern
               identifier: identifier "s"
           type:
-            named_type_expr
-              name: identifier "Set<Int>"
+            generic_type_expr
+              base:
+                named_type_expr
+                  name: identifier "Set"
+              type_argument:
+                named_type_expr
+                  name: identifier "Int"
           value:
             array_literal
               element:
diff --git a/unified/extractor/tests/corpus/swift/types/generic-type-arguments.output b/unified/extractor/tests/corpus/swift/types/generic-type-arguments.output
new file mode 100644
index 00000000000..ce12c853d9d
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/generic-type-arguments.output
@@ -0,0 +1,83 @@
+let cache: Dictionary<String, Array<Int>> = [:]
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        variableDecl
+          attributes:
+          modifiers:
+          bindingSpecifier: let
+          bindings:
+            patternBinding
+              initializer:
+                initializerClause
+                  equal: =
+                  value:
+                    dictionaryExpr
+                      leftSquare: [
+                      rightSquare: ]
+                      content: :
+              pattern:
+                identifierPattern
+                  identifier: identifier "cache"
+              typeAnnotation:
+                typeAnnotation
+                  colon: :
+                  type:
+                    identifierType
+                      name: identifier "Dictionary"
+                      genericArgumentClause:
+                        genericArgumentClause
+                          arguments:
+                            genericArgument
+                              trailingComma: ,
+                              argument:
+                                identifierType
+                                  name: identifier "String"
+                            genericArgument
+                              argument:
+                                identifierType
+                                  name: identifier "Array"
+                                  genericArgumentClause:
+                                    genericArgumentClause
+                                      arguments:
+                                        genericArgument
+                                          argument:
+                                            identifierType
+                                              name: identifier "Int"
+                                      leftAngle: <
+                                      rightAngle: >
+                          leftAngle: <
+                          rightAngle: >
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        variable_declaration
+          modifier: modifier "let"
+          pattern:
+            name_pattern
+              identifier: identifier "cache"
+          type:
+            generic_type_expr
+              base:
+                named_type_expr
+                  name: identifier "Dictionary"
+              type_argument:
+                named_type_expr
+                  name: identifier "String"
+                generic_type_expr
+                  base:
+                    named_type_expr
+                      name: identifier "Array"
+                  type_argument:
+                    named_type_expr
+                      name: identifier "Int"
+          value: map_literal "[:]"
diff --git a/unified/extractor/tests/corpus/swift/types/generic-type-arguments.swift b/unified/extractor/tests/corpus/swift/types/generic-type-arguments.swift
new file mode 100644
index 00000000000..d2156f9cee7
--- /dev/null
+++ b/unified/extractor/tests/corpus/swift/types/generic-type-arguments.swift
@@ -0,0 +1 @@
+let cache: Dictionary<String, Array<Int>> = [:]