Merge pull request swiftlang#441 from allevato/fold-operators-in-rule-tests

Update rules to use the operator-folded syntax tree.

Author: allevato

Sources/SwiftFormatRules/UseSynthesizedInitializer.swift

@@ -142,27 +142,35 @@ public final class UseSynthesizedInitializer: SyntaxLintRule {
 
     var statements: [String] = []
     for statement in initBody.statements {
-      guard let exp = statement.item.as(SequenceExprSyntax.self) else { return false }
+      guard
+        let expr = statement.item.as(InfixOperatorExprSyntax.self),
+        expr.operatorOperand.is(AssignmentExprSyntax.self)
+      else {
+        return false
+      }
+
       var leftName = ""
       var rightName = ""
 
-      for element in exp.elements {
-        switch Syntax(element).as(SyntaxEnum.self) {
-        case .memberAccessExpr(let element):
-          guard let base = element.base,
-            base.description.trimmingCharacters(in: .whitespacesAndNewlines) == "self"
-          else {
-            return false
-          }
-          leftName = element.name.text
-        case .assignmentExpr(let element):
-          guard element.assignToken.tokenKind == .equal else { return false }
-        case .identifierExpr(let element):
-          rightName = element.identifier.text
-        default:
+      if let memberAccessExpr = expr.leftOperand.as(MemberAccessExprSyntax.self) {
+        guard
+          let base = memberAccessExpr.base,
+          base.description.trimmingCharacters(in: .whitespacesAndNewlines) == "self"
+        else {
           return false
         }
+
+        leftName = memberAccessExpr.name.text
+      } else {
+        return false
       }
+
+      if let identifierExpr = expr.rightOperand.as(IdentifierExprSyntax.self) {
+        rightName = identifierExpr.identifier.text
+      } else {
+        return false
+      }
+
       guard leftName == rightName else { return false }
       statements.append(leftName)
     }

Tests/SwiftFormatRulesTests/LintOrFormatRuleTestCase.swift

@@ -1,8 +1,9 @@
 import SwiftFormatConfiguration
 import SwiftFormatCore
 import SwiftFormatTestSupport
-import SwiftSyntax
+import SwiftOperators
 import SwiftParser
+import SwiftSyntax
 import XCTest
 
 class LintOrFormatRuleTestCase: DiagnosingTestCase {
@@ -19,7 +20,9 @@ class LintOrFormatRuleTestCase: DiagnosingTestCase {
     file: StaticString = #file,
     line: UInt = #line
   ) {
-    let sourceFileSyntax = restoringLegacyTriviaBehavior(Parser.parse(source: input))
+    let sourceFileSyntax = try! restoringLegacyTriviaBehavior(
+      OperatorTable.standardOperators.foldAll(Parser.parse(source: input))
+        .as(SourceFileSyntax.self)!)
 
     // Force the rule to be enabled while we test it.
     var configuration = Configuration()
@@ -56,7 +59,9 @@ class LintOrFormatRuleTestCase: DiagnosingTestCase {
     file: StaticString = #file,
     line: UInt = #line
   ) {
-    let sourceFileSyntax = restoringLegacyTriviaBehavior(Parser.parse(source: input))
+    let sourceFileSyntax = try! restoringLegacyTriviaBehavior(
+      OperatorTable.standardOperators.foldAll(Parser.parse(source: input))
+        .as(SourceFileSyntax.self)!)
 
     // Force the rule to be enabled while we test it.
     var configuration = configuration ?? Configuration()

Tests/SwiftFormatRulesTests/NeverForceUnwrapTests.swift

@@ -16,16 +16,14 @@ final class NeverForceUnwrapTests: LintOrFormatRuleTestCase {
     }
     """
     performLint(NeverForceUnwrap.self, input: input)
-    XCTAssertDiagnosed(.doNotForceUnwrap(name: "(someValue())"))
-    XCTAssertDiagnosed(.doNotForceUnwrap(name: "String(a)"))
+    XCTAssertDiagnosed(.doNotForceCast(name: "Int"), line: 3, column: 11)
+    XCTAssertDiagnosed(.doNotForceUnwrap(name: "(someValue())"), line: 4, column: 11)
+    XCTAssertDiagnosed(.doNotForceUnwrap(name: "String(a)"), line: 5, column: 11)
     XCTAssertNotDiagnosed(.doNotForceCast(name: "try"))
     XCTAssertNotDiagnosed(.doNotForceUnwrap(name: "try"))
-    XCTAssertDiagnosed(.doNotForceUnwrap(name: "a"))
-    XCTAssertDiagnosed(.doNotForceUnwrap(name: "[1: a, 2: b, 3: c][4]"))
-    // FIXME: These diagnostics will be emitted once NeverForceUnwrap is taught
-    // how to interpret Unresolved* components in sequence expressions.
-//    XCTAssertDiagnosed(.doNotForceCast(name: "Int"))
-//    XCTAssertDiagnosed(.doNotForceCast(name: "FooBarType"))
+    XCTAssertDiagnosed(.doNotForceUnwrap(name: "[1: a, 2: b, 3: c][4]"), line: 7, column: 35)
+    XCTAssertDiagnosed(.doNotForceCast(name: "FooBarType"), line: 8, column: 11)
+    XCTAssertDiagnosed(.doNotForceUnwrap(name: "a"), line: 9, column: 10)
   }
 
   func testIgnoreTestCode() {