Fix broken indent inside #ifdef after comment

nicklockwood · Sep 29, 2023 · 57321f7 · 57321f7
1 parent 8069c6e
commit 57321f7
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 1 deletion.
diff --git a/Sources/Rules.swift b/Sources/Rules.swift
@@ -1931,7 +1931,7 @@ public struct _FormatRules {
                         if let startToken = startToken, [
                             .startOfScope("#if"), .keyword("#else"), .keyword("#elseif"), .endOfScope("#endif")
                         ].contains(startToken) {
-                            if let index = formatter.index(of: .nonSpaceOrLinebreak, before: lineStart) {
+                            if let index = formatter.index(of: .nonSpaceOrCommentOrLinebreak, before: lineStart) {
                                 lastNonSpaceOrLinebreakIndex = index
                                 lineStart = formatter.startOfLine(at: lastNonSpaceOrLinebreakIndex, excludingIndent: true)
                             }

diff --git a/Tests/RulesTests+Indentation.swift b/Tests/RulesTests+Indentation.swift
@@ -2776,6 +2776,106 @@ class IndentTests: RulesTests {
         testFormatting(for: input, rule: FormatRules.indent)
     }
 
+    // indent #if/#else/#elseif/#endif
+
+    func testIfDefIndentModes() {
+        let input = """
+        struct ContentView: View {
+            var body: some View {
+                // swiftformat:options --ifdef indent
+
+                Text("Hello, world!")
+                // Comment above
+                #if os(macOS)
+                    .padding()
+                #endif
+
+                Text("Hello, world!")
+                #if os(macOS)
+                    // Comment inside
+                    .padding()
+                #endif
+
+                // swiftformat:options --ifdef no-indent
+
+                Text("Hello, world!")
+                // Comment above
+                #if os(macOS)
+                    .padding()
+                #endif
+
+                Text("Hello, world!")
+                #if os(macOS)
+                    // Comment inside
+                    .padding()
+                #endif
+
+                // swiftformat:options --ifdef outdent
+
+                Text("Hello, world!")
+                // Comment above
+                #if os(macOS)
+                    .padding()
+                #endif
+
+                Text("Hello, world!")
+                #if os(macOS)
+                    // Comment inside
+                    .padding()
+                #endif
+            }
+        }
+        """
+        let output = """
+        struct ContentView: View {
+            var body: some View {
+                // swiftformat:options --ifdef indent
+
+                Text("Hello, world!")
+                // Comment above
+                #if os(macOS)
+                    .padding()
+                #endif
+
+                Text("Hello, world!")
+                #if os(macOS)
+                    // Comment inside
+                    .padding()
+                #endif
+
+                // swiftformat:options --ifdef no-indent
+
+                Text("Hello, world!")
+                // Comment above
+                #if os(macOS)
+                    .padding()
+                #endif
+
+                Text("Hello, world!")
+                #if os(macOS)
+                    // Comment inside
+                    .padding()
+                #endif
+
+                // swiftformat:options --ifdef outdent
+
+                Text("Hello, world!")
+        // Comment above
+        #if os(macOS)
+                    .padding()
+        #endif
+
+                Text("Hello, world!")
+        #if os(macOS)
+                    // Comment inside
+                    .padding()
+        #endif
+            }
+        }
+        """
+        testFormatting(for: input, output, rule: FormatRules.indent)
+    }
+
     // indent #if/#else/#elseif/#endif (mode: indent)
 
     func testIfEndifIndenting() {