Merge pull request #1331 from kimdv/kimdv/remove-sapce-after-switch-case-label-colon-and-break-stmt

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

@@ -456,7 +456,7 @@ public let EXPR_NODES: [Node] = [
          Child(name: "CaseItems",
                kind: .collection(kind: "CaseItemList", collectionElementName: "CaseItem")),
          Child(name: "Colon",
-               kind: .token(choices: [.token(tokenKind: "ColonToken")]))
+               kind: .token(choices: [.token(tokenKind: "ColonToken")], requiresTrailingSpace: false))
        ]),
 
   Node(name: "SwitchDefaultLabel",
@@ -466,7 +466,7 @@ public let EXPR_NODES: [Node] = [
          Child(name: "DefaultKeyword",
                kind: .token(choices: [.keyword(text: "default")])),
          Child(name: "Colon",
-               kind: .token(choices: [.token(tokenKind: "ColonToken")]))
+               kind: .token(choices: [.token(tokenKind: "ColonToken")], requiresTrailingSpace: false))
        ]),
 
   Node(name: "CaseItem",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/StmtNodes.swift

@@ -231,7 +231,7 @@ public let STMT_NODES: [Node] = [
        kind: "Stmt",
        children: [
          Child(name: "BreakKeyword",
-               kind: .token(choices: [.keyword(text: "break")])),
+               kind: .token(choices: [.keyword(text: "break")], requiresTrailingSpace: false)),
          Child(name: "Label",
                kind: .token(choices: [.token(tokenKind: "IdentifierToken")]),
                nameForDiagnostics: "label",

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -178,12 +178,18 @@ open class BasicFormat: SyntaxRewriter {
     switch keyPath {
     case \AvailabilityArgumentSyntax.entry: 
       return false
+    case \BreakStmtSyntax.breakKeyword: 
+      return false
     case \DeclNameArgumentSyntax.colon: 
       return false
     case \DictionaryExprSyntax.content: 
       return false
     case \DynamicReplacementArgumentsSyntax.forLabel: 
       return false
+    case \SwitchCaseLabelSyntax.colon: 
+      return false
+    case \SwitchDefaultLabelSyntax.colon: 
+      return false
     case \TryExprSyntax.questionOrExclamationMark: 
       return true
     default: 

Tests/SwiftSyntaxBuilderTest/Assertions.swift

@@ -16,10 +16,16 @@ import _SwiftSyntaxTestSupport
 
 import XCTest
 
-func AssertBuildResult<T: SyntaxProtocol>(_ buildable: T, _ expectedResult: String, file: StaticString = #file, line: UInt = #line) {
+func AssertBuildResult<T: SyntaxProtocol>(_ buildable: T, _ expectedResult: String, trimTrailingWhitespace: Bool = true, file: StaticString = #file, line: UInt = #line) {
+  var buildableDescription = buildable.formatted().description
+  var expectedResult = expectedResult
+  if trimTrailingWhitespace {
+    buildableDescription = buildableDescription.trimmingTrailingWhitespace()
+    expectedResult = expectedResult.trimmingTrailingWhitespace()
+  }
   AssertStringsEqualWithDiff(
-    buildable.formatted().description.trimmingTrailingWhitespace(),
-    expectedResult.trimmingTrailingWhitespace(),
+    buildableDescription,
+    expectedResult,
     file: file,
     line: line
   )

Tests/SwiftSyntaxBuilderTest/BreakStmtSyntaxTests.swift

@@ -0,0 +1,29 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import XCTest
+import SwiftSyntax
+import SwiftSyntaxBuilder
+
+final class BreakStmtSyntaxTests: XCTestCase {
+  func testBreakStmtSyntax() {
+    let testCases: [UInt: (StmtSyntax, String)] = [
+      #line: (BreakStmtSyntax().as(StmtSyntax.self)!, "break"),
+      #line: (StmtSyntax("break"), "break"),
+    ]
+
+    for (line, testCase) in testCases {
+      let (builder, expected) = testCase
+      AssertBuildResult(builder, expected, trimTrailingWhitespace: false, line: line)
+    }
+  }
+}

Tests/SwiftSyntaxBuilderTest/SwitchCaseLabelSyntaxTests.swift

@@ -0,0 +1,47 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import XCTest
+import SwiftSyntax
+import SwiftSyntaxBuilder
+
+final class SwitchCaseLabelSyntaxTests: XCTestCase {
+  func testSwitchCaseLabelSyntax() {
+    let testCases: [UInt: (SwitchCaseSyntax, String)] = [
+      #line: (
+        SwitchCaseSyntax("default:") {
+          StmtSyntax("return nil")
+
+        },
+        """
+        default:
+            return nil
+        """
+      ),
+      #line: (
+        SwitchCaseSyntax("case .foo:") {
+          StmtSyntax("return nil")
+
+        },
+        """
+        case .foo:
+            return nil
+        """
+      ),
+    ]
+
+    for (line, testCase) in testCases {
+      let (builder, expected) = testCase
+      AssertBuildResult(builder, expected, trimTrailingWhitespace: false, line: line)
+    }
+  }
+}

gyb_syntax_support/ExprNodes.py

@@ -347,14 +347,14 @@
              Child('CaseKeyword', kind='KeywordToken', token_choices=['KeywordToken|case']),
              Child('CaseItems', kind='CaseItemList',
                    collection_element_name='CaseItem'),
-             Child('Colon', kind='ColonToken'),
+             Child('Colon', kind='ColonToken', requires_trailing_space=False),
          ]),
 
     # switch-default-label -> 'default' ':'
     Node('SwitchDefaultLabel', name_for_diagnostics=None, kind='Syntax',
          children=[
              Child('DefaultKeyword', kind='KeywordToken', token_choices=['KeywordToken|default']),
-             Child('Colon', kind='ColonToken'),
+             Child('Colon', kind='ColonToken', requires_trailing_space=False),
          ]),
 
     # case-item -> pattern where-clause? ','?

gyb_syntax_support/StmtNodes.py

@@ -143,7 +143,7 @@
     # break-stmt -> 'break' identifier? ';'?
     Node('BreakStmt', name_for_diagnostics="'break' statement", kind='Stmt',
          children=[
-             Child('BreakKeyword', kind='KeywordToken', token_choices=['KeywordToken|break']),
+             Child('BreakKeyword', kind='KeywordToken', token_choices=['KeywordToken|break'], requires_trailing_space=False),
              Child('Label', kind='IdentifierToken', name_for_diagnostics='label',
                    is_optional=True),
          ]),