averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[TBDGen] Add support for Objective-C Categories.

Browse Source 
Emit Objective-C Categories for extensions that have the @objc attribute
directly (or indirectly via one of its methods, subscripts, etc) attached.

Also associate and emit all methods for that category into the API JSON file.

This fixes rdar://94734748.
This commit is contained in:
Juergen Ributzka
2022-06-23 09:19:05 -07:00
parent fb5ef6893d
commit a9e02e91cb
8 changed files with 247 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/APIJSON/apigen.swift
View File

@@ -364,12 +364,12 @@ public func myFunction2() {}
// CHECK-NEXT: "super": "NSObject",
// CHECK-NEXT: "instanceMethods": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "init",
// CHECK-NEXT: "name": "method1",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "name": "method1",
// CHECK-NEXT: "name": "init",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: }
@@ -416,12 +416,12 @@ public func myFunction2() {}
// CHECK-NEXT: "super": "_TtC8MyModule4Test",
// CHECK-NEXT: "instanceMethods": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "init",
// CHECK-NEXT: "name": "method1",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "name": "method1",
// CHECK-NEXT: "name": "init",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: }
@@ -429,4 +429,5 @@ public func myFunction2() {}
// CHECK-NEXT: "classMethods": []
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "categories": [],
// CHECK-NEXT: "version": "1.0"

108
test/APIJSON/extension.swift Normal file
View File

@@ -0,0 +1,108 @@
// REQUIRES: objc_interop, OS=macosx
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) %s -typecheck -emit-module-interface-path %t/MyModule.swiftinterface -enable-library-evolution -module-name MyModule -swift-version 5
// RUN: %target-swift-api-extract -o - -pretty-print %t/MyModule.swiftinterface -module-name MyModule -module-cache-path %t | %FileCheck %s
import Foundation
// This should create an ObjC Category and a method with custom name.
extension NSDictionary {
@objc
public subscript(key: Any) -> Any? {
@objc(__custom_name:)
get { return nil }
}
}
// This shouldn't create an interface.
public class A {}
// This shouldn't create a category.
extension A {
public func run() {}
}
// This creates an interface.
public class B: NSObject {}
// This creates a category.
@objc
extension B {
public func run() {}
}
// This shouldn't create a category.
extension B {
public func noop() {}
}
// This creates a category with index 1.
@objc
extension B {
public func fun() {}
}
// CHECK: "interfaces": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "_TtC8MyModule1B",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface",
// CHECK-NEXT: "linkage": "exported",
// CHECK-NEXT: "super": "NSObject",
// CHECK-NEXT: "instanceMethods": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "init",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "classMethods": []
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "categories": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "MyModule",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface",
// CHECK-NEXT: "linkage": "exported",
// CHECK-NEXT: "interface": "NSDictionary",
// CHECK-NEXT: "instanceMethods": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "__custom_name:",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "classMethods": []
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "name": "MyModule",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface",
// CHECK-NEXT: "linkage": "exported",
// CHECK-NEXT: "interface": "_TtC8MyModule1B",
// CHECK-NEXT: "instanceMethods": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "run",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "classMethods": []
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "name": "MyModule1",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface",
// CHECK-NEXT: "linkage": "exported",
// CHECK-NEXT: "interface": "_TtC8MyModule1B",
// CHECK-NEXT: "instanceMethods": [
// CHECK-NEXT: {
// CHECK-NEXT: "name": "fun",
// CHECK-NEXT: "access": "public",
// CHECK-NEXT: "file": "/@input/MyModule.swiftinterface"
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "classMethods": []
// CHECK-NEXT: }
// CHECK-NEXT: ],

14
test/APIJSON/spi.swift
View File

@@ -92,6 +92,7 @@ public class MyClass2 : NSObject {
// CHECK-NEXT: "classMethods": []
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "categories": [],
// CHECK-NEXT: "version": "1.0"
// CHECK-NEXT: }
@@ -264,12 +265,12 @@ public class MyClass2 : NSObject {
// CHECK-SPI-NEXT: "super": "NSObject",
// CHECK-SPI-NEXT: "instanceMethods": [
// CHECK-SPI-NEXT: {
// CHECK-SPI-NEXT: "name": "init",
// CHECK-SPI-NEXT: "name": "spiMethod",
// CHECK-SPI-NEXT: "access": "private",
// CHECK-SPI-NEXT: "file": "/@input/MyModule.swiftmodule"
// CHECK-SPI-NEXT: },
// CHECK-SPI-NEXT: {
// CHECK-SPI-NEXT: "name": "spiMethod",
// CHECK-SPI-NEXT: "name": "init",
// CHECK-SPI-NEXT: "access": "private",
// CHECK-SPI-NEXT: "file": "/@input/MyModule.swiftmodule"
// CHECK-SPI-NEXT: }
@@ -284,18 +285,19 @@ public class MyClass2 : NSObject {
// CHECK-SPI-NEXT: "super": "NSObject",
// CHECK-SPI-NEXT: "instanceMethods": [
// CHECK-SPI-NEXT: {
// CHECK-SPI-NEXT: "name": "init",
// CHECK-SPI-NEXT: "access": "public",
// CHECK-SPI-NEXT: "name": "spiMethod",
// CHECK-SPI-NEXT: "access": "private",
// CHECK-SPI-NEXT: "file": "/@input/MyModule.swiftmodule"
// CHECK-SPI-NEXT: },
// CHECK-SPI-NEXT: {
// CHECK-SPI-NEXT: "name": "spiMethod",
// CHECK-SPI-NEXT: "access": "private",
// CHECK-SPI-NEXT: "name": "init",
// CHECK-SPI-NEXT: "access": "public",
// CHECK-SPI-NEXT: "file": "/@input/MyModule.swiftmodule"
// CHECK-SPI-NEXT: }
// CHECK-SPI-NEXT: ],
// CHECK-SPI-NEXT: "classMethods": []
// CHECK-SPI-NEXT: }
// CHECK-SPI-NEXT: ],
// CHECK-SPI-NEXT: "categories": [],
// CHECK-SPI-NEXT: "version": "1.0"
// CHECK-SPI-NEXT: }

1
test/APIJSON/struct.swift
View File

@@ -48,5 +48,6 @@ public struct TestStruct {
// CHECK-NEXT: }
// CHECK-NEXT: ],
// CHECK-NEXT: "interfaces": [],
// CHECK-NEXT: "categories": [],
// CHECK-NEXT: "version": "1.0"
// CHECK-NEXT: }