reformat

Author: ktoso

Package.swift

@@ -64,7 +64,7 @@ func getJavaHomeFromLibexecJavaHome() -> String? {
 
   let pipe = Pipe()
   task.standardOutput = pipe
-  task.standardError = pipe  // Redirect standard error to the same pipe for simplicity
+  task.standardError = pipe // Redirect standard error to the same pipe for simplicity
 
   do {
     try task.run()
@@ -265,7 +265,7 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
     .package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
     .package(url: "https://github.com/apple/swift-log", from: "1.2.0"),
-    .package(url: "https://github.com/apple/swift-collections", .upToNextMinor(from: "1.3.0")),  // primarily for ordered collections
+    .package(url: "https://github.com/apple/swift-collections", .upToNextMinor(from: "1.3.0")), // primarily for ordered collections
     .package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.2.1", traits: ["SubprocessFoundation"]),
 
     // Benchmarking
@@ -312,7 +312,7 @@ let package = Package(
           ["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"],
           .when(platforms: [.macOS, .linux, .windows])
         ),
-        .unsafeFlags(["-Xfrontend", "-sil-verify-none"], .when(configuration: .release)),  // Workaround for https://github.com/swiftlang/swift/issues/84899
+        .unsafeFlags(["-Xfrontend", "-sil-verify-none"], .when(configuration: .release)), // Workaround for https://github.com/swiftlang/swift/issues/84899
       ],
       linkerSettings: [
         .unsafeFlags(

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -184,8 +184,8 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     log("Forward environment: \(gradlewEnvironment)")
 
     let gradleExecutable =
-      findExecutable(name: "gradle")  // try using installed 'gradle' if available in PATH
-      ?? swiftJavaDirectory.appending(path: "gradlew")  // fallback to calling ./gradlew if gradle is not installed
+      findExecutable(name: "gradle") // try using installed 'gradle' if available in PATH
+      ?? swiftJavaDirectory.appending(path: "gradlew") // fallback to calling ./gradlew if gradle is not installed
     log("Detected 'gradle' executable (or gradlew fallback): \(gradleExecutable)")
 
     commands += [

Plugins/JavaCompilerPlugin/JavaCompilerPlugin.swift

@@ -82,10 +82,10 @@ struct JavaCompilerBuildToolPlugin: BuildToolPlugin {
           .appending(path: javac),
         arguments: javaFiles.map { $0.path } + [
           "-d", javaClassFileURL.path,
-          "-parameters",  // keep parameter names, which allows us to emit them in generated Swift decls
+          "-parameters", // keep parameter names, which allows us to emit them in generated Swift decls
         ] + (config?.compilerVersionArgs ?? []),
         inputFiles: javaFiles,
-        outputFiles: classFiles  // FIXME: this is not quite enough, javac may generate more files for closures etc, which we don't know about unless we compile first
+        outputFiles: classFiles // FIXME: this is not quite enough, javac may generate more files for closures etc, which we don't know about unless we compile first
       )
     ]
   }

Samples/JavaDependencySampleApp/Sources/JavaDependencySample/main.swift

@@ -26,7 +26,7 @@ print("-----------------------------------------------------------------------")
 print("Start Sample app...")
 
 // TODO: locating the classpath is more complex, need to account for dependencies of our module
-let swiftJavaClasspath = findSwiftJavaClasspaths()  // scans for .classpath files
+let swiftJavaClasspath = findSwiftJavaClasspaths() // scans for .classpath files
 
 // 1) Start a JVM with appropriate classpath
 let jvm = try JavaVirtualMachine.shared(classpath: swiftJavaClasspath)

Samples/JavaSieve/Sources/JavaSieve/main.swift

@@ -23,7 +23,7 @@ do {
     print("Found prime: \(prime.intValue())")
   }
 
-  _ = try JavaClass<RoundingMode>().HALF_UP  // can import a Java enum value
+  _ = try JavaClass<RoundingMode>().HALF_UP // can import a Java enum value
 } catch {
   print("Failure: \(error)")
 }

Sources/JExtractSwiftLib/Convenience/SwiftSyntax+Extensions.swift

@@ -290,7 +290,7 @@ class TriviaSanitizingDescriptionVisitor: SyntaxVisitor {
   override func visit(_ node: TokenSyntax) -> SyntaxVisitorContinueKind {
     let tokenKind = node.tokenKind
     switch (prevTokenKind, tokenKind) {
-    case  // No whitespace after open parentheses.
+    case // No whitespace after open parentheses.
     (.leftAngle, _), (.leftParen, _), (.leftSquare, _), (.endOfFile, _),
       // No whitespace before close parentheses.
       (_, .rightAngle), (_, .rightParen), (_, .rightSquare):

Sources/JExtractSwiftLib/FFM/CDeclLowering/FFMSwift2JavaGenerator+FunctionLowering.swift

@@ -797,7 +797,7 @@ struct CdeclLowering {
       let resultName = "_result"
 
       return LoweredResult(
-        cdeclResultType: .void,  // we call into the _result_initialize instead
+        cdeclResultType: .void, // we call into the _result_initialize instead
         cdeclOutParameters: [
           SwiftParameter(
             convention: .byValue,
@@ -817,7 +817,7 @@ struct CdeclLowering {
                       parameters: [.placeholder],
                       result: .method(
                         base: "\(outParameterName)_initialize",
-                        methodName: nil,  // just `(...)` apply the closure
+                        methodName: nil, // just `(...)` apply the closure
                         arguments: [
                           .init(label: nil, argument: .member(.constant("_0"), member: "baseAddress!")),
                           .init(label: nil, argument: .member(.constant("_0"), member: "count")),

Sources/JExtractSwiftLib/FFM/ConversionStep.swift

@@ -190,7 +190,7 @@ enum ConversionStep: Equatable {
         if let methodName {
           ".\(methodName)"
         } else {
-          ""  // this is equivalent to calling `base(...)`
+          "" // this is equivalent to calling `base(...)`
         }
 
       if let base {

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -47,7 +47,7 @@ extension FFMSwift2JavaGenerator {
     printJavaBindingDescriptorClass(&printer, cFunc) { printer in
       if let outCallback = translated.translatedSignature.result.outCallback {
         self.printUpcallParameterDescriptorClasses(&printer, outCallback)
-      } else {  // FIXME: not an "else"
+      } else { // FIXME: not an "else"
         self.printParameterDescriptorClasses(&printer, cFunc)
       }
     }
@@ -120,7 +120,7 @@ extension FFMSwift2JavaGenerator {
     var params: [String] = []
     var args: [String] = []
     for param in cFunc.parameters {
-      let name = param.name!  // !-safe, because cdecl lowering guarantees the parameter named.
+      let name = param.name! // !-safe, because cdecl lowering guarantees the parameter named.
 
       let annotationsStr =
         if param.type.javaType.parameterAnnotations.isEmpty {
@@ -484,7 +484,7 @@ extension FFMSwift2JavaGenerator {
       let placeholderForDowncall: String?
 
       if let outCallback = translatedSignature.result.outCallback {
-        placeholder = "\(outCallback.name)"  // the result will be read out from the _result_initialize java class
+        placeholder = "\(outCallback.name)" // the result will be read out from the _result_initialize java class
         placeholderForDowncall = "\(downCall)"
       } else if translatedSignature.result.outParameters.isEmpty {
         placeholder = downCall
@@ -504,8 +504,8 @@ extension FFMSwift2JavaGenerator {
       if translatedSignature.result.javaResultType != .void {
         switch translatedSignature.result.conversion {
         case .initializeResultWithUpcall(_, let extractResult):
-          printer.print("\(result);")  // the result in the callback situation is a series of setup steps
-          printer.print("return \(extractResult.render(&printer, placeholder));")  // extract the actual result
+          printer.print("\(result);") // the result in the callback situation is a series of setup steps
+          printer.print("return \(extractResult.render(&printer, placeholder));") // extract the actual result
         default:
           printer.print("return \(result);")
         }
@@ -613,7 +613,7 @@ extension FFMSwift2JavaGenerator.JavaConversionStep {
     case .placeholderForSwiftThunkName:
       if let placeholderForDowncall {
         let downcall = "\(placeholderForDowncall)"
-        return String(downcall[..<(downcall.firstIndex(of: ".") ?? downcall.endIndex)])  // . separates thunk name from the `.call`
+        return String(downcall[..<(downcall.firstIndex(of: ".") ?? downcall.endIndex)]) // . separates thunk name from the `.call`
       } else {
         return "/*placeholderForDowncall undefined!*/"
       }

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift

@@ -500,7 +500,7 @@ extension FFMSwift2JavaGenerator {
                 .commaSeparated([.constant("ValueLayout.JAVA_BYTE"), .placeholder]),
                 base: .temporaryArena,
                 function: "allocateFrom",
-                withArena: false  // this would pass the arena as last argument, but instead we make a call on the arena
+                withArena: false // this would pass the arena as last argument, but instead we make a call on the arena
               ),
               .property(.placeholder, propertyName: "length"),
             ])
@@ -654,7 +654,7 @@ extension FFMSwift2JavaGenerator {
             )
 
           case .foundationData, .essentialsData:
-            break  // Implemented as wrapper
+            break // Implemented as wrapper
 
           case .unsafePointer, .unsafeMutablePointer:
             // FIXME: Implement
@@ -694,7 +694,7 @@ extension FFMSwift2JavaGenerator {
           javaResultType:
             .array(.byte),
           annotations: [.unsigned],
-          outParameters: [],  // no out parameters, but we do an "out" callback
+          outParameters: [], // no out parameters, but we do an "out" callback
           outCallback: OutCallback(
             name: "$_result_initialize",
             members: [
@@ -733,7 +733,7 @@ extension FFMSwift2JavaGenerator {
                 )
               ),
               // .constant("var  = new \(.placeholderForDowncallThunkName).."),
-              .placeholderForDowncall,  // perform the downcall here
+              .placeholderForDowncall, // perform the downcall here
             ],
             extractResult: .property(.constant("_result_initialize"), propertyName: "result")
           )
@@ -880,7 +880,7 @@ extension CType {
     case .integral(.signed(bits: 32)): return .int
     case .integral(.signed(bits: 64)): return .long
     case .integral(.unsigned(bits: 8)): return .byte
-    case .integral(.unsigned(bits: 16)): return .char  // char is Java's only unsigned primitive, we can use it!
+    case .integral(.unsigned(bits: 16)): return .char // char is Java's only unsigned primitive, we can use it!
     case .integral(.unsigned(bits: 32)): return .int
     case .integral(.unsigned(bits: 64)): return .long