Fix conflict between sortDeclarations and organizeDeclarations

Sources/FormattingHelpers.swift

@@ -2210,7 +2210,7 @@ extension Formatter {
  // If this type has a leading :sort directive, we sort alphabetically
  // within the subcategories (where ordering is otherwise undefined)
  let sortAlphabeticallyWithinSubcategories = typeDeclaration.open.contains(where: {
- $0.isComment && $0.string.contains("swiftformat:sort") && !$0.string.contains(":sort:")
+ $0.isCommentBody && $0.string.contains("swiftformat:sort") && !$0.string.contains(":sort:")
  })
 
  // Sorts the given categoried declarations based on their derived metadata
@@ -2246,7 +2246,7 @@ extension Formatter {
  // The compiler will synthesize a memberwise init for `struct`
  // declarations that don't have an `init` declaration.
  // We have to take care to not reorder any properties (but reordering functions etc is ok!)
- if typeDeclaration.kind == "struct",
+ if !sortAlphabeticallyWithinSubcategories, typeDeclaration.kind == "struct",
  !typeDeclaration.body.contains(where: { $0.keyword == "init" })
  {
  // Whether or not this declaration is an instance property that can affect

Sources/Rules.swift

@@ -6041,7 +6041,7 @@ public struct _FormatRules {
  sharedOptions: ["organizetypes"]
  ) { formatter in
  formatter.forEachToken(
- where: { $0.isComment && $0.string.contains("swiftformat:sort") }
+ where: { $0.isCommentBody && $0.string.contains("swiftformat:sort") }
  ) { commentIndex, commentToken in
 
  let rangeToSort: ClosedRange<Int>
@@ -6073,7 +6073,7 @@ public struct _FormatRules {
  lastTypeBodyToken > typeOpenBrace
  else { return }
 
- // Sorting the body of a type conflicts with the `organizeDeclaration`
+ // Sorting the body of a type conflicts with the `organizeDeclarations`
  // keyword if enabled for this type of declaration. In that case,
  // defer to the sorting implementation in `organizeDeclarations`.
  if formatter.options.enabledRules.contains(FormatRules.organizeDeclarations.name),

Sources/Tokenizer.swift

@@ -435,6 +435,15 @@ public extension Token {
  }
  }
 
+ var isCommentBody: Bool {
+ switch self {
+ case .commentBody:
+ return true
+ default:
+ return false
+ }
+ }
+
  var isStringBody: Bool {
  switch self {
  case .stringBody:

Tests/RulesTests+Organization.swift

@@ -4130,6 +4130,46 @@ class OrganizationTests: RulesTests {
  exclude: ["blankLinesAtStartOfScope", "blankLinesAtEndOfScope"])
  }
 
+ func testSortStructPropertiesWithAttributes() {
+ let input = """
+ // swiftformat:sort
+ struct BookReaderView {
+ @Namespace private var animation
+ @State private var animationContent: Bool = false
+ @State private var offsetY: CGFloat = 0
+ @Bindable var model: Book
+ @Query(
+ filter: #Predicate<TextContent> { $0.progress_ < 1 },
+ sort: \\.updatedAt_,
+ order: .reverse
+ ) private var incompleteTextContents: [TextContent]
+ }
+ """
+ let output = """
+ // swiftformat:sort
+ struct BookReaderView {
+
+ // MARK: Internal
+
+ @Bindable var model: Book
+
+ // MARK: Private
+
+ @Namespace private var animation
+ @State private var animationContent: Bool = false
+ @Query(
+ filter: #Predicate<TextContent> { $0.progress_ < 1 },
+ sort: \\.updatedAt_,
+ order: .reverse
+ ) private var incompleteTextContents: [TextContent]
+ @State private var offsetY: CGFloat = 0
+ }
+ """
+ let options = FormatOptions(indent: " ", organizeTypes: ["struct"])
+ testFormatting(for: input, output, rule: FormatRules.organizeDeclarations,
+ options: options, exclude: ["blankLinesAtStartOfScope"])
+ }
+
  // MARK: - sortTypealiases
 
  func testSortSingleLineTypealias() {