Dev: improve throws support for both SwiftFunc and SwiftCallbackFunc

Author: andriydruk

compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java

@@ -102,11 +102,11 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
         }
 
         if (returnSwiftType == null) {
-            swiftWriter.emit(") {\n");
+            swiftWriter.emit(String.format(")%s {\n", isThrown ? " throws" : ""));
         }
         else {
             String returnParamType = isReturnTypeOptional ? returnSwiftType.swiftType + "?" : returnSwiftType.swiftType;
-            swiftWriter.emit(String.format(") -> %s {\n", returnParamType));
+            swiftWriter.emit(String.format(")%s -> %s {\n", isThrown ? " throws" : "", returnParamType));
         }
 
         for (SwiftParamDescriptor param : params) {
@@ -173,20 +173,36 @@ else if (isReturnTypeOptional) {
         }
 
         if (returnSwiftType != null) {
-            swiftWriter.emit(String.format(") else { %s }\n", isReturnTypeOptional ? "return nil" : "fatalError(\"Don't support nil here!\")"));
+            swiftWriter.emit(") else {");
+            swiftWriter.emitStatement("if let throwable = JNI.ExceptionCheck() {");
+            if (isThrown) {
+                swiftWriter.emitStatement("throw NSError(domain: \"JavaException\", code: 1)");
+            }
+            else {
+                swiftWriter.emitStatement("fatalError(\"Don't support exception here!\")");
+            }
+            swiftWriter.emitStatement("} else {");
+            if (isReturnTypeOptional) {
+                swiftWriter.emitStatement("return nil");
+            }
+            else {
+                swiftWriter.emitStatement("fatalError(\"Don't support nil here!\")");
+            }
+            swiftWriter.emitStatement("}");
+            swiftWriter.emitStatement("}");
         }
         else {
             swiftWriter.emit(")\n");
-        }
 
-        swiftWriter.emitStatement("if let throwable = JNI.ExceptionCheck() {");
-        if (isThrown) {
-            swiftWriter.emitStatement("throw NSError(domain: \"JavaException\", code: 1)");
-        }
-        else {
-            swiftWriter.emitStatement("fatalError(\"JavaException\")");
+            swiftWriter.emitStatement("if let throwable = JNI.ExceptionCheck() {");
+            if (isThrown) {
+                swiftWriter.emitStatement("throw NSError(domain: \"JavaException\", code: 1)");
+            }
+            else {
+                swiftWriter.emitStatement("fatalError(\"JavaException\")");
+            }
+            swiftWriter.emitStatement("}");
         }
-        swiftWriter.emitStatement("}");
 
         if (returnSwiftType != null) {
             swiftWriter.emitStatement("do {");

compiler/src/main/java/com/readdle/codegen/SwiftFuncDescriptor.java

@@ -142,15 +142,6 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
         }
         swiftWriter.emit(")\n");
 
-        if (isThrown) {
-            swiftWriter.emitStatement("}");
-            swiftWriter.emitStatement("catch {");
-            swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
-            swiftWriter.emitStatement("JNI.api.ThrowNew(JNI.env, SwiftErrorClass, errorString)");
-            swiftWriter.emitStatement(String.format("return%s", returnSwiftType != null ? " nil" : ""));
-            swiftWriter.emitStatement("}");
-        }
-
         if (returnSwiftType != null) {
             swiftWriter.emitStatement("do {");
             if (isReturnTypeOptional) {
@@ -167,6 +158,15 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
             swiftWriter.emitStatement("}");
         }
 
+        if (isThrown) {
+            swiftWriter.emitStatement("}");
+            swiftWriter.emitStatement("catch {");
+            swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
+            swiftWriter.emitStatement("JNI.api.ThrowNew(JNI.env, SwiftErrorClass, errorString)");
+            swiftWriter.emitStatement(String.format("return%s", returnSwiftType != null ? " nil" : ""));
+            swiftWriter.emitStatement("}");
+        }
+
         swiftWriter.emitStatement("}");
 
         swiftWriter.emitEmptyLine();