[WIP] Groups Rebuild

Scripts/EmojiGenerator.swift

@@ -282,8 +282,6 @@ extension EmojiGenerator {
         // Main enum: Create a string enum defining our enumNames equal to the baseEmoji string
         // e.g. case grinning = "😀"
         writeBlock(fileName: "Emoji.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("/// A sorted representation of all available emoji")
             fileHandle.writeLine("enum Emoji: String, CaseIterable, Equatable {")
@@ -293,7 +291,6 @@ extension EmojiGenerator {
                 }
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
@@ -340,8 +337,6 @@ extension EmojiGenerator {
         // if rawValue == "😀" { self.init(baseEmoji: .grinning, skinTones: nil) }
         // else if rawValue == "🦻🏻" { self.init(baseEmoji: .earWithHearingAid, skinTones: [.light])
         writeBlock(fileName: "EmojiWithSkinTones+String.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension EmojiWithSkinTones {")
             fileHandle.indent {
@@ -409,7 +404,6 @@ extension EmojiGenerator {
                 }
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
@@ -474,8 +468,6 @@ extension EmojiGenerator {
 
     static func writeSkinToneLookupFile(from emojiModel: EmojiModel) {
         writeBlock(fileName: "Emoji+SkinTones.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension Emoji {")
             fileHandle.indent {
@@ -539,7 +531,6 @@ extension EmojiGenerator {
                 fileHandle.writeLine("}")
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
@@ -556,8 +547,6 @@ extension EmojiGenerator {
         ]
 
         writeBlock(fileName: "Emoji+Category.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension Emoji {")
             fileHandle.indent {
@@ -664,16 +653,13 @@ extension EmojiGenerator {
                 fileHandle.writeLine("}")
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
     static func writeNameLookupFile(from emojiModel: EmojiModel) {
         // Name lookup: Create a computed property mapping an Emoji enum element to the raw Emoji name string
         // e.g. case .grinning: return "GRINNING FACE"
         writeBlock(fileName: "Emoji+Name.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension Emoji {")
             fileHandle.indent {
@@ -688,7 +674,6 @@ extension EmojiGenerator {
                 fileHandle.writeLine("}")
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 }
@@ -753,6 +738,11 @@ extension EmojiGenerator {
 
         fileHandle.writeLine("")
         fileHandle.writeLine("// This file is generated by EmojiGenerator.swift, do not manually edit it.")
+        fileHandle.writeLine("//")
+        fileHandle.writeLine("// swiftlint:disable all")
+        fileHandle.writeLine("// stringlint:disable")
+        fileHandle.writeLine("")
+        fileHandle.writeLine("import Foundation")
         fileHandle.writeLine("")
 
         block(fileHandle)

Scripts/LintLocalizableStrings.swift

@@ -47,7 +47,7 @@ extension ProjectState {
         "_SharedTestUtilities/",    // Exclude shared test directory
         "external/"                 // External dependencies
     ]
-    static let excludedPhrases: Set<String> = [ "", " ", "  ", ",", ", ", "null", "\"", "@[0-9a-fA-F]{66}", "^[0-9A-Fa-f]+$", "/" ]
+    static let excludedPhrases: Set<String> = [ "", " ", "  ", ",", ", ", "null", "\"", "\"\\($0)\"", "@[0-9a-fA-F]{66}", "^[0-9A-Fa-f]+$", "/" ]
     static let excludedUnlocalizedStringLineMatching: Set<MatchType> = [
         .contains(ProjectState.lintSuppression, caseSensitive: false),
         .prefix("#import", caseSensitive: false),
@@ -58,6 +58,16 @@ extension ProjectState {
         .contains("print(", caseSensitive: false),
         .contains("SNLog(", caseSensitive: false),
         .contains("Log.setup(", caseSensitive: false),
+        .containsAnd(
+            "primaryPrefix:",
+            caseSensitive: false,
+            .previousLine(numEarlier: 1, .contains("Log.setup(with: Logger(", caseSensitive: false))
+        ),
+        .containsAnd(
+            "customDirectory:",
+            caseSensitive: false,
+            .previousLine(numEarlier: 2, .contains("Log.setup(with: Logger(", caseSensitive: false))
+        ),
         .contains("Log.verbose(", caseSensitive: false),
         .contains("Log.debug(", caseSensitive: false),
         .contains("Log.info(", caseSensitive: false),
@@ -66,11 +76,15 @@ extension ProjectState {
         .contains("Log.critical(", caseSensitive: false),
         .contains("Log.Category =", caseSensitive: false),
         .contains("logMessage:", caseSensitive: false),
+        .contains(".logging(", caseSensitive: false),
         .contains("owsFailDebug(", caseSensitive: false),
+        .contains("error: .other(", caseSensitive: false),
         .contains("#imageLiteral(resourceName:", caseSensitive: false),
         .contains("UIImage(named:", caseSensitive: false),
         .contains("UIImage(systemName:", caseSensitive: false),
         .contains("[UIImage imageNamed:", caseSensitive: false),
+        .contains("Image(", caseSensitive: false),
+        .contains("logo:", caseSensitive: false),
         .contains("UIFont(name:", caseSensitive: false),
         .contains(".dateFormat =", caseSensitive: false),
         .contains("accessibilityLabel =", caseSensitive: false),
@@ -80,6 +94,8 @@ extension ProjectState {
         .contains("accessibilityLabel:", caseSensitive: false),
         .contains("Accessibility(identifier:", caseSensitive: false),
         .contains("Accessibility(label:", caseSensitive: false),
+        .contains(".withAccessibility(identifier:", caseSensitive: false),
+        .contains(".withAccessibility(label:", caseSensitive: false),
         .contains("NSAttributedString.Key(", caseSensitive: false),
         .contains("Notification.Name(", caseSensitive: false),
         .contains("Notification.Key(", caseSensitive: false),
@@ -99,6 +115,21 @@ extension ProjectState {
             caseSensitive: false,
             .previousLine(numEarlier: 2, .contains("Accessibility(", caseSensitive: false))
         ),
+        .containsAnd(
+            "identifier:",
+            caseSensitive: false,
+            .previousLine(numEarlier: 1, .contains(".withAccessibility(", caseSensitive: false))
+        ),
+        .containsAnd(
+            "label:",
+            caseSensitive: false,
+            .previousLine(numEarlier: 1, .contains(".withAccessibility(", caseSensitive: false))
+        ),
+        .containsAnd(
+            "label:",
+            caseSensitive: false,
+            .previousLine(numEarlier: 2, .contains(".withAccessibility(", caseSensitive: false))
+        ),
         .contains("SQL(", caseSensitive: false),
         .contains(" == ", caseSensitive: false),
         .contains("forResource:", caseSensitive: false),
@@ -111,12 +142,29 @@ extension ProjectState {
         .contains("separator:", caseSensitive: false),
         .contains("separatedBy:", caseSensitive: false),
         .nextLine(.contains(".put(key:", caseSensitive: false)),
+        .nextLine(
+            .containsAnd(
+                ".put(",
+                caseSensitive: false,
+                .nextLine(.contains("key:", caseSensitive: false))
+            )
+        ),
         .nextLine(.contains(".putNumber(", caseSensitive: false)),
         .nextLine(.contains(".localized()", caseSensitive: false)),
+        .contains(".localizedString(for:", caseSensitive: false),
         .regex(".*static var databaseTableName: String"),
         .regex("case .* = "),
         .regex("Error.*\\("),
-        .belowLineContaining("PreviewProvider")
+        .belowLineContaining("PreviewProvider"),
+        .belowLineContaining("#Preview"),
+        .regex("Crypto.*\\(id:"),
+        .containsAnd("id:", caseSensitive: false, .previousLine(numEarlier: 1, .regex("Crypto.*\\("))),
+        .regex(".*\\.like\\(\".*%\""),
+        .containsAnd(
+            "identifier:",
+            caseSensitive: false,
+            .previousLine(numEarlier: 1, .contains("Dependencies.create", caseSensitive: false))
+        )
     ]
 }