Merge pull request #464 from ahoppen/ahoppen/enumerate-contextual-keywords

Adjustments for explicit enumeration of contextual keywords in SwiftSyntax

Author: ahoppen

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -1718,7 +1718,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
     // this special exception for `async let` statements to avoid breaking prematurely between the
     // `async` and `let` keywords.
     let breakOrSpace: Token
-    if node.name.tokenKind == .contextualKeyword("async") {
+    if node.name.tokenKind == .contextualKeyword(.async) {
       breakOrSpace = .space
     } else {
       breakOrSpace = .break

Sources/SwiftFormatRules/UseEarlyExits.swift

@@ -65,7 +65,7 @@ public final class UseEarlyExits: SyntaxFormatRule {
 
         diagnose(.useGuardStatement, on: ifStatement.elseKeyword)
 
-        let trueBlock = ifStatement.body.withLeftBrace(nil).withRightBrace(nil)
+        let trueBlock = ifStatement.body
 
         let guardKeyword = TokenSyntax.guardKeyword(
           leadingTrivia: ifStatement.ifKeyword.leadingTrivia,

Sources/SwiftFormatRules/UseShorthandTypeNames.swift

@@ -520,12 +520,12 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
       // Look for accessors that indicate that this is a computed property. If none are found, then
       // it is a stored property (e.g., having only observers like `willSet/didSet`).
       switch accessorDecl.accessorKind.tokenKind {
-      case .contextualKeyword("get"),
-        .contextualKeyword("set"),
-        .contextualKeyword("unsafeAddress"),
-        .contextualKeyword("unsafeMutableAddress"),
-        .contextualKeyword("_read"),
-        .contextualKeyword("_modify"):
+      case .contextualKeyword(.get),
+        .contextualKeyword(.set),
+        .contextualKeyword(.unsafeAddress),
+        .contextualKeyword(.unsafeMutableAddress),
+        .contextualKeyword(._read),
+        .contextualKeyword(._modify):
         return false
       default:
         return true

Sources/SwiftFormatRules/UseSingleLinePropertyGetter.swift

@@ -26,7 +26,7 @@ public final class UseSingleLinePropertyGetter: SyntaxFormatRule {
       let acc = accessorBlock.accessors.first,
       let body = acc.body,
       accessorBlock.accessors.count == 1,
-      acc.accessorKind.tokenKind == .contextualKeyword("get"),
+      acc.accessorKind.tokenKind == .contextualKeyword(.get),
       acc.attributes == nil,
       acc.modifier == nil,
       acc.asyncKeyword == nil,