add variable tests

Author: madsodgaard

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/MySwiftClass.swift

@@ -34,6 +34,7 @@ public class MySwiftClass {
       mutable = newValue * 2
     }
   }
+  public let warm: Bool = false
 
   public static func method() {
     p("Hello from static method in a class!")

Samples/JExtractJNISampleApp/src/main/java/com/example/swift/HelloJava2SwiftJNI.java

@@ -45,6 +45,8 @@ static void examples() {
             MySwiftClass myClass = MySwiftClass.init(10, 5, arena);
             MySwiftClass myClass2 = MySwiftClass.init(arena);
 
+            System.out.println("myClass.isWarm: " + myClass.isWarm());
+
             try {
                 myClass.throwingFunction();
             } catch (Exception e) {

Sources/JExtractSwiftLib/Convenience/String+Extensions.swift

@@ -24,30 +24,12 @@ extension String {
   }
 
   /// Returns whether the string is of the format `isX`
-  private var hasJavaBooleanNamingConvention: Bool {
+  var hasJavaBooleanNamingConvention: Bool {
     guard self.hasPrefix("is"), self.count > 2 else {
       return false
     }
 
     let thirdCharacterIndex = self.index(self.startIndex, offsetBy: 2)
     return self[thirdCharacterIndex].isUppercase
   }
-
-  func javaGetterName(isBoolean: Bool) -> String {
-    if !isBoolean {
-      return "get\(self.toCamelCase)"
-    } else if !hasJavaBooleanNamingConvention {
-      return "is\(self.toCamelCase)"
-    } else {
-      return self.toCamelCase
-    }
-  }
-
-  func javaSetterName(isBoolean: Bool) -> String {
-    if !isBoolean || !hasJavaBooleanNamingConvention {
-      return "set\(self.toCamelCase)"
-    } else {
-      return "setIs\(self.toCamelCase)"
-    }
-  }
 }

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift

@@ -126,10 +126,9 @@ extension FFMSwift2JavaGenerator {
       let loweredSignature = try lowering.lowerFunctionSignature(decl.functionSignature)
 
       // Name.
-      let returnsBoolean = decl.functionSignature.result.type.asNominalTypeDeclaration?.knownTypeKind == .bool
       let javaName = switch decl.apiKind {
-      case .getter: decl.name.javaGetterName(isBoolean: returnsBoolean)
-      case .setter: decl.name.javaSetterName(isBoolean: returnsBoolean)
+      case .getter: decl.javaGetterName
+      case .setter: decl.javaSetterName
       case .function, .initializer: decl.name
       }
 

Sources/JExtractSwiftLib/ImportedDecls.swift

@@ -154,3 +154,27 @@ extension ImportedFunc: Hashable {
     return lhs === rhs
   }
 }
+
+extension ImportedFunc {
+  var javaGetterName: String {
+    let returnsBoolean = self.functionSignature.result.type.asNominalTypeDeclaration?.knownTypeKind == .bool
+
+    if !returnsBoolean {
+      return "get\(self.name.toCamelCase)"
+    } else if !self.name.hasJavaBooleanNamingConvention {
+      return "is\(self.name.toCamelCase)"
+    } else {
+      return self.name.toCamelCase
+    }
+  }
+
+  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)"
+    }
+  }
+}

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift

@@ -38,10 +38,9 @@ extension JNISwift2JavaGenerator {
       let parentName = decl.parentType?.asNominalType?.nominalTypeDecl.qualifiedName ?? swiftModuleName
 
       // Name.
-      let returnsBoolean = translatedFunctionSignature.resultType == .boolean
       let javaName = switch decl.apiKind {
-      case .getter: decl.name.javaGetterName(isBoolean: returnsBoolean)
-      case .setter: decl.name.javaSetterName(isBoolean: returnsBoolean)
+      case .getter: decl.javaGetterName
+      case .setter: decl.javaSetterName
       case .function, .initializer: decl.name
       }