Accept code suggestions and reformat

Sources/Vexil/Snapshots/MutableFlagContainer.swift

@@ -86,16 +86,13 @@ extension MutableFlagContainer: Hashable where Container: Hashable {
 
 // MARK: - Debugging
 
-// extension MutableFlagContainer: CustomDebugStringConvertible {
-//    public var debugDescription: String {
-//        "\(String(describing: Group.self))("
-//        + Mirror(reflecting: group).children
-//            .map { _, value -> String in
-//                (value as? CustomDebugStringConvertible)?.debugDescription
-//                ?? (value as? CustomStringConvertible)?.description
-//                ?? String(describing: value)
-//            }
-//            .joined(separator: ", ")
-//        + ")"
-//    }
-// }
+extension MutableFlagContainer: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        let describer = FlagDescriber()
+        container.walk(visitor: describer)
+        return "\(String(describing: Container.self))("
+            + describer.descriptions.joined(separator: ", ")
+            + ")"
+    }
+}
+

Sources/Vexil/Snapshots/Snapshot+Extensions.swift

@@ -25,16 +25,13 @@ extension Snapshot: Hashable where RootGroup: Hashable {
     }
 }
 
-// extension Snapshot: CustomDebugStringConvertible {
-//    public var debugDescription: String {
-//        "Snapshot<\(String(describing: RootGroup.self)), \(values.count) overrides>("
-//            + Mirror(reflecting: rootGroup).children
-//            .map { _, value -> String in
-//                (value as? CustomDebugStringConvertible)?.debugDescription
-//                    ?? (value as? CustomStringConvertible)?.description
-//                    ?? String(describing: value)
-//            }
-//            .joined(separator: "; ")
-//            + ")"
-//    }
-// }
+extension Snapshot: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        let describer = FlagDescriber()
+        rootGroup.walk(visitor: describer)
+        let count = values.withLock { $0.count }
+        return "Snapshot<\(String(describing: RootGroup.self)), \(count) overrides>("
+            + describer.descriptions.joined(separator: "; ")
+            + ")"
+    }
+}

Sources/Vexil/Visitors/FlagDescriber.swift

@@ -0,0 +1,32 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Vexil open source project
+//
+// Copyright (c) 2024 Unsigned Apps and the open source contributors.
+// Licensed under the MIT license
+//
+// See LICENSE for license information
+//
+// SPDX-License-Identifier: MIT
+//
+//===----------------------------------------------------------------------===//
+
+final class FlagDescriber: FlagVisitor {
+
+    var descriptions = [String]()
+
+    func visitFlag<Value>(
+        keyPath: FlagKeyPath,
+        value: () -> Value?,
+        defaultValue: Value,
+        wigwag: () -> FlagWigwag<Value>
+    ) where Value: FlagValue {
+        let value = value()
+        let description = (value as? CustomDebugStringConvertible)?.debugDescription
+            ?? (value as? CustomStringConvertible)?.description
+            ?? String(describing: value)
+        descriptions.append("\(keyPath.key)=\(description)")
+    }
+
+}
+

Sources/VexilMacros/FlagContainerMacro.swift

@@ -189,11 +189,8 @@ private extension DeclModifierListSyntax {
 private extension TypeSyntax {
     var identifier: String? {
         for token in tokens(viewMode: .all) {
-            switch token.tokenKind {
-            case let .identifier(identifier):
+            if case let .identifier(identifier) = token.tokenKind {
                 return identifier
-            default:
-                break
             }
         }
         return nil

Sources/VexilMacros/FlagGroupMacro.swift

@@ -165,9 +165,10 @@ private extension FlagGroupMacro {
                 let stringLiteral = functionCall.arguments.first?.expression.as(StringLiteralExprSyntax.self),
                 let string = stringLiteral.segments.first?.as(StringSegmentSyntax.self)
             {
-                switch memberAccess.declName.baseName.text {
-                case "customKey":           self = .customKey(string.content.text)
-                default:                    return nil
+                if case "customKey" = memberAccess.declName.baseName.text {
+                    self = .customKey(string.content.text)
+                } else {
+                    return nil
                 }
 
             } else {

Sources/VexilMacros/FlagMacro.swift

@@ -104,7 +104,7 @@ private extension AttributeSyntax.Arguments {
         }
 
         // Support for the single description property overload, ie @Flag("description")
-        if case .argumentList(let list) = self, list.count == 1, let argument = list.first, argument.label == nil {
+        if case let .argumentList(list) = self, list.count == 1, let argument = list.first, argument.label == nil {
             return argument
         }
 

Sources/VexilMacros/Utilities/PatternBindingSyntax.swift

@@ -34,15 +34,17 @@ extension PatternBindingSyntax {
             } else if let function = initializer.value.as(FunctionCallExprSyntax.self) {
                 if let identifier = function.calledExpression.as(DeclReferenceExprSyntax.self) {
                     return TypeSyntax(IdentifierTypeSyntax(name: identifier.baseName))
-                } else if let memberAccess = function.calledExpression.as(MemberAccessExprSyntax.self) {
-                    if let identifier = memberAccess.base?.as(DeclReferenceExprSyntax.self) {
-                        return TypeSyntax(IdentifierTypeSyntax(name: identifier.baseName))
-                    }
-                }
-            } else if let memberAccess = initializer.value.as(MemberAccessExprSyntax.self) {
-                if let identifier = memberAccess.base?.as(DeclReferenceExprSyntax.self) {
+                } else if
+                    let memberAccess = function.calledExpression.as(MemberAccessExprSyntax.self),
+                    let identifier = memberAccess.base?.as(DeclReferenceExprSyntax.self)
+                {
                     return TypeSyntax(IdentifierTypeSyntax(name: identifier.baseName))
                 }
+            } else if
+                let memberAccess = initializer.value.as(MemberAccessExprSyntax.self),
+                let identifier = memberAccess.base?.as(DeclReferenceExprSyntax.self)
+            {
+                return TypeSyntax(IdentifierTypeSyntax(name: identifier.baseName))
             }
         }
 

Sources/Vexillographer/Flag Value Controls/CaseIterableFlagControl.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Vexil open source project
 //
-// Copyright (c) 2023 Unsigned Apps and the open source contributors.
+// Copyright (c) 2024 Unsigned Apps and the open source contributors.
 // Licensed under the MIT license
 //
 // See LICENSE for license information
@@ -38,48 +38,48 @@ struct CaseIterableFlagControl<Value>: View where Value: FlagValue, Value: CaseI
 
     var content: some View {
         HStack {
-            Text(self.label).font(.headline)
+            Text(label).font(.headline)
             Spacer()
-            FlagDisplayValueView(value: self.value)
+            FlagDisplayValueView(value: value)
         }
     }
 
 #if os(iOS)
 
     var body: some View {
         HStack {
-            if self.isEditable {
-                NavigationLink(destination: self.selector) {
-                    self.content
+            if isEditable {
+                NavigationLink(destination: selector) {
+                    content
                 }
             } else {
-                self.content
+                content
             }
-            DetailButton(hasChanges: self.hasChanges, showDetail: self.$showDetail)
+            DetailButton(hasChanges: hasChanges, showDetail: $showDetail)
         }
     }
 
     var selector: some View {
-        SelectorList(value: self.$value)
-            .navigationBarTitle(Text(self.label), displayMode: .inline)
+        SelectorList(value: $value)
+            .navigationBarTitle(Text(label), displayMode: .inline)
     }
 
 #elseif os(macOS)
 
     var body: some View {
         Group {
-            if self.isEditable {
-                self.picker
+            if isEditable {
+                picker
             } else {
-                self.content
+                content
             }
         }
     }
 
     var picker: some View {
         let picker = Picker(
-            selection: self.$value,
-            label: Text(self.label),
+            selection: $value,
+            label: Text(label),
             content: {
                 ForEach(Value.allCases, id: \.self) { value in
                     FlagDisplayValueView(value: value)
@@ -114,7 +114,7 @@ struct CaseIterableFlagControl<Value>: View where Value: FlagValue, Value: CaseI
                     Button(
                         action: {
                             self.value = value
-                            self.presentationMode.wrappedValue.dismiss()
+                            presentationMode.wrappedValue.dismiss()
                         },
                         label: {
                             HStack {
@@ -123,7 +123,7 @@ struct CaseIterableFlagControl<Value>: View where Value: FlagValue, Value: CaseI
                                 Spacer()
 
                                 if value == self.value {
-                                    self.checkmark
+                                    checkmark
                                 }
                             }
                         }
@@ -135,13 +135,13 @@ struct CaseIterableFlagControl<Value>: View where Value: FlagValue, Value: CaseI
 #if os(macOS)
 
         var checkmark: some View {
-            return Text("✓")
+            Text("✓")
         }
 
 #else
 
         var checkmark: some View {
-            return Image(systemName: "checkmark")
+            Image(systemName: "checkmark")
         }
 
 #endif
@@ -160,8 +160,8 @@ extension UnfurledFlag: CaseIterableEditableFlag
     where Value: FlagValue, Value: CaseIterable, Value.AllCases: RandomAccessCollection,
     Value: RawRepresentable, Value.RawValue: FlagValue, Value: Hashable
 {
-    func control<RootGroup>(label: String, manager: FlagValueManager<RootGroup>, showDetail: Binding<Bool>) -> AnyView where RootGroup: FlagContainer {
-        return CaseIterableFlagControl<Value>(
+    func control(label: String, manager: FlagValueManager<some FlagContainer>, showDetail: Binding<Bool>) -> AnyView {
+        CaseIterableFlagControl<Value>(
             label: label,
             value: Binding(
                 key: flag.key,