Enable preferForLoop by default

EditorExtension/Shared/RulesStore.swift

@@ -165,8 +165,8 @@ extension RulesStore {
 
  let disabledRules = Set(FormatRules.disabledByDefault)
  var rules = currentRules
- newRuleNames.forEach {
- rules[$0] = !disabledRules.contains($0)
+ for newRuleName in newRuleNames {
+ rules[newRuleName] = !disabledRules.contains(newRuleName)
  }
 
  save(rules)

Rules.md

@@ -31,6 +31,7 @@
 * [modifierOrder](#modifierOrder)
 * [numberFormatting](#numberFormatting)
 * [opaqueGenericParameters](#opaqueGenericParameters)
+* [preferForLoop](#preferForLoop)
 * [preferKeyPath](#preferKeyPath)
 * [redundantBackticks](#redundantBackticks)
 * [redundantBreak](#redundantBreak)
@@ -95,7 +96,6 @@
 * [isEmpty](#isEmpty)
 * [markTypes](#markTypes)
 * [organizeDeclarations](#organizeDeclarations)
-* [preferForLoop](#preferForLoop)
 * [sortSwitchCases](#sortSwitchCases)
 * [wrapConditionalBodies](#wrapConditionalBodies)
 * [wrapEnumCases](#wrapEnumCases)

Snapshots/Euclid/Sources/CSG.swift

@@ -482,8 +482,8 @@ extension Polygon {
  {
  precondition(isConvex)
  guard polygon.isConvex else {
- polygon.tessellate().forEach {
- clip($0, &inside, &outside, &id)
+ for item in polygon.tessellate() {
+ clip(item, &inside, &outside, &id)
  }
  return
  }
@@ -538,8 +538,8 @@ extension Polygon {
  polygon.id = id
  }
  if !polygon.isConvex {
- polygon.tessellate().forEach {
- $0.split(along: plane, &coplanar, &front, &back, &id)
+ for item in polygon.tessellate() {
+ item.split(along: plane, &coplanar, &front, &back, &id)
  }
  return
  }

Snapshots/Issues/780.swift

@@ -977,8 +977,8 @@ public extension SNS {
  public func validate(name: String) throws {
  try validate(resourceArn, name: "resourceArn", parent: name, max: 1011)
  try validate(resourceArn, name: "resourceArn", parent: name, min: 1)
- try tags.forEach {
- try $0.validate(name: "\(name).tags[]")
+ for tag in tags {
+ try tag.validate(name: "\(name).tags[]")
  }
  }
 
@@ -1033,9 +1033,9 @@ public extension SNS {
  public func validate(name: String) throws {
  try validate(resourceArn, name: "resourceArn", parent: name, max: 1011)
  try validate(resourceArn, name: "resourceArn", parent: name, min: 1)
- try tagKeys.forEach {
- try validate($0, name: "tagKeys[]", parent: name, max: 128)
- try validate($0, name: "tagKeys[]", parent: name, min: 1)
+ for tagKey in tagKeys {
+ try validate(tagKey, name: "tagKeys[]", parent: name, max: 128)
+ try validate(tagKey, name: "tagKeys[]", parent: name, min: 1)
  }
  }
 

Sources/Rules.swift

@@ -103,7 +103,7 @@ private let rulesByName: [String: FormatRule] = {
  while changedOrder {
  changedOrder = false
  for value in values {
- value.orderAfter.forEach { name in
+ for name in value.orderAfter {
  guard let rule = rules[name] else {
  preconditionFailure(name)
  }
@@ -7299,7 +7299,6 @@ public struct _FormatRules {
 
  public let preferForLoop = FormatRule(
  help: "Convert functional `forEach` calls to for loops.",
- disabledByDefault: true,
  options: ["anonymousforeach", "onelineforeach"]
  ) { formatter in
  formatter.forEach(.identifier("forEach")) { forEachIndex, _ in

Tests/CommandLineTests.swift

@@ -261,7 +261,7 @@ class CommandLineTests: XCTestCase {
 
  func testHelpLineLength() {
  CLI.print = { message, _ in
- message.components(separatedBy: "\n").forEach { line in
+ for line in message.components(separatedBy: "\n") {
  XCTAssertLessThanOrEqual(line.count, 80, line)
  }
  }

Tests/OptionDescriptorTests.swift

@@ -33,14 +33,14 @@ class OptionDescriptorTests: XCTestCase {
  testName: String = #function)
  {
  var options = FormatOptions.default
- expectations.forEach {
+ for expectation in expectations {
  do {
- try descriptor.toOptions($0.argumentValue, &options)
- XCTAssertEqual(options[keyPath: keyPath], $0.optionValue, "\(testName): Argument \($0.argumentValue) map to option \($0.optionValue)")
- try descriptor.toOptions($0.argumentValue.uppercased(), &options)
- XCTAssertEqual(options[keyPath: keyPath], $0.optionValue, "\(testName): Argument Uppercased \($0.argumentValue) map to option \($0.optionValue)")
- try descriptor.toOptions($0.argumentValue.capitalized, &options)
- XCTAssertEqual(options[keyPath: keyPath], $0.optionValue, "\(testName): Argument capitalized \($0.argumentValue) map to option \($0.optionValue)")
+ try descriptor.toOptions(expectation.argumentValue, &options)
+ XCTAssertEqual(options[keyPath: keyPath], expectation.optionValue, "\(testName): Argument \(expectation.argumentValue) map to option \(expectation.optionValue)")
+ try descriptor.toOptions(expectation.argumentValue.uppercased(), &options)
+ XCTAssertEqual(options[keyPath: keyPath], expectation.optionValue, "\(testName): Argument Uppercased \(expectation.argumentValue) map to option \(expectation.optionValue)")
+ try descriptor.toOptions(expectation.argumentValue.capitalized, &options)
+ XCTAssertEqual(options[keyPath: keyPath], expectation.optionValue, "\(testName): Argument capitalized \(expectation.argumentValue) map to option \(expectation.optionValue)")
  } catch {
  XCTFail("\(testName): error: \(error)")
  }
@@ -54,16 +54,16 @@ class OptionDescriptorTests: XCTestCase {
  testName: String = #function)
  {
  var options = FormatOptions.default
- expectations.forEach {
+ for expectation in expectations {
  do {
- try descriptor.toOptions($0.argumentValue, &options)
- XCTAssertEqual(options[keyPath: keyPath], $0.optionValue, "\(testName): Argument \($0.argumentValue) map to option \(String(describing: $0.optionValue))")
+ try descriptor.toOptions(expectation.argumentValue, &options)
+ XCTAssertEqual(options[keyPath: keyPath], expectation.optionValue, "\(testName): Argument \(expectation.argumentValue) map to option \(String(describing: expectation.optionValue))")
  if testCaseVariation {
  do {
- try descriptor.toOptions($0.argumentValue.uppercased(), &options)
- XCTAssertEqual(options[keyPath: keyPath], $0.optionValue, "\(testName): Argument Uppercased \($0.argumentValue) map to option \(String(describing: $0.optionValue))")
- try descriptor.toOptions($0.argumentValue.capitalized, &options)
- XCTAssertEqual(options[keyPath: keyPath], $0.optionValue, "\(testName): Argument capitalized \($0.argumentValue) map to option \(String(describing: $0.optionValue))")
+ try descriptor.toOptions(expectation.argumentValue.uppercased(), &options)
+ XCTAssertEqual(options[keyPath: keyPath], expectation.optionValue, "\(testName): Argument Uppercased \(expectation.argumentValue) map to option \(String(describing: expectation.optionValue))")
+ try descriptor.toOptions(expectation.argumentValue.capitalized, &options)
+ XCTAssertEqual(options[keyPath: keyPath], expectation.optionValue, "\(testName): Argument capitalized \(expectation.argumentValue) map to option \(String(describing: expectation.optionValue))")
  } catch {
  XCTFail("\(testName): error: \(error)")
  }
@@ -106,9 +106,9 @@ class OptionDescriptorTests: XCTestCase {
  expectations: [FreeTextValidationExpectation],
  testName: String = #function)
  {
- expectations.forEach {
- let isValid = descriptor.validateArgument($0.input)
- XCTAssertEqual(isValid, $0.isValid, "\(testName): \(isValid) != \($0.isValid)")
+ for expectation in expectations {
+ let isValid = descriptor.validateArgument(expectation.input)
+ XCTAssertEqual(isValid, expectation.isValid, "\(testName): \(isValid) != \(expectation.isValid)")
  }
  }