fix strict linting issues

Signed-off-by: James Ranson <james@ranson.org>

Author: jranson

.swiftlint.yml

@@ -1,5 +1,6 @@
 # SwiftLint: https://github.com/realm/SwiftLint
 # Run `make lint` (requires SwiftLint: `brew install swiftlint`).
+# `make lint` passes `--strict` so warnings fail CI (avoid `swiftlint --fix` without review).
 
 excluded:
   - build
@@ -10,8 +11,34 @@ excluded:
 disabled_rules:
   # Short names are common in tight loops, parsers, and indices.
   - identifier_name
-  # App has a few intentional `try!` sites; prefer fixing over silencing long-term.
-  - force_try
+
+# Curated opt-in rules (omit closure_end_indentation: very noisy for nested SwiftUI).
+opt_in_rules:
+  - closure_spacing
+  - empty_count
+  - empty_enum_arguments
+  - empty_string
+  - explicit_init
+  - fatal_error_message
+  - first_where
+  - identical_operands
+  - legacy_multiple
+  - literal_expression_end_indentation
+  - operator_usage_whitespace
+  - overridden_super_call
+  - pattern_matching_keywords
+  - private_action
+  - private_outlet
+  - prohibited_super_call
+  - redundant_nil_coalescing
+  - redundant_type_annotation
+  - sorted_first_last
+  - static_operator
+  - toggle_bool
+  - unavailable_function
+  - unneeded_parentheses_in_closure_argument
+  - weak_delegate
+  - yoda_condition
 
 line_length:
   # Match error so long literals in fixtures do not warn; errors still cap runaway lines.

ClipboardEnvy/ClipboardHelpers/CSV.swift

@@ -488,7 +488,7 @@ extension ClipboardTransform {
         let headerRow = rows[0]
         let dataRows = Array(rows.dropFirst())
 
-        let sortedData = dataRows.enumerated().sorted { (a, b) in
+        let sortedData = dataRows.enumerated().sorted { a, b in
             let valueA = columnIndex < a.element.count ? a.element[columnIndex] : ""
             let valueB = columnIndex < b.element.count ? b.element[columnIndex] : ""
 

ClipboardEnvy/EditorWindowRoot.swift

@@ -80,7 +80,13 @@ struct EditorWindowRoot: View {
 }
 
 #Preview {
-    let container = try! ModelContainer(for: Snippet.self, configurations: .init(isStoredInMemoryOnly: true))
+    let container: ModelContainer = {
+        do {
+            return try ModelContainer(for: Snippet.self, configurations: .init(isStoredInMemoryOnly: true))
+        } catch {
+            fatalError("Preview ModelContainer failed: \(error)")
+        }
+    }()
     EditorWindowRoot()
         .environmentObject(EditorStore())
         .environmentObject(SnippetsStore(container: container))

ClipboardEnvy/MenuBarView.swift

@@ -2183,7 +2183,13 @@ extension View {
 }
 
 #Preview {
-    let container = try! ModelContainer(for: Snippet.self, configurations: .init(isStoredInMemoryOnly: true))
+    let container: ModelContainer = {
+        do {
+            return try ModelContainer(for: Snippet.self, configurations: .init(isStoredInMemoryOnly: true))
+        } catch {
+            fatalError("Preview ModelContainer failed: \(error)")
+        }
+    }()
     MenuBarView()
         .environmentObject(EditorStore())
         .environmentObject(SnippetsStore(container: container))

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build build-release-unsigned generate-appicons lint test clean generate-build-info
+.PHONY: build build-release-unsigned generate-appicons lint lint-fix-safe test clean generate-build-info
 
 # SwiftLint: https://github.com/realm/SwiftLint — `brew install swiftlint`
 SWIFTLINT ?= $(shell command -v swiftlint 2>/dev/null)
@@ -8,7 +8,22 @@ lint:
 		echo "SwiftLint not found. Install with: brew install swiftlint" >&2; \
 		exit 1; \
 	fi
-	@"$(SWIFTLINT)" lint
+	@"$(SWIFTLINT)" lint --strict
+
+# Autocorrect only low-risk rules (whitespace / file hygiene). Still review `git diff` and run tests.
+# Optional: pass paths, e.g. `make lint-fix-safe FIX_PATHS="ClipboardEnvy/Foo.swift"`
+FIX_PATHS ?= ClipboardEnvy ClipboardEnvyTests scripts
+lint-fix-safe:
+	@if [ -z "$(SWIFTLINT)" ]; then \
+		echo "SwiftLint not found. Install with: brew install swiftlint" >&2; \
+		exit 1; \
+	fi
+	@"$(SWIFTLINT)" lint --fix \
+		--only-rule trailing_whitespace \
+		--only-rule trailing_newline \
+		--only-rule leading_whitespace \
+		--only-rule trailing_semicolon \
+		$(FIX_PATHS)
 
 clean:
 	@rm -rf build dist ; rm -rf ~/Library/Developer/Xcode/DerivedData/ClipboardEnvy-*