PR feedback

Author: madsodgaard

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/MySwiftClass.swift

@@ -35,6 +35,11 @@ public class MySwiftClass {
     }
   }
   public let warm: Bool = false
+  public var getAsync: Int64 {
+    get async {
+      return 42
+    }
+  }
 
   public static func method() {
     p("Hello from static method in a class!")

Sources/JExtractSwiftLib/ImportedDecls.swift

@@ -169,12 +169,6 @@ extension ImportedFunc {
   }
 
   var javaSetterName: String {
-    let firstParameterIsBoolean = self.functionSignature.parameters.first?.type.asNominalTypeDeclaration?.knownTypeKind == .bool
-
-    if !firstParameterIsBoolean || self.name.hasJavaBooleanNamingConvention {
-      return "set\(self.name.toCamelCase)"
-    } else {
-      return "setIs\(self.name.toCamelCase)"
-    }
+    "set\(self.name.toCamelCase)"
   }
 }

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -217,8 +217,10 @@ extension JNISwift2JavaGenerator {
       result = "\(tryClause)\(calleeName).\(decl.name)"
 
     case .setter:
-      assert(decl.functionSignature.parameters.count == 1)
-      let newValueParameter = decl.functionSignature.parameters[0]
+      guard let newValueParameter = decl.functionSignature.parameters.first else {
+        fatalError("Setter did not contain newValue parameter: \(decl)")
+      }
+
       result = "\(calleeName).\(decl.name) = \(renderJNIToSwiftConversion("newValue", type: newValueParameter.type))"
     }
 

Sources/JExtractSwiftLib/SwiftTypes/SwiftFunctionSignature.swift

@@ -211,11 +211,11 @@ extension SwiftFunctionSignature {
     switch binding.accessorBlock?.accessors {
     case .getter(let getter):
       if let getter = getter.as(AccessorDeclSyntax.self) {
-        effectSpecifiers = Self.effectSpecifiers(from: getter)
+        effectSpecifiers = try Self.effectSpecifiers(from: getter)
       }
     case .accessors(let accessors):
       if let getter = accessors.first(where: { $0.accessorSpecifier.tokenKind == .keyword(.get) }) {
-        effectSpecifiers = Self.effectSpecifiers(from: getter)
+        effectSpecifiers = try Self.effectSpecifiers(from: getter)
       }
     default:
       break
@@ -232,11 +232,14 @@ extension SwiftFunctionSignature {
     }
   }
 
-  private static func effectSpecifiers(from decl: AccessorDeclSyntax) -> [SwiftEffectSpecifier] {
+  private static func effectSpecifiers(from decl: AccessorDeclSyntax) throws -> [SwiftEffectSpecifier] {
     var effectSpecifiers = [SwiftEffectSpecifier]()
     if decl.effectSpecifiers?.throwsClause != nil {
       effectSpecifiers.append(.throws)
     }
+    if let asyncSpecifier = decl.effectSpecifiers?.asyncSpecifier {
+      throw SwiftFunctionTranslationError.async(asyncSpecifier)
+    }
     return effectSpecifiers
   }
 }

Tests/JExtractSwiftTests/JNI/JNIVariablesTests.swift

@@ -17,24 +17,25 @@ import Testing
 
 @Suite
 struct JNIVariablesTests {
-  let membersSource = """
+  let membersSource =
+    """
     public class MyClass {
-    public let constant: Int64
-    public var mutable: Int64
-    public var computed: Int64 {
-      return 0
-    }
-    public var computedThrowing: Int64 {
-      get throws { return 0 }
-    }
-    public var getterAndSetter: Int64 {
-      get { return 0 }
-      set { }
-    }
+      public let constant: Int64
+      public var mutable: Int64
+      public var computed: Int64 {
+        return 0
+      }
+      public var computedThrowing: Int64 {
+        get throws { return 0 }
+      }
+      public var getterAndSetter: Int64 {
+        get { return 0 }
+        set { }
+      }
       public var someBoolean: Bool
       public let isBoolean: Bool
     }
-  """
+    """
 
   @Test
   func constant_javaBindings() throws {
@@ -341,16 +342,16 @@ struct JNIVariablesTests {
         * public var someBoolean: Bool
         * }
         */
-        public void setIsSomeBoolean(boolean newValue) {
+        public void setSomeBoolean(boolean newValue) {
           long selfPointer = this.pointer();
-          MyClass.$setIsSomeBoolean(newValue, selfPointer);
+          MyClass.$setSomeBoolean(newValue, selfPointer);
         }
       """,
       """
       private static native boolean $isSomeBoolean(long selfPointer);
       """,
       """
-      private static native void $setIsSomeBoolean(boolean newValue, long selfPointer);
+      private static native void $setSomeBoolean(boolean newValue, long selfPointer);
       """
       ]
     )
@@ -373,14 +374,13 @@ struct JNIVariablesTests {
         }
         """,
         """
-        @_cdecl("Java_com_example_swift_MyClass__00024setIsSomeBoolean__ZJ")
-        func Java_com_example_swift_MyClass__00024setIsSomeBoolean__ZJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, newValue: jboolean, selfPointer: jlong) {
+        @_cdecl("Java_com_example_swift_MyClass__00024setSomeBoolean__ZJ")
+        func Java_com_example_swift_MyClass__00024setSomeBoolean__ZJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, newValue: jboolean, selfPointer: jlong) {
           let self$ = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
           self$.pointee.someBoolean = Bool(fromJNI: newValue, in: environment!)
         }
         """
       ]
     )
   }
-
 }