fixing unwrap

Author: leogdion

.swiftlint.yml

@@ -77,7 +77,7 @@ opt_in_rules:
   - strong_iboutlet
   - toggle_bool
 #  - trailing_closure
-  - type_contents_order
+#  - type_contents_order
   - unavailable_function
   - unneeded_parentheses_in_closure_argument
   - unowned_variable_capture
@@ -120,7 +120,7 @@ excluded:
   - Mint
   - Examples
   - Macros
-  - Sources/SyntaxKit/parser
+  - Sources/SyntaxKit/Parser
 indentation_width:
   indentation_width: 2
 file_name:

Sources/SyntaxKit/Expressions/Closure.swift

@@ -7,7 +7,7 @@
 //
 //  Permission is hereby granted, free of charge, to any person
 //  obtaining a copy of this software and associated documentation
-//  files (the “Software”), to deal in the Software without
+//  files (the "Software"), to deal in the Software without
 //  restriction, including without limitation the rights to use,
 //  copy, modify, merge, publish, distribute, sublicense, and/or
 //  sell copies of the Software, and to permit persons to whom the
@@ -17,7 +17,7 @@
 //  The above copyright notice and this permission notice shall be
 //  included in all copies or substantial portions of the Software.
 //
-//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 //  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 //  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 //  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
@@ -125,6 +125,14 @@ public struct Closure: CodeBlock {
       )
     }
 
+    // Prepare return clause safely
+    let returnClause: ReturnClauseSyntax? = returnType.map {
+      ReturnClauseSyntax(
+        arrow: .arrowToken(trailingTrivia: .space),
+        type: $0.typeSyntax
+      )
+    }
+
     let signature: ClosureSignatureSyntax? =
       (parameters.isEmpty && returnType == nil && capture.isEmpty && attributes.isEmpty)
       ? nil
@@ -171,12 +179,7 @@ public struct Closure: CodeBlock {
             )
           ),
         effectSpecifiers: nil,
-        returnClause: returnType == nil
-          ? nil
-          : ReturnClauseSyntax(
-            arrow: .arrowToken(trailingTrivia: .space),
-            type: returnType!.typeSyntax
-          ),
+        returnClause: returnClause,
         inKeyword: .keyword(.in, leadingTrivia: .space, trailingTrivia: .space)
       )