From 8110fb6baa4bfb685d46442d8987db812bbd1563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Nenz=C3=A9n?= Date: Wed, 8 Jun 2022 11:17:45 +0200 Subject: [PATCH 1/3] Remove empty lines from source files --- .../FileHandling/StringsFileUpdater.swift | 13 +++++++++++++ .../OldCommandLine/CommandLineActor.swift | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift b/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift index d5ad0c9..4c64002 100644 --- a/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift +++ b/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift @@ -174,6 +174,15 @@ public class StringsFileUpdater { ) } + public func removeEmptyLines(separateWithEmptyLine: Bool, keepWhitespaceSurroundings: Bool = false) { + let translations = findTranslations(inString: oldContentString) + rewriteFile( + with: translations, + keepWhitespaceSurroundings: keepWhitespaceSurroundings, + separateWithEmptyLine: separateWithEmptyLine + ) + } + private func translationEntrySortingClosure(lhs: TranslationEntry, rhs: TranslationEntry) -> Bool { // ensure keys with empty values are appended to the end if lhs.value.isEmpty == rhs.value.isEmpty { @@ -560,4 +569,8 @@ extension String { var normalized: String { return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: Locale(identifier: "en")) } + + func normalized(_ locale: Locale) -> String { + return folding(options: [], locale: locale) + } } diff --git a/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift b/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift index 4fc0b4c..15798f9 100644 --- a/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift +++ b/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift @@ -200,6 +200,11 @@ public class CommandLineActor { let stringsFileUpdater = StringsFileUpdater(path: filePath) stringsFileUpdater?.sortByKeys(separateWithEmptyLine: separateWithEmptyLine) } + } else if !separateWithEmptyLine { + for filePath in allStringsFilePaths { + let stringsFileUpdater = StringsFileUpdater(path: filePath) + stringsFileUpdater?.removeEmptyLines(separateWithEmptyLine: separateWithEmptyLine) + } } } } From b7c30049f860c5c9795b20179b2ec8fd2479cc6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Nenz=C3=A9n?= Date: Wed, 8 Jun 2022 11:22:24 +0200 Subject: [PATCH 2/3] Removed unused code --- Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift b/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift index 4c64002..2b61d11 100644 --- a/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift +++ b/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift @@ -569,8 +569,4 @@ extension String { var normalized: String { return folding(options: [.diacriticInsensitive, .caseInsensitive], locale: Locale(identifier: "en")) } - - func normalized(_ locale: Locale) -> String { - return folding(options: [], locale: locale) - } } From 1a2fe47b7904e0c93c15f0badb8b0bef0350d322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Nenz=C3=A9n?= Date: Thu, 9 Jun 2022 10:30:57 +0200 Subject: [PATCH 3/3] Remove function arguments --- .../BartyCrouchKit/FileHandling/StringsFileUpdater.swift | 6 +++--- .../BartyCrouchKit/OldCommandLine/CommandLineActor.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift b/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift index 2b61d11..1d7bc11 100644 --- a/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift +++ b/Sources/BartyCrouchKit/FileHandling/StringsFileUpdater.swift @@ -174,12 +174,12 @@ public class StringsFileUpdater { ) } - public func removeEmptyLines(separateWithEmptyLine: Bool, keepWhitespaceSurroundings: Bool = false) { + public func removeEmptyLines() { let translations = findTranslations(inString: oldContentString) rewriteFile( with: translations, - keepWhitespaceSurroundings: keepWhitespaceSurroundings, - separateWithEmptyLine: separateWithEmptyLine + keepWhitespaceSurroundings: false, + separateWithEmptyLine: false ) } diff --git a/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift b/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift index 15798f9..662d9fb 100644 --- a/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift +++ b/Sources/BartyCrouchKit/OldCommandLine/CommandLineActor.swift @@ -203,7 +203,7 @@ public class CommandLineActor { } else if !separateWithEmptyLine { for filePath in allStringsFilePaths { let stringsFileUpdater = StringsFileUpdater(path: filePath) - stringsFileUpdater?.removeEmptyLines(separateWithEmptyLine: separateWithEmptyLine) + stringsFileUpdater?.removeEmptyLines() } } }