Merge pull request swiftlang#1518 from stevapple/else-spacing

Add whitespace before `else`

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -122,7 +122,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("do", isLexerClassified: true),
   KeywordSpec("dynamic"),
   KeywordSpec("each"),
-  KeywordSpec("else", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("else", isLexerClassified: true, requiresLeadingSpace: true, requiresTrailingSpace: true),
   KeywordSpec("enum", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("escaping"),
   KeywordSpec("exclusivity"),

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -198,6 +198,8 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case .keyword(.`catch`):
       return true
+    case .keyword(.`else`):
+      return true
     case .keyword(.`in`):
       return true
     case .keyword(.`where`):

Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift

@@ -45,6 +45,26 @@ final class IfStmtTests: XCTestCase {
         }
         """
       ),
+      #line: (
+        ExprSyntax(
+          """
+          if foo == x {
+            return foo
+          }
+          else {
+            return bar
+          }
+          """
+        ).cast(IfExprSyntax.self),
+        """
+        if foo == x {
+            return foo
+        }
+        else {
+            return bar
+        }
+        """
+      ),
       #line: (
         try IfExprSyntax("if foo == x") { StmtSyntax("return foo") },
         """
@@ -62,7 +82,7 @@ final class IfStmtTests: XCTestCase {
         """
         if foo == x {
             return foo
-        }else {
+        } else {
             return bar
         }
         """
@@ -72,7 +92,7 @@ final class IfStmtTests: XCTestCase {
         """
         if foo == x {
             return foo
-        }else if foo == z {
+        } else if foo == z {
             return baz
         }
         """