Fix issue where conditional compilation blocks would be sorted incorr…

…ectly (#1714)

Sources/FormattingHelpers.swift

@@ -2020,8 +2020,14 @@ extension Formatter {
  return .beforeMarks
  }
 
- case .conditionalCompilation:
- return .conditionalCompilation
+ case let .conditionalCompilation(_, body, _):
+ // Prefer treating conditional compliation blocks as having
+ // the property type of the first declaration in their body.
+ if let firstDeclarationInBlock = body.first {
+ return type(of: firstDeclarationInBlock, for: mode)
+ } else {
+ return .conditionalCompilation
+ }
  }
  }
 

Tests/RulesTests+Organization.swift

@@ -1284,6 +1284,12 @@ class OrganizationTests: RulesTests {
  init() {}
 
  var quuz = "quux"
+
+ #if DEBUG
+ struct Test {
+ let foo: Bar
+ }
+ #endif
  }
  """
 
@@ -1296,8 +1302,6 @@ class OrganizationTests: RulesTests {
 
  // MARK: Public
 
- public var bar = "bar"
-
  #if DEBUG
  public struct DebugFoo {
 
@@ -1315,17 +1319,26 @@ class OrganizationTests: RulesTests {
  private let other = "other"
  #endif
 
+ public var bar = "bar"
+
  // MARK: Internal
 
+ #if DEBUG
+ struct Test {
+ let foo: Bar
+ }
+ #endif
+
  var baz = "baz"
 
  var quuz = "quux"
+
  }
  """
 
  testFormatting(for: input, output, rule: FormatRules.organizeDeclarations,
  options: FormatOptions(ifdefIndent: .noIndent),
- exclude: ["blankLinesAtStartOfScope"])
+ exclude: ["blankLinesAtStartOfScope", "blankLinesAtEndOfScope"])
  }
 
  func testOrganizesTypeBelowSymbolImport() {
@@ -1785,6 +1798,52 @@ class OrganizationTests: RulesTests {
  )
  }
 
+ func testOrganizeConditionalInitDeclaration() {
+ let input = """
+ class Foo {
+
+ // MARK: Lifecycle
+
+ init() {}
+
+ #if DEBUG
+ init() {
+ print("Debug")
+ }
+ #endif
+
+ // MARK: Internal
+
+ func test() {}
+ }
+ """
+
+ testFormatting(for: input, rule: FormatRules.organizeDeclarations, options: FormatOptions(ifdefIndent: .noIndent), exclude: ["blankLinesAtStartOfScope", "blankLinesAtEndOfScope"])
+ }
+
+ func testOrganizeConditionalPublicFunction() {
+ let input = """
+ class Foo {
+
+ // MARK: Lifecycle
+
+ init() {}
+
+ // MARK: Public
+
+ #if DEBUG
+ public func publicTest() {}
+ #endif
+
+ // MARK: Internal
+
+ func internalTest() {}
+ }
+ """
+
+ testFormatting(for: input, rule: FormatRules.organizeDeclarations, options: FormatOptions(ifdefIndent: .noIndent), exclude: ["blankLinesAtStartOfScope", "blankLinesAtEndOfScope"])
+ }
+
  // MARK: extensionAccessControl .onDeclarations
 
  func testUpdatesVisibilityOfExtensionMembers() {