Formatting: omit explicit returns where possible

This commit sets up `.swift-format` rule to omit returns.

Author: natikgadzhi

.swift-format

@@ -10,6 +10,7 @@
         "AlwaysUseLowerCamelCase": false,
         "AmbiguousTrailingClosureOverload": false,
         "NoBlockComments": false,
+        "OmitExplicitReturns": true,
         "OrderedImports": true,
         "UseLetInEveryBoundCaseVariable": false,
         "UseSynthesizedInitializer": false

CodeGeneration/Sources/SyntaxSupport/Child.swift

@@ -108,7 +108,7 @@ public class Child {
 
   /// A name of this child that's suitable to be used for variable or enum case names.
   public var varOrCaseName: TokenSyntax {
-    return .identifier(lowercaseFirstWord(name: name))
+    .identifier(lowercaseFirstWord(name: name))
   }
 
   /// If this child has node choices, the type that the nested `SyntaxChildChoices` type should get.
@@ -137,7 +137,7 @@ public class Child {
 
   /// Determines if this child has a deprecated name
   public var hasDeprecatedName: Bool {
-    return deprecatedName != nil
+    deprecatedName != nil
   }
 
   /// If the child ends with "token" in the kind, it's considered a token node.

CodeGeneration/Sources/SyntaxSupport/Node.swift

@@ -60,7 +60,7 @@ public class Node {
   /// A name for this node that is suitable to be used as a variables or enum
   /// case's name.
   public var varOrCaseName: TokenSyntax {
-    return kind.varOrCaseName
+    kind.varOrCaseName
   }
 
   /// If this is a layout node, return a view of the node that provides access
@@ -264,7 +264,7 @@ public struct LayoutNode {
 
   /// Allow transparent accesss to the properties of the underlying `Node`.
   public subscript<T>(dynamicMember keyPath: KeyPath<Node, T>) -> T {
-    return node[keyPath: keyPath]
+    node[keyPath: keyPath]
   }
 
   /// The children of the layout node.
@@ -281,7 +281,7 @@ public struct LayoutNode {
 
   /// All children in the node that are not unexpected.
   public var nonUnexpectedChildren: [Child] {
-    return children.filter { !$0.isUnexpectedNodes }
+    children.filter { !$0.isUnexpectedNodes }
   }
 
   /// Traits that the node conforms to.
@@ -328,7 +328,7 @@ public struct CollectionNode {
 
   /// Allow transparent access to the properties of the underlying `Node`.
   public subscript<T>(dynamicMember keyPath: KeyPath<Node, T>) -> T {
-    return node[keyPath: keyPath]
+    node[keyPath: keyPath]
   }
 
   /// The kinds the elements can have.

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -333,7 +333,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
   /// A name for this node that is suitable to be used as a variables or enum
   /// case's name.
   public var varOrCaseName: TokenSyntax {
-    return .identifier(rawValue)
+    .identifier(rawValue)
   }
 
   /// The type name of this node in the SwiftSyntax module.
@@ -351,12 +351,12 @@ public enum SyntaxNodeKind: String, CaseIterable {
   /// For base nodes, the name of the corresponding protocol to which all the
   /// concrete nodes that have this base kind, conform.
   public var protocolType: TypeSyntax {
-    return "\(syntaxType)Protocol"
+    "\(syntaxType)Protocol"
   }
 
   /// The name of this node at the `RawSyntax` level.
   public var rawType: TypeSyntax {
-    return "Raw\(syntaxType)"
+    "Raw\(syntaxType)"
   }
 
   /// For base nodes, the name of the corresponding raw protocol to which all the

CodeGeneration/Sources/SyntaxSupport/TokenSpec.swift

@@ -75,7 +75,7 @@ public struct TokenSpec {
   ///   - name: A name of the token.
   ///   - text: An actual text of the punctuation token.
   static func punctuator(name: String, text: String) -> TokenSpec {
-    return TokenSpec(
+    TokenSpec(
       name: name,
       nameForDiagnostics: text,
       text: text,
@@ -89,7 +89,7 @@ public struct TokenSpec {
   ///   - name: A name of the token.
   ///   - text: An actual text of the pound keyword token.
   static func poundKeyword(name: String, text: String) -> TokenSpec {
-    return TokenSpec(
+    TokenSpec(
       name: name,
       nameForDiagnostics: text,
       text: text,
@@ -104,7 +104,7 @@ public struct TokenSpec {
   ///   - nameForDiagnostics: A name of the token that can be shown in diagnostics.
   ///   - text: An actual text of the token, if available.
   static func other(name: String, nameForDiagnostics: String, text: String? = nil) -> TokenSpec {
-    return TokenSpec(
+    TokenSpec(
       name: name,
       nameForDiagnostics: nameForDiagnostics,
       text: text,

CodeGeneration/Sources/Utils/CodeGenerationFormat.swift

@@ -99,7 +99,7 @@ public class CodeGenerationFormat: BasicFormat {
   private func shouldBeSeparatedByTwoNewlines(node: CodeBlockItemSyntax) -> Bool {
     // First item in the ``CodeBlockItemListSyntax`` don't need a newline or indentation if the parent is a ``SourceFileSyntax``.
     // We want to group imports so newline between them should be omitted
-    return node.parent?.as(CodeBlockItemListSyntax.self)?.first == node || node.item.is(ImportDeclSyntax.self)
+    node.parent?.as(CodeBlockItemListSyntax.self)?.first == node || node.item.is(ImportDeclSyntax.self)
   }
 
   private func ensuringTwoLeadingNewlines<NodeType: SyntaxProtocol>(node: NodeType) -> NodeType {

CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

@@ -54,7 +54,7 @@ public extension Child {
   }
 
   var parameterType: TypeSyntax {
-    return self.buildableType.optionalWrapped(type: parameterBaseType)
+    self.buildableType.optionalWrapped(type: parameterBaseType)
   }
 
   var defaultValue: ExprSyntax? {

CodeGeneration/Sources/Utils/SyntaxBuildableType.swift

@@ -133,7 +133,7 @@ public struct SyntaxBuildableType: Hashable {
   /// which will eventually get built from `SwiftSyntaxBuilder`. If the type
   /// is optional, this terminates with a `?`.
   public var syntax: TypeSyntax {
-    return optionalWrapped(type: syntaxBaseName)
+    optionalWrapped(type: syntaxBaseName)
   }
 
   /// The type that is used for parameters in SwiftSyntaxBuilder that take this
@@ -147,7 +147,7 @@ public struct SyntaxBuildableType: Hashable {
   }
 
   public var parameterType: TypeSyntax {
-    return optionalWrapped(type: parameterBaseType)
+    optionalWrapped(type: parameterBaseType)
   }
 
   /// Assuming that this is a collection type, the non-optional type of the result builder

CodeGeneration/Sources/Utils/Utils.swift

@@ -21,8 +21,8 @@ extension String {
 
   /// Removes all empty lines from a multi-line string.
   public var removingEmptyLines: String {
-    return
-      self
+
+    self
       .split(whereSeparator: \.isNewline)
       .filter { !$0.allSatisfy(\.isWhitespace) }
       .joined(separator: "\n")

CodeGeneration/Sources/generate-swift-syntax/GenerateSwiftSyntax.swift

@@ -39,7 +39,7 @@ struct GeneratedFileSpec {
   let pathComponents: [String]
   private let contentsGenerator: () -> String
   var contents: String {
-    return self.contentsGenerator()
+    self.contentsGenerator()
   }
 
   init(_ pathComponents: [String], _ contents: @escaping @autoclosure () -> String) {
@@ -55,7 +55,7 @@ struct GeneratedFileSpec {
 struct TemplateSpec {
   let sourceFileGenerator: () -> SourceFileSyntax
   var sourceFile: SourceFileSyntax {
-    return self.sourceFileGenerator()
+    self.sourceFileGenerator()
   }
   let module: String
   let filename: String