Use explicit set of rules in SwiftFormat and SwiftLint and bump versions (#987)

* Use explicit set of rules in SwiftFormat and SwiftLint and bump versions

* [CI] Snapshots (#990)

Author: laevandus

.swiftformat

@@ -2,20 +2,66 @@
 --header "\nCopyright © {year} Stream.io Inc. All rights reserved.\n"
 --swiftversion 5.9
 
---ifdef no-indent
---disable redundantType
---disable extensionAccessControl
---disable andOperator
---disable hoistPatternLet
---disable typeSugar
-
---disable redundantGet # it removes get async throws from getters
+# Use allow-list
+--rules blankLinesAroundMark
+--rules blankLinesAtEndOfScope
+--rules blankLinesAtStartOfScope
+--rules blankLinesBetweenScopes
+--rules braces
+--rules consecutiveBlankLines
+--rules consecutiveSpaces
+--rules duplicateImports
+--rules elseOnSameLine
+--rules emptyBraces
+--rules enumNamespaces
+--rules fileHeader
+--rules indent
+--rules initCoderUnavailable
+--rules isEmpty
+--rules leadingDelimiters
+--rules linebreakAtEndOfFile
+--rules linebreaks
+--rules modifierOrder
+--rules numberFormatting
+--rules redundantBackticks
+--rules redundantBreak
+--rules redundantExtensionACL
+--rules redundantFileprivate
+--rules redundantLet
+--rules redundantLetError
+--rules redundantNilInit
+--rules redundantObjc
+--rules redundantPattern
+--rules redundantRawValues
+--rules redundantVoidReturnType
+--rules semicolons
+--rules sortedImports
+--rules spaceAroundBraces
+--rules spaceAroundBrackets
+--rules spaceAroundComments
+--rules spaceAroundGenerics
+--rules spaceAroundOperators
+--rules spaceAroundParens
+--rules spaceInsideBraces
+--rules spaceInsideBrackets
+--rules spaceInsideComments
+--rules spaceInsideGenerics
+--rules spaceInsideParens
+--rules strongOutlets
+--rules strongifiedSelf
+--rules todos
+--rules trailingCommas
+--rules trailingSpace
+--rules unusedArguments
+--rules void
+--rules wrap
+--rules wrapArguments
+--rules wrapAttributes
+--rules yodaConditions
 
-# Rules inferred from Swift Standard Library:
---disable anyObjectProtocol, wrapMultilineStatementBraces
+# Configuration for enabled rules
+--ifdef no-indent
 --indent 4
---enable isEmpty
---disable redundantParens # it generates mistakes for e.g. "if (a || b), let x = ... {}"
 --semicolons inline
 --nospaceoperators ..., ..< # what about ==, +=?
 --commas inline

.swiftlint.yml

@@ -7,7 +7,6 @@ excluded:
   - Sources/StreamChatSwiftUI/StreamNuke
 
 only_rules:
-  # Currently enabled autocorrectable rules
   - attribute_name_spacing
   - closing_brace
   - colon
@@ -19,14 +18,15 @@ only_rules:
   - empty_enum_arguments
   - empty_parameters
   - empty_parentheses_with_trailing_closure
-  - explicit_init
+  - file_name_no_space
   - joined_default_parameter
   - leading_whitespace
   - legacy_cggeometry_functions
   - legacy_constant
   - legacy_constructor
   - legacy_nsgeometry_functions
   - mark
+  - multiline_arguments
   - no_space_in_method_call
   - prefer_type_checking
   - private_over_fileprivate
@@ -52,5 +52,11 @@ only_rules:
   - vertical_whitespace
   - void_return
 
+multiline_arguments:
+  only_enforce_after_first_closure_on_first_line: true
+
 trailing_whitespace:
-  ignores_empty_lines: true
+  ignores_empty_lines: true
+
+file_name_no_space:
+  severity: error

DemoAppSwiftUI/ChannelHeader/CustomChannelHeader.swift

@@ -75,7 +75,7 @@ struct CustomChannelModifier: ChannelListHeaderViewModifier {
                         actionsPopupShown: $actionsPopupShown
                     )
                     #if compiler(>=6.2)
-                        .sharedBackgroundVisibility(.hidden)
+                    .sharedBackgroundVisibility(.hidden)
                     #endif
                 }
             } else {

Githubfile

@@ -6,6 +6,6 @@ export YEETD_VERSION='1.0'
 export SONAR_VERSION='6.2.1.4610'
 export IPSW_VERSION='3.1.592'
 export INTERFACE_ANALYZER_VERSION='1.0.7'
-export SWIFT_LINT_VERSION='0.55.1'
-export SWIFT_FORMAT_VERSION='0.47.12'
+export SWIFT_LINT_VERSION='0.59.1'
+export SWIFT_FORMAT_VERSION='0.58.2'
 export SWIFT_GEN_VERSION='6.5.1'

Sources/StreamChatSwiftUI/ChatChannel/ChannelHeader/ChatChannelHeaderViewModifier.swift

@@ -118,7 +118,7 @@ public struct DefaultChannelHeaderModifier<Factory: ViewFactory>: ChatChannelHea
                         isActive: $isActive
                     )
                     #if compiler(>=6.2)
-                        .sharedBackgroundVisibility(.hidden)
+                    .sharedBackgroundVisibility(.hidden)
                     #endif
                 }
         } else {

Sources/StreamChatSwiftUI/ChatChannel/Gallery/ShareButtonView.swift

@@ -21,10 +21,10 @@ struct ShareButtonView: View {
                 .customizable()
                 .frame(width: 18, height: 22)
         })
-            .foregroundColor(Color(colors.text))
-            .sheet(isPresented: $isSharePresented) {
-                ShareActivityView(activityItems: content)
-            }
+        .foregroundColor(Color(colors.text))
+        .sheet(isPresented: $isSharePresented) {
+            ShareActivityView(activityItems: content)
+        }
     }
 }
 

Sources/StreamChatSwiftUI/ChatChannel/MessageList/AsyncVoiceMessages/VoiceRecordingContainerView.swift

@@ -153,8 +153,8 @@ struct VoiceRecordingView: View {
                         )
                     )
             })
-                .opacity(loading ? 0 : 1)
-                .overlay(loading ? ProgressView() : nil)
+            .opacity(loading ? 0 : 1)
+            .overlay(loading ? ProgressView() : nil)
 
             VStack(alignment: .leading, spacing: 4) {
                 Text(

Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollCommentsView.swift

@@ -64,15 +64,15 @@ struct PollCommentsView<Factory: ViewFactory>: View {
                                 .bold()
                                 .foregroundColor(colors.tintColor)
                         })
-                            .frame(maxWidth: .infinity)
-                            .withPollsBackground()
-                            .uiAlert(
-                                title: commentButtonTitle,
-                                isPresented: $viewModel.addCommentShown,
-                                text: $viewModel.newCommentText,
-                                accept: L10n.Alert.Actions.send,
-                                action: { viewModel.add(comment: viewModel.newCommentText) }
-                            )
+                        .frame(maxWidth: .infinity)
+                        .withPollsBackground()
+                        .uiAlert(
+                            title: commentButtonTitle,
+                            isPresented: $viewModel.addCommentShown,
+                            text: $viewModel.newCommentText,
+                            accept: L10n.Alert.Actions.send,
+                            action: { viewModel.add(comment: viewModel.newCommentText) }
+                        )
                     }
                 }
                 .padding()

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelSwipeableListItem.swift

@@ -287,19 +287,19 @@ public struct TrailingSwipeActionsView: View {
                             leftButtonTapped(channel)
                         }
                     })
-                        .frame(width: buttonWidth)
-                        .foregroundColor(Color(colors.text))
-                        .background(Color(colors.background1))
+                    .frame(width: buttonWidth)
+                    .foregroundColor(Color(colors.text))
+                    .background(Color(colors.background1))
 
                     if channel.ownCapabilities.contains(.deleteChannel) {
                         ActionItemButton(imageName: "trash", action: {
                             withAnimation {
                                 rightButtonTapped(channel)
                             }
                         })
-                            .frame(width: buttonWidth)
-                            .foregroundColor(Color(colors.textInverted))
-                            .background(Color(colors.alert))
+                        .frame(width: buttonWidth)
+                        .foregroundColor(Color(colors.textInverted))
+                        .background(Color(colors.alert))
                     }
                 }
             }

Sources/StreamChatSwiftUI/CommonViews/NavigationBarThemeViewModifier.swift

@@ -5,7 +5,7 @@
 import SwiftUI
 
 extension View {
-    nonisolated public func toolbarThemed<Content>(@ToolbarContentBuilder content toolbarContent: @escaping () -> Content) -> some View where Content: ToolbarContent {
+    public nonisolated func toolbarThemed<Content>(@ToolbarContentBuilder content toolbarContent: @escaping () -> Content) -> some View where Content: ToolbarContent {
         modifier(NavigationBarThemeViewModifier(toolbarContent: toolbarContent))
     }
 }