Merge pull request #224 from dylansturg/more_lowercase

Apply AlwaysUseLowerCamelCase in more places.

Author: allevato

Sources/SwiftFormat/Pipelines+Generated.swift

@@ -51,6 +51,7 @@ class LintPipeline: SyntaxVisitor {
   }
 
   override func visit(_ node: ClosureSignatureSyntax) -> SyntaxVisitorContinueKind {
+    visitIfEnabled(AlwaysUseLowerCamelCase.visit, in: context, for: node)
     visitIfEnabled(ReturnVoidInsteadOfEmptyTuple.visit, in: context, for: node)
     return .visitChildren
   }
@@ -176,6 +177,11 @@ class LintPipeline: SyntaxVisitor {
     return .visitChildren
   }
 
+  override func visit(_ node: OptionalBindingConditionSyntax) -> SyntaxVisitorContinueKind {
+    visitIfEnabled(AlwaysUseLowerCamelCase.visit, in: context, for: node)
+    return .visitChildren
+  }
+
   override func visit(_ node: PatternBindingSyntax) -> SyntaxVisitorContinueKind {
     visitIfEnabled(UseSingleLinePropertyGetter.visit, in: context, for: node)
     return .visitChildren

Sources/SwiftFormatRules/AlwaysUseLowerCamelCase.swift

@@ -58,7 +58,39 @@ public final class AlwaysUseLowerCamelCase: SyntaxLintRule {
       diagnoseLowerCamelCaseViolations(
         pat.identifier, allowUnderscores: false, description: identifierDescription(for: node))
     }
-    return .skipChildren
+    return .visitChildren
+  }
+
+  public override func visit(_ node: OptionalBindingConditionSyntax) -> SyntaxVisitorContinueKind {
+    guard let pattern = node.pattern.as(IdentifierPatternSyntax.self) else {
+      return .visitChildren
+    }
+    diagnoseLowerCamelCaseViolations(
+      pattern.identifier, allowUnderscores: false, description: identifierDescription(for: node))
+    return .visitChildren
+  }
+
+  public override func visit(_ node: ClosureSignatureSyntax) -> SyntaxVisitorContinueKind {
+    if let input = node.input {
+      if let closureParamList = input.as(ClosureParamListSyntax.self) {
+        for param in closureParamList {
+          diagnoseLowerCamelCaseViolations(
+            param.name, allowUnderscores: false, description: identifierDescription(for: node))
+        }
+      } else if let parameterClause = input.as(ParameterClauseSyntax.self) {
+        for param in parameterClause.parameterList {
+          if let firstName = param.firstName {
+            diagnoseLowerCamelCaseViolations(
+              firstName, allowUnderscores: false, description: identifierDescription(for: node))
+          }
+          if let secondName = param.secondName {
+            diagnoseLowerCamelCaseViolations(
+              secondName, allowUnderscores: false, description: identifierDescription(for: node))
+          }
+        }
+      }
+    }
+    return .visitChildren
   }
 
   public override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
@@ -68,7 +100,19 @@ public final class AlwaysUseLowerCamelCase: SyntaxLintRule {
     diagnoseLowerCamelCaseViolations(
       node.identifier, allowUnderscores: allowUnderscores,
       description: identifierDescription(for: node))
-    return .skipChildren
+    for param in node.signature.input.parameterList {
+      // These identifiers aren't described using `identifierDescription(for:)` because no single
+      // node can disambiguate the argument label from the parameter name.
+      if let label = param.firstName {
+        diagnoseLowerCamelCaseViolations(
+          label, allowUnderscores: false, description: "argument label")
+      }
+      if let paramName = param.secondName {
+        diagnoseLowerCamelCaseViolations(
+          paramName, allowUnderscores: false, description: "function parameter")
+      }
+    }
+    return .visitChildren
   }
 
   public override func visit(_ node: EnumCaseElementSyntax) -> SyntaxVisitorContinueKind {
@@ -97,8 +141,11 @@ public final class AlwaysUseLowerCamelCase: SyntaxLintRule {
 /// - Returns: A human readable description of the node and its identifier.
 fileprivate func identifierDescription<NodeType: SyntaxProtocol>(for node: NodeType) -> String {
   switch Syntax(node).as(SyntaxEnum.self) {
+  case .closureSignature: return "closure parameter"
   case .enumCaseElement: return "enum case"
   case .functionDecl: return "function"
+  case .optionalBindingCondition(let binding):
+    return binding.letOrVarKeyword.tokenKind == .varKeyword ? "variable" : "constant"
   case .variableDecl(let variableDecl):
     return variableDecl.letOrVarKeyword.tokenKind == .varKeyword ? "variable" : "constant"
   default:

Tests/SwiftFormatRulesTests/AlwaysUseLowerCamelCaseTests.swift

@@ -23,6 +23,19 @@ final class AlwaysUseLowerCamelCaseTests: LintOrFormatRuleTestCase {
         case UpperCamelCase
         case lowerCamelCase
       }
+      if let Baz = foo { }
+      guard let foo = [1, 2, 3, 4].first(where: { BadName -> Bool in
+        let TerribleName = BadName
+        return TerribleName != 0
+      }) else { return }
+      var fooVar = [1, 2, 3, 4].first(where: { BadNameInFooVar -> Bool in
+        let TerribleNameInFooVar = BadName
+        return TerribleName != 0
+      })
+      var abc = array.first(where: { (CParam1, _ CParam2: Type, cparam3) -> Bool in return true })
+      func wellNamedFunc(_ BadFuncArg1: Int, BadFuncArgLabel goodFuncArg: String) {
+        var PoorlyNamedVar = 0
+      }
       """
     performLint(AlwaysUseLowerCamelCase.self, input: input)
     XCTAssertDiagnosed(
@@ -39,6 +52,30 @@ final class AlwaysUseLowerCamelCaseTests: LintOrFormatRuleTestCase {
       line: 9, column: 8)
     XCTAssertDiagnosed(
       .nameMustBeLowerCamelCase("UpperCamelCase", description: "enum case"), line: 12, column: 8)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("Baz", description: "constant"), line: 15, column: 8)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("BadName", description: "closure parameter"), line: 16, column: 45)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("TerribleName", description: "constant"), line: 17, column: 7)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("BadNameInFooVar", description: "closure parameter"),
+      line: 20, column: 42)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("TerribleNameInFooVar", description: "constant"),
+      line: 21, column: 7)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("CParam1", description: "closure parameter"), line: 24, column: 33)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("CParam2", description: "closure parameter"), line: 24, column: 44)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("BadFuncArg1", description: "function parameter"),
+      line: 25, column: 22)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("BadFuncArgLabel", description: "argument label"),
+      line: 25, column: 40)
+    XCTAssertDiagnosed(
+      .nameMustBeLowerCamelCase("PoorlyNamedVar", description: "variable"), line: 26, column: 7)
   }
 
   func testIgnoresUnderscoresInTestNames() {