fix: Add attribute nonnull_error if returning pointer and error

jefft0 · jefft0 · commit 92b5fb7bb8e3 · 2022-08-30T01:54:36.000-07:00
Signed-off-by: jefft0 &lt;jeff@thefirst.org&gt;
diff --git a/bind/genobjc.go b/bind/genobjc.go
@@ -582,6 +582,11 @@ func (s *funcSummary) asSignature(g *ObjcGen) string {
 		}
 		params = append(params, fmt.Sprintf("%s:(%s)%s", key, g.objcType(p.typ)+"* _Nullable", p.name))
 	}
+	if params[len(params)-1] == ":(NSError* _Nullable* _Nullable)error" &&
+		(s.ret == "NSData* _Nullable" || s.ret == "NSString* _Nullable") {
+		// Allow returning nil to Swift.
+		params = append(params, "__attribute__((swift_error(nonnull_error)))")
+	}
 	return strings.Join(params, " ")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,11 @@ func (s funcSummary) asSignature(g ObjcGen) string {`
`582`	`582`	`}`
`583`	`583`	`params = append(params, fmt.Sprintf("%s:(%s)%s", key, g.objcType(p.typ)+"* _Nullable", p.name))`
`584`	`584`	`}`
	`585`	`+ if params[len(params)-1] == ":(NSError* _Nullable* _Nullable)error" &&`
	`586`	`+ (s.ret == "NSData* _Nullable" \|\| s.ret == "NSString* _Nullable") {`
	`587`	`+ // Allow returning nil to Swift.`
	`588`	`+ params = append(params, "__attribute__((swift_error(nonnull_error)))")`
	`589`	`+ }`
`585`	`590`	`return strings.Join(params, " ")`
`586`	`591`	`}`
`587`	`592`