From 1d08b4e650a141acf573a1a3ecb16fcbb5bcff30 Mon Sep 17 00:00:00 2001
From: Nick Lockwood <nick@charcoaldesign.co.uk>
Date: Sat, 8 Apr 2023 12:45:47 +0100
Subject: [PATCH] Fix `self` being inserted in capture list

---
 Sources/Rules.swift               | 18 +++++++++++-------
 Tests/RulesTests+Redundancy.swift | 31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/Sources/Rules.swift b/Sources/Rules.swift
index 0c81560b..142200f9 100644
--- a/Sources/Rules.swift
+++ b/Sources/Rules.swift
@@ -3622,6 +3622,10 @@ public struct _FormatRules {
                     }
                     continue
                 case .startOfScope("{") where formatter.isStartOfClosure(at: index):
+                    let inIndex = formatter.index(of: .keyword, after: index, if: {
+                        $0 == .keyword("in")
+                    })
+
                     // Parse the capture list and arguments list,
                     // and record the type of `self` capture used in the closure
                     var captureList: [Token]?
@@ -3629,10 +3633,10 @@ public struct _FormatRules {
 
                     // Handle a capture list followed by an optional parameter list:
                     // `{ [self, foo] bar in` or `{ [self, foo] in` etc.
-                    if let captureListStartIndex = formatter.index(of: .nonSpaceOrCommentOrLinebreak, after: index),
+                    if let inIndex = inIndex,
+                       let captureListStartIndex = formatter.index(of: .nonSpaceOrCommentOrLinebreak, after: index),
                        formatter.tokens[captureListStartIndex] == .startOfScope("["),
-                       let captureListEndIndex = formatter.endOfScope(at: captureListStartIndex),
-                       let inIndex = formatter.index(of: .keyword("in"), after: captureListEndIndex)
+                       let captureListEndIndex = formatter.endOfScope(at: captureListStartIndex)
                     {
                         captureList = Array(formatter.tokens[(captureListStartIndex + 1) ..< captureListEndIndex])
                         parameterList = Array(formatter.tokens[(captureListEndIndex + 1) ..< inIndex])
@@ -3640,9 +3644,9 @@ public struct _FormatRules {
 
                     // Handle a parameter list if present without a capture list
                     // e.g. `{ foo, bar in`
-                    else if let firstTokenInClosure = formatter.index(of: .nonSpaceOrCommentOrLinebreak, after: index),
-                            formatter.isInClosureArguments(at: firstTokenInClosure),
-                            let inIndex = formatter.index(of: .keyword("in"), after: index)
+                    else if let inIndex = inIndex,
+                            let firstTokenInClosure = formatter.index(of: .nonSpaceOrCommentOrLinebreak, after: index),
+                            formatter.isInClosureArguments(at: firstTokenInClosure)
                     {
                         parameterList = Array(formatter.tokens[firstTokenInClosure ..< inIndex])
                     }
@@ -3737,7 +3741,7 @@ public struct _FormatRules {
                     }
 
                     closureStack.append((allowsImplicitSelf: closureAllowsImplicitSelf(), selfCapture: selfCapture))
-                    index += 1
+                    index = (inIndex ?? index) + 1
                     processBody(at: &index, localNames: closureLocalNames, members: members, typeStack: &typeStack, closureStack: &closureStack,
                                 membersByType: &membersByType, classMembersByType: &classMembersByType,
                                 usingDynamicLookup: usingDynamicLookup, isTypeRoot: false, isInit: isInit)
diff --git a/Tests/RulesTests+Redundancy.swift b/Tests/RulesTests+Redundancy.swift
index 48de41c6..8db6f8b5 100644
--- a/Tests/RulesTests+Redundancy.swift
+++ b/Tests/RulesTests+Redundancy.swift
@@ -5301,6 +5301,35 @@ class RedundancyTests: RulesTests {
         testFormatting(for: input, rule: FormatRules.redundantSelf, options: options)
     }
 
+    func testNoInsertSelfInCaptureList() {
+        let input = """
+        class Thing {
+            var a: String? { nil }
+
+            func foo() {
+                let b = ""
+                { [weak a = b] _ in }
+            }
+        }
+        """
+        let options = FormatOptions(explicitSelf: .insert)
+        testFormatting(for: input, rule: FormatRules.redundantSelf, options: options)
+    }
+
+    func testNoInsertSelfInCaptureList2() {
+        let input = """
+        class Thing {
+            var a: String? { nil }
+
+            func foo() {
+                { [weak a] _ in }
+            }
+        }
+        """
+        let options = FormatOptions(explicitSelf: .insert)
+        testFormatting(for: input, rule: FormatRules.redundantSelf, options: options)
+    }
+
     // explicitSelf = .initOnly
 
     func testPreserveSelfInsideClassInit() {
@@ -5564,6 +5593,8 @@ class RedundancyTests: RulesTests {
         testFormatting(for: input, rule: FormatRules.redundantSelf, options: options)
     }
 
+    // parsing bugs
+
     func testSelfRemovalParsingBug4() {
         let input = """
         struct Foo {