Update complex attributes check to exclude attributes with a single u…

…nnamed argument

Sources/Options.swift

@@ -717,7 +717,7 @@ public struct FormatOptions: CustomStringConvertible {
  storedVarAttributes: AttributeMode = .preserve,
  computedVarAttributes: AttributeMode = .preserve,
  complexAttributes: AttributeMode = .preserve,
- complexAttributesExceptions: Set<String> = ["@Environment"],
+ complexAttributesExceptions: Set<String> = [],
  markTypes: MarkMode = .always,
  typeMarkComment: String = "MARK: - %t",
  markExtensions: MarkMode = .always,

Sources/ParsingHelpers.swift

@@ -910,6 +910,38 @@ extension Formatter {
  }
  }
 
+ /// Whether or not the attribute starting at the given index is complex. That is, has:
+ /// - any named arguments
+ /// - more than one unnamed argument
+ func isComplexAttribute(at attributeIndex: Int) -> Bool {
+ assert(tokens[attributeIndex].string.hasPrefix("@"))
+
+ guard let startOfScopeIndex = index(of: .nonSpaceOrCommentOrLinebreak, after: attributeIndex),
+ tokens[startOfScopeIndex] == .startOfScope("("),
+ let firstTokenInBody = index(of: .nonSpaceOrCommentOrLinebreak, after: startOfScopeIndex),
+ let endOfScopeIndex = endOfScope(at: startOfScopeIndex),
+ firstTokenInBody != endOfScopeIndex
+ else { return false }
+
+ // If the first argument is named with a parameter label, then this is a complex attribute:
+ if tokens[firstTokenInBody].isIdentifierOrKeyword,
+ let followingToken = index(of: .nonSpaceOrCommentOrLinebreak, after: firstTokenInBody),
+ tokens[followingToken] == .delimiter(":")
+ {
+ return true
+ }
+
+ // If there are any commas in the attribute body, then this attribute has
+ // multiple arguments and is thus complex:
+ for index in startOfScopeIndex ... endOfScopeIndex {
+ if tokens[index] == .delimiter(","), startOfScope(at: index) == startOfScopeIndex {
+ return true
+ }
+ }
+
+ return false
+ }
+
  /// Determine if next line after this token should be indented
  func isEndOfStatement(at i: Int, in scope: Token? = nil) -> Bool {
  guard let token = token(at: i) else { return true }

Sources/Rules.swift

@@ -5521,10 +5521,10 @@ public struct _FormatRules {
  return
  }
 
- // If the complexAttriubtes option is configured, it takes precedence over other options
+ // If the complexAttributes option is configured, it takes precedence over other options
  // if this is a complex attributes with arguments.
  let attributeName = formatter.tokens[i].string
- let isComplexAttribute = formatter.next(.nonSpaceOrCommentOrLinebreak, after: i) == .startOfScope("(")
+ let isComplexAttribute = formatter.isComplexAttribute(at: i)
  && !formatter.options.complexAttributesExceptions.contains(attributeName)
 
  if isComplexAttribute, formatter.options.complexAttributes != .preserve {

Tests/RulesTests+Wrapping.swift

@@ -4675,7 +4675,56 @@ class WrappingTests: RulesTests {
  var foo: Foo
  """
 
- let options = FormatOptions(varAttributes: .sameLine, storedVarAttributes: .sameLine, computedVarAttributes: .prevLine, complexAttributes: .prevLine, complexAttributesExceptions: ["@Environment", "@SomeCustomAttr"])
+ let options = FormatOptions(varAttributes: .sameLine, storedVarAttributes: .sameLine, computedVarAttributes: .prevLine, complexAttributes: .prevLine, complexAttributesExceptions: ["@SomeCustomAttr"])
+ testFormatting(for: input, output, rule: FormatRules.wrapAttributes, options: options)
+ }
+
+ func testMixedComplexAndSimpleAttributes() {
+ let input = """
+ /// Simple attributes stay on a single line:
+ @State private var warpDriveEnabled: Bool
+
+ @ObservedObject private var lifeSupportService: LifeSupportService
+
+ @Environment(\\.controlPanelStyle) private var controlPanelStyle
+
+ @AppStorage("ControlsConfig") private var controlsConfig: ControlConfiguration
+
+ /// Complex attributes are wrapped:
+ @AppStorage("ControlPanelState", store: myCustomUserDefaults) private var controlPanelState: ControlPanelState
+
+ @Tweak(name: "Aspect ratio") private var aspectRatio = AspectRatio.stretch
+
+ @available(*, unavailable) var saturn5Builder: Saturn5Builder
+
+ @available(*, unavailable, message: "No longer in production") var saturn5Builder: Saturn5Builder
+ """
+
+ let output = """
+ /// Simple attributes stay on a single line:
+ @State private var warpDriveEnabled: Bool
+
+ @ObservedObject private var lifeSupportService: LifeSupportService
+
+ @Environment(\\.controlPanelStyle) private var controlPanelStyle
+
+ @AppStorage("ControlsConfig") private var controlsConfig: ControlConfiguration
+
+ /// Complex attributes are wrapped:
+ @AppStorage("ControlPanelState", store: myCustomUserDefaults)
+ private var controlPanelState: ControlPanelState
+
+ @Tweak(name: "Aspect ratio")
+ private var aspectRatio = AspectRatio.stretch
+
+ @available(*, unavailable)
+ var saturn5Builder: Saturn5Builder
+
+ @available(*, unavailable, message: "No longer in production")
+ var saturn5Builder: Saturn5Builder
+ """
+
+ let options = FormatOptions(storedVarAttributes: .sameLine, complexAttributes: .prevLine)
  testFormatting(for: input, output, rule: FormatRules.wrapAttributes, options: options)
  }
 
@@ -4690,6 +4739,17 @@ class WrappingTests: RulesTests {
  testFormatting(for: input, rule: FormatRules.wrapAttributes, options: options)
  }
 
+ func testEscapingTypedThrowClosureNotMistakenForComplexAttribute() {
+ let input = """
+ func foo(_ fooClosure: @escaping () throws(Foo) -> Void) {
+ try fooClosure()
+ }
+ """
+
+ let options = FormatOptions(complexAttributes: .prevLine)
+ testFormatting(for: input, rule: FormatRules.wrapAttributes, options: options)
+ }
+
  func testWrapOrDontWrapMultipleDeclarationsInClass() {
  let input = """
  class Foo {