Update spacesAroundRangeFormationOperators to false

iCharlesHu · iCharlesHu · commit 7cbb611ed3d1 · 2025-08-28T13:37:40.000-07:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -31,7 +31,6 @@ jobs:
       linux_build_command: 'swift-format lint -s -r --configuration ./.swift-format . && swift test && swift test --disable-default-traits'
       windows_swift_versions: '["6.1", "nightly-main"]'
       windows_build_command: |
-        Invoke-Program swift-format lint -s -r --configuration .\.swift-format .
         Invoke-Program swift test
         Invoke-Program swift test --disable-default-traits
       enable_macos_checks: true
diff --git a/.swift-format b/.swift-format
@@ -21,7 +21,6 @@
         ]
     },
     "prioritizeKeepingFunctionOutputTogether": false,
-    "reflowMultilineStringLiterals": "never",
     "respectsExistingLineBreaks": true,
     "rules": {
         "AllPublicDeclarationsHaveDocumentation": false,
@@ -68,7 +67,7 @@
         "UseWhereClausesInForLoops": false,
         "ValidateDocumentationComments": false
     },
-    "spacesAroundRangeFormationOperators": true,
+    "spacesAroundRangeFormationOperators": false,
     "spacesBeforeEndOfLineComments": 1,
     "tabWidth": 4,
     "version": 1
diff --git a/Sources/Subprocess/AsyncBufferSequence.swift b/Sources/Subprocess/AsyncBufferSequence.swift
@@ -285,7 +285,7 @@ extension AsyncBufferSequence {
                             continue
                         }
                         return yield()
-                    case lineFeed ..< carriageReturn, newLine1, lineSeparator1, paragraphSeparator1:
+                    case lineFeed..<carriageReturn, newLine1, lineSeparator1, paragraphSeparator1:
                         return yield()
                     default:
                         continue
diff --git a/Sources/Subprocess/Buffer.swift b/Sources/Subprocess/Buffer.swift
@@ -77,6 +77,7 @@ extension AsyncBufferSequence.Buffer {
     }
 
     #if SubprocessSpan
+    // swift-format-ignore
     // Access the storage backing this Buffer
     public var bytes: RawSpan {
         @lifetime(borrow self)
diff --git a/Sources/Subprocess/Configuration.swift b/Sources/Subprocess/Configuration.swift
@@ -410,9 +410,9 @@ extension Environment: CustomStringConvertible, CustomDebugStringConvertible {
                     continue
                 }
 
-                let key = String(environmentString[environmentString.startIndex ..< delimiter])
+                let key = String(environmentString[environmentString.startIndex..<delimiter])
                 let value = String(
-                    environmentString[environmentString.index(after: delimiter) ..< environmentString.endIndex]
+                    environmentString[environmentString.index(after: delimiter)..<environmentString.endIndex]
                 )
                 results[key] = value
             }
diff --git a/Sources/Subprocess/IO/AsyncIO+Linux.swift b/Sources/Subprocess/IO/AsyncIO+Linux.swift
@@ -161,7 +161,7 @@ final class AsyncIO: Sendable {
                         break monitorLoop
                     }
 
-                    for index in 0 ..< Int(eventCount) {
+                    for index in 0..<Int(eventCount) {
                         let event = events[index]
                         let targetFileDescriptor = event.data.fd
                         // Breakout the monitor loop if we received shutdown
diff --git a/Sources/Subprocess/IO/AsyncIO+Windows.swift b/Sources/Subprocess/IO/AsyncIO+Windows.swift
@@ -182,11 +182,12 @@ final class AsyncIO: @unchecked Sendable {
             return
         }
         // Post status to shutdown HANDLE
+        // swift-format-ignore
         PostQueuedCompletionStatus(
-            ioPort, // CompletionPort
-            0, // Number of bytes transferred.
+            ioPort,       // CompletionPort
+            0,            // Number of bytes transferred.
             shutdownPort, // Completion key to post status
-            nil // Overlapped
+            nil           // Overlapped
         )
         // Wait for monitor thread to exit
         WaitForSingleObject(monitorThreadHandle, INFINITE)
diff --git a/Sources/Subprocess/IO/Output.swift b/Sources/Subprocess/IO/Output.swift
@@ -121,7 +121,7 @@ public struct StringOutput<Encoding: Unicode.Encoding>: OutputProtocol {
     public func output(from span: RawSpan) throws -> String? {
         // FIXME: Span to String
         var array: [UInt8] = []
-        for index in 0 ..< span.byteCount {
+        for index in 0..<span.byteCount {
             array.append(span.unsafeLoad(fromByteOffset: index, as: UInt8.self))
         }
         return String(decodingBytes: array, as: Encoding.self)
diff --git a/Sources/Subprocess/Platforms/Subprocess+Linux.swift b/Sources/Subprocess/Platforms/Subprocess+Linux.swift
@@ -264,7 +264,7 @@ private func monitorThreadFunc(context: MonitorThreadContext) {
             break monitorLoop
         }
 
-        for index in 0 ..< Int(eventCount) {
+        for index in 0..<Int(eventCount) {
             let event = events[index]
             let targetFileDescriptor = event.data.fd
 
diff --git a/Sources/Subprocess/Platforms/Subprocess+Windows.swift b/Sources/Subprocess/Platforms/Subprocess+Windows.swift
@@ -1358,7 +1358,7 @@ extension String {
             // not add the \\?\ prefix required by other functions under these conditions).
             let dwLength: DWORD = GetFullPathNameW(pwszPath, 0, nil, nil)
             return try withUnsafeTemporaryAllocation(of: WCHAR.self, capacity: Int(dwLength)) { pwszFullPath in
-                guard (1 ..< dwLength).contains(GetFullPathNameW(pwszPath, DWORD(pwszFullPath.count), pwszFullPath.baseAddress, nil)) else {
+                guard (1..<dwLength).contains(GetFullPathNameW(pwszPath, DWORD(pwszFullPath.count), pwszFullPath.baseAddress, nil)) else {
                     throw SubprocessError(
                         code: .init(.invalidWindowsPath(self)),
                         underlyingError: .init(rawValue: GetLastError())
@@ -1434,7 +1434,7 @@ extension UInt8 {
     static var _period: UInt8 { UInt8(ascii: ".") }
 
     var isLetter: Bool? {
-        return (0x41 ... 0x5a) ~= self || (0x61 ... 0x7a) ~= self
+        return (0x41...0x5a) ~= self || (0x61...0x7a) ~= self
     }
 }
 
@@ -1459,7 +1459,7 @@ internal func fillNullTerminatedWideStringBuffer(
                 switch count {
                 case 0:
                     throw SubprocessError.UnderlyingError(rawValue: GetLastError())
-                case 1 ..< DWORD(buffer.count):
+                case 1..<DWORD(buffer.count):
                     let result = String(decodingCString: buffer.baseAddress!, as: UTF16.self)
                     assert(result.utf16.count == count, "Parsed UTF-16 count \(result.utf16.count) != reported UTF-16 count \(count)")
                     return result
diff --git a/Tests/SubprocessTests/AsyncIOTests.swift b/Tests/SubprocessTests/AsyncIOTests.swift
@@ -54,13 +54,13 @@ extension SubprocessAsyncIOTests {
 
     @Test func testMultipleSequentialReadWrite() async throws {
         var _chunks: [[UInt8]] = []
-        for _ in 0 ..< 10 {
+        for _ in 0..<10 {
             // Generate some that's short
-            _chunks.append(randomData(count: Int.random(in: 1 ..< 512)))
+            _chunks.append(randomData(count: Int.random(in: 1..<512)))
         }
-        for _ in 0 ..< 10 {
+        for _ in 0..<10 {
             // Generate some that are longer than buffer size
-            _chunks.append(randomData(count: Int.random(in: Subprocess.readBufferSize ..< Subprocess.readBufferSize * 3)))
+            _chunks.append(randomData(count: Int.random(in: Subprocess.readBufferSize..<Subprocess.readBufferSize * 3)))
         }
         _chunks.shuffle()
         let chunks = _chunks
diff --git a/Tests/SubprocessTests/IntegrationTests.swift b/Tests/SubprocessTests/IntegrationTests.swift
@@ -678,11 +678,11 @@ extension SubprocessIntegrationTests {
             DispatchQueue.global().async {
                 var currentStart = 0
                 while currentStart + chunkSize < expected.count {
-                    continuation.yield(expected[currentStart ..< currentStart + chunkSize])
+                    continuation.yield(expected[currentStart..<currentStart + chunkSize])
                     currentStart += chunkSize
                 }
                 if expected.count - currentStart > 0 {
-                    continuation.yield(expected[currentStart ..< expected.count])
+                    continuation.yield(expected[currentStart..<expected.count])
                 }
                 continuation.finish()
             }
@@ -1480,7 +1480,7 @@ extension SubprocessIntegrationTests {
         )
         #endif
 
-        for _ in 0 ..< 128 {
+        for _ in 0..<128 {
             let result = try await _run(
                 setup,
                 input: .none,
@@ -1506,7 +1506,7 @@ extension SubprocessIntegrationTests {
         )
         #endif
 
-        for _ in 0 ..< 128 {
+        for _ in 0..<128 {
             let result = try await _run(
                 setup,
                 input: .none,
@@ -1657,20 +1657,20 @@ extension SubprocessIntegrationTests {
         // Generate test cases
         func generateString(size: TestCaseSize) -> [UInt8] {
             // Basic Latin has the range U+0020 ... U+007E
-            let range: ClosedRange<UInt8> = 0x20 ... 0x7E
+            let range: ClosedRange<UInt8> = 0x20...0x7E
 
             let length: Int
             switch size {
             case .large:
-                length = Int(Double.random(in: 1.0 ..< 2.0) * Double(readBufferSize)) + 1
+                length = Int(Double.random(in: 1.0..<2.0) * Double(readBufferSize)) + 1
             case .medium:
-                length = Int(Double.random(in: 0.2 ..< 1.0) * Double(readBufferSize)) + 1
+                length = Int(Double.random(in: 0.2..<1.0) * Double(readBufferSize)) + 1
             case .small:
-                length = Int.random(in: 1 ..< 16)
+                length = Int.random(in: 1..<16)
             }
 
             var buffer: [UInt8] = Array(repeating: 0, count: length)
-            for index in 0 ..< length {
+            for index in 0..<length {
                 buffer[index] = UInt8.random(in: range)
             }
             // Buffer cannot be empty or a line with a \r ending followed by an empty one with a \n ending would be indistinguishable.
@@ -1789,7 +1789,7 @@ extension SubprocessIntegrationTests {
         )
         #endif
         try await withThrowingTaskGroup(of: Void.self) { group in
-            for _ in 0 ..< 8 {
+            for _ in 0..<8 {
                 group.addTask {
                     let r = try await _run(
                         setup,
@@ -1821,7 +1821,7 @@ extension SubprocessIntegrationTests {
             arguments: ["-f", "/dev/null"]
         )
         #endif
-        for i in 0 ..< 100 {
+        for i in 0..<100 {
             let terminationStatus = try await withThrowingTaskGroup(
                 of: TerminationStatus?.self,
                 returning: TerminationStatus.self
@@ -1839,7 +1839,7 @@ extension SubprocessIntegrationTests {
                     ).terminationStatus
                 }
                 group.addTask {
-                    let waitNS = UInt64.random(in: 0 ..< 10_000_000)
+                    let waitNS = UInt64.random(in: 0..<10_000_000)
                     try? await Task.sleep(nanoseconds: waitNS)
                     return nil
                 }
@@ -1860,7 +1860,7 @@ extension SubprocessIntegrationTests {
     }
 
     @Test func testExitCode() async throws {
-        for exitCode in UInt8.min ..< UInt8.max {
+        for exitCode in UInt8.min..<UInt8.max {
             #if os(Windows)
             let setup = TestSetup(
                 executable: .name("cmd.exe"),
diff --git a/Tests/SubprocessTests/ProcessMonitoringTests.swift b/Tests/SubprocessTests/ProcessMonitoringTests.swift
@@ -273,11 +273,11 @@ extension SubprocessProcessMonitoringTests {
     @Test func testCanMonitorProcessConcurrently() async throws {
         let testCount = 100
         try await withThrowingTaskGroup { group in
-            for _ in 0 ..< testCount {
+            for _ in 0..<testCount {
                 group.addTask {
                     // Sleep for different random time intervals
                     let config = self.longRunningProcess(
-                        withTimeOutSeconds: Double.random(in: 0 ..< 1.0)
+                        withTimeOutSeconds: Double.random(in: 0..<1.0)
                     )
 
                     try await withSpawnedExecution(config: config) { execution in
@@ -305,7 +305,7 @@ extension SubprocessProcessMonitoringTests {
             }
         }
 
-        for _ in 0 ..< testCount {
+        for _ in 0..<testCount {
             let config = self.immediateExitProcess(withExitCode: 0)
             let spawnResult = try config.spawn(
                 withInput: self.devNullInputPipe(),
diff --git a/Tests/SubprocessTests/TestSupport.swift b/Tests/SubprocessTests/TestSupport.swift
@@ -35,13 +35,13 @@ internal func randomString(length: Int, lettersOnly: Bool = false) -> String {
     } else {
         letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
     }
-    return String((0 ..< length).map { _ in letters.randomElement()! })
+    return String((0..<length).map { _ in letters.randomElement()! })
 }
 
 internal func randomData(count: Int) -> [UInt8] {
     return Array(unsafeUninitializedCapacity: count) { buffer, initializedCount in
-        for i in 0 ..< count {
-            buffer[i] = UInt8.random(in: 0 ... 255)
+        for i in 0..<count {
+            buffer[i] = UInt8.random(in: 0...255)
         }
         initializedCount = count
     }
diff --git a/Tests/SubprocessTests/UnixTests.swift b/Tests/SubprocessTests/UnixTests.swift
@@ -53,7 +53,7 @@ extension SubprocessUnixTests {
         )
     )
     func testSubprocessPlatformOptionsUserID() async throws {
-        let expectedUserID = uid_t(Int.random(in: 1000 ... 2000))
+        let expectedUserID = uid_t(Int.random(in: 1000...2000))
         var platformOptions = PlatformOptions()
         platformOptions.userID = expectedUserID
         try await self.assertID(
@@ -71,7 +71,7 @@ extension SubprocessUnixTests {
         )
     )
     func testSubprocessPlatformOptionsGroupID() async throws {
-        let expectedGroupID = gid_t(Int.random(in: 1000 ... 2000))
+        let expectedGroupID = gid_t(Int.random(in: 1000...2000))
         var platformOptions = PlatformOptions()
         platformOptions.groupID = expectedGroupID
         try await self.assertID(
@@ -90,8 +90,8 @@ extension SubprocessUnixTests {
     )
     func testSubprocessPlatformOptionsSupplementaryGroups() async throws {
         var expectedGroups: Set<gid_t> = Set()
-        for _ in 0 ..< Int.random(in: 5 ... 10) {
-            expectedGroups.insert(gid_t(Int.random(in: 1000 ... 2000)))
+        for _ in 0..<Int.random(in: 5...10) {
+            expectedGroups.insert(gid_t(Int.random(in: 1000...2000)))
         }
         var platformOptions = PlatformOptions()
         platformOptions.supplementaryGroups = Array(expectedGroups)
@@ -279,7 +279,7 @@ extension SubprocessUnixTests {
                     // Make sure the grand child `/usr/bin/yes` actually exited
                     // This is unfortunately racy because the pid isn't immediately invalided
                     // once `kill` returns. Allow a few failures and delay to counter this
-                    for _ in 0 ..< 10 {
+                    for _ in 0..<10 {
                         let rc = kill(grandChildPid, 0)
                         if rc == 0 {
                             // Wait for a small delay
@@ -496,7 +496,7 @@ extension SubprocessUnixTests {
         try await withThrowingTaskGroup(of: Void.self) { group in
             var running = 0
             let byteCount = 1000
-            for _ in 0 ..< maxConcurrent {
+            for _ in 0..<maxConcurrent {
                 group.addTask {
                     // This invocation specifically requires bash semantics; sh (on FreeBSD at least) does not consistently support -s in this way
                     let r = try await Subprocess.run(

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ extension AsyncBufferSequence {`
`285`	`285`	`continue`
`286`	`286`	`}`
`287`	`287`	`return yield()`
`288`		`- case lineFeed ..< carriageReturn, newLine1, lineSeparator1, paragraphSeparator1:`
	`288`	`+ case lineFeed..<carriageReturn, newLine1, lineSeparator1, paragraphSeparator1:`
`289`	`289`	`return yield()`
`290`	`290`	`default:`
`291`	`291`	`continue`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ extension AsyncBufferSequence.Buffer {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`#if SubprocessSpan`
	`80`	`+ // swift-format-ignore`
`80`	`81`	`// Access the storage backing this Buffer`
`81`	`82`	`public var bytes: RawSpan {`
`82`	`83`	`@lifetime(borrow self)`
Original file line number	Diff line number	Diff line change
`@@ -410,9 +410,9 @@ extension Environment: CustomStringConvertible, CustomDebugStringConvertible {`
`410`	`410`	`continue`
`411`	`411`	`}`
`412`	`412`
`413`		`- let key = String(environmentString[environmentString.startIndex ..< delimiter])`
	`413`	`+ let key = String(environmentString[environmentString.startIndex..<delimiter])`
`414`	`414`	`let value = String(`
`415`		`- environmentString[environmentString.index(after: delimiter) ..< environmentString.endIndex]`
	`415`	`+ environmentString[environmentString.index(after: delimiter)..<environmentString.endIndex]`
`416`	`416`	`)`
`417`	`417`	`results[key] = value`
`418`	`418`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ final class AsyncIO: Sendable {`
`161`	`161`	`break monitorLoop`
`162`	`162`	`}`
`163`	`163`
`164`		`- for index in 0 ..< Int(eventCount) {`
	`164`	`+ for index in 0..<Int(eventCount) {`
`165`	`165`	`let event = events[index]`
`166`	`166`	`let targetFileDescriptor = event.data.fd`
`167`	`167`	`// Breakout the monitor loop if we received shutdown`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public struct StringOutput<Encoding: Unicode.Encoding>: OutputProtocol {`
`121`	`121`	`public func output(from span: RawSpan) throws -> String? {`
`122`	`122`	`// FIXME: Span to String`
`123`	`123`	`var array: [UInt8] = []`
`124`		`- for index in 0 ..< span.byteCount {`
	`124`	`+ for index in 0..<span.byteCount {`
`125`	`125`	`array.append(span.unsafeLoad(fromByteOffset: index, as: UInt8.self))`
`126`	`126`	`}`
`127`	`127`	`return String(decodingBytes: array, as: Encoding.self)`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ private func monitorThreadFunc(context: MonitorThreadContext) {`
`264`	`264`	`break monitorLoop`
`265`	`265`	`}`
`266`	`266`
`267`		`- for index in 0 ..< Int(eventCount) {`
	`267`	`+ for index in 0..<Int(eventCount) {`
`268`	`268`	`let event = events[index]`
`269`	`269`	`let targetFileDescriptor = event.data.fd`
`270`	`270`