Generate interface typealiases before the protocol.

tristanlabelle · Mar 23, 2024 · 66e1d48 · 66e1d48
1 parent 02ee970
commit 66e1d48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Generator/Sources/SwiftWinRT/Writing/InterfaceDefinition.swift b/Generator/Sources/SwiftWinRT/Writing/InterfaceDefinition.swift
@@ -8,15 +8,15 @@ import WindowsMetadata
 // Interfaces are generated as two types: a protocol and an existential typealias.
 // Given an interface IFoo, we generate:
 //
-//     protocol IFooProtocol { ... }
 //     typealias IFoo = any IFooProtocol
+//     protocol IFooProtocol { ... }
 //
 // This provides a more natural (C#-like) syntax when using those types:
 //
 //     var foo: IFoo? = getFoo()
 internal func writeInterfaceDefinition(_ interface: InterfaceDefinition, projection: SwiftProjection, to writer: SwiftSourceFileWriter) throws {
-    try writeProtocol(interface, projection: projection, to: writer)
     try writeProtocolTypeAlias(interface, projection: projection, to: writer)
+    try writeProtocol(interface, projection: projection, to: writer)
 
     let typeName = try projection.toProtocolName(interface)
     switch interface.name {

diff --git a/Generator/Sources/SwiftWinRT/Writing/NamespaceAlias.swift b/Generator/Sources/SwiftWinRT/Writing/NamespaceAlias.swift
@@ -15,14 +15,6 @@ internal func writeNamespaceAliasesFile(typeDefinitions: [TypeDefinition], modul
 }
 
 internal func writeNamespaceAlias(_ typeDefinition: TypeDefinition, projection: SwiftProjection, to writer: SwiftSourceFileWriter) throws {
-    if let interface = typeDefinition as? InterfaceDefinition {
-        try writer.writeProtocol(
-            visibility: SwiftProjection.toVisibility(interface.visibility),
-            name: projection.toProtocolName(interface, namespaced: false),
-            typeParams: interface.genericParams.map { $0.name },
-            bases: [projection.toBaseProtocol(interface)]) { _ in }
-    }
-
     try writer.writeTypeAlias(
         visibility: SwiftProjection.toVisibility(typeDefinition.visibility),
         name: projection.toTypeName(typeDefinition, namespaced: false),
@@ -31,6 +23,14 @@ internal func writeNamespaceAlias(_ typeDefinition: TypeDefinition, projection:
             name: projection.toTypeName(typeDefinition),
             genericArgs: typeDefinition.genericParams.map { SwiftType.identifier(name: $0.name) }))
 
+    if let interface = typeDefinition as? InterfaceDefinition {
+        try writer.writeProtocol(
+            visibility: SwiftProjection.toVisibility(interface.visibility),
+            name: projection.toProtocolName(interface, namespaced: false),
+            typeParams: interface.genericParams.map { $0.name },
+            bases: [projection.toBaseProtocol(interface)]) { _ in }
+    }
+
     if typeDefinition is InterfaceDefinition || typeDefinition is DelegateDefinition {
         try writer.writeTypeAlias(
             visibility: SwiftProjection.toVisibility(typeDefinition.visibility),