Merge pull request #422 from mostazomarc/421-fix-trailing-comma

#421 fix trailing comma

.swiftlint.yml

@@ -11,7 +11,6 @@ disabled_rules:
   - file_length
   - type_body_length
   # WARNINGS IN PROJECT CURRENTLY
-  - trailing_comma
   - todo
   - orphaned_doc_comment
   - opening_brace

Keyboards/KeyboardsBase/InterfaceVariables.swift

@@ -29,7 +29,7 @@ var keyboard = [[String]]()
 var usingExpandedKeyboard = false
 var allKeys = [String]()
 let specialKeys = [
-  SpecialKeys.indent, SpecialKeys.capsLock, "shift", "delete", "ABC", "АБВ", "123", "#+=", "selectKeyboard", "space", "return", ".?123", "hideKeyboard",
+  SpecialKeys.indent, SpecialKeys.capsLock, "shift", "delete", "ABC", "АБВ", "123", "#+=", "selectKeyboard", "space", "return", ".?123", "hideKeyboard"
 ]
 var allNonSpecialKeys = [String]()
 var keyboardHeight: CGFloat!
@@ -169,7 +169,7 @@ let languagesAbbrDict = [
   "Portuguese": "pt",
   "Russian": "ru",
   "Spanish": "es",
-  "Swedish": "sv",
+  "Swedish": "sv"
 ]
 
 /// Returns the abbreviation of the language for use in commands.
@@ -189,7 +189,7 @@ let keyboardLayoutDict: [String: () -> Void] = [
   "Portuguese": setPTKeyboardLayout,
   "Russian": setRUKeyboardLayout,
   "Spanish": setESKeyboardLayout,
-  "Swedish": setSVKeyboardLayout,
+  "Swedish": setSVKeyboardLayout
 ]
 
 /// Sets the keyboard layout and its alternate keys.

Keyboards/KeyboardsBase/KeyAltChars.swift

@@ -55,7 +55,7 @@ func setKeyboardAlternateKeys() {
     "'": apostropheAlternateKeys,
     "\"": quotationAlternateKeys,
     "=": equalSignAlternateKeys,
-    currencySymbol: currencySymbolAlternates,
+    currencySymbol: currencySymbolAlternates
   ]
 }
 

Keyboards/KeyboardsBase/KeyboardStyling.swift

@@ -56,7 +56,7 @@ var keysThatAreSlightlyLarger = [
   "capslock",
   "capslock.fill",
   "arrow.forward.to.line",
-  "arrowtriangle.right.fill",
+  "arrowtriangle.right.fill"
 ]
 
 /// Get the icon configurations for keys if the device is an iPhone.

Keyboards/KeyboardsBase/KeyboardViewController.swift

@@ -977,7 +977,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all buttons for the 3x2 conjugation display.
   func get3x2FormDisplayButtons() -> [UIButton] {
     let conjugationButtons: [UIButton] = [
-      formKeyFPS, formKeySPS, formKeyTPS, formKeyFPP, formKeySPP, formKeyTPP,
+      formKeyFPS, formKeySPS, formKeyTPS, formKeyFPP, formKeySPP, formKeyTPP
     ]
 
     return conjugationButtons
@@ -995,7 +995,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all labels for the 3x2 conjugation display.
   func get3x2FormDisplayLabels() -> [UIButton] {
     let conjugationLabels: [UIButton] = [
-      formLblFPS, formLblSPS, formLblTPS, formLblFPP, formLblSPP, formLblTPP,
+      formLblFPS, formLblSPS, formLblTPS, formLblFPP, formLblSPP, formLblTPP
     ]
 
     return conjugationLabels
@@ -1032,7 +1032,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all buttons for the 3x1 conjugation display
   func get3x1FormDisplayButtons() -> [UIButton] {
     let conjugationButtons: [UIButton] = [
-      formKeyTop, formKeyMiddle, formKeyBottom,
+      formKeyTop, formKeyMiddle, formKeyBottom
     ]
 
     return conjugationButtons
@@ -1045,7 +1045,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all labels for the 3x1 conjugation display.
   func get3x1FormDisplayLabels() -> [UIButton] {
     let conjugationLabels: [UIButton] = [
-      formLblTop, formLblMiddle, formLblBottom,
+      formLblTop, formLblMiddle, formLblBottom
     ]
 
     return conjugationLabels
@@ -1080,7 +1080,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all buttons for the 2x2 conjugation display
   func get2x2FormDisplayButtons() -> [UIButton] {
     let conjugationButtons: [UIButton] = [
-      formKeyTL, formKeyTR, formKeyBL, formKeyBR,
+      formKeyTL, formKeyTR, formKeyBL, formKeyBR
     ]
 
     return conjugationButtons
@@ -1094,7 +1094,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all labels for the 2x2 conjugation display.
   func get2x2FormDisplayLabels() -> [UIButton] {
     let conjugationLabels: [UIButton] = [
-      formLblTL, formLblTR, formLblBL, formLblBR,
+      formLblTL, formLblTR, formLblBL, formLblBR
     ]
 
     return conjugationLabels
@@ -1129,7 +1129,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all buttons for the 1x2 conjugation display
   func get1x2FormDisplayButtons() -> [UIButton] {
     let conjugationButtons: [UIButton] = [
-      formKeyLeft, formKeyRight,
+      formKeyLeft, formKeyRight
     ]
 
     return conjugationButtons
@@ -1141,7 +1141,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all labels for the 1x2 conjugation display.
   func get1x2FormDisplayLabels() -> [UIButton] {
     let conjugationLabels: [UIButton] = [
-      formLblLeft, formLblRight,
+      formLblLeft, formLblRight
     ]
 
     return conjugationLabels
@@ -1172,7 +1172,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all buttons for the 1x1 conjugation display
   func get1x1FormDisplayButtons() -> [UIButton] {
     let conjugationButtons: [UIButton] = [
-      formKeySingle,
+      formKeySingle
     ]
 
     return conjugationButtons
@@ -1183,7 +1183,7 @@ class KeyboardViewController: UIInputViewController {
   /// Returns all labels for the 1x1 conjugation display.
   func get1x1FormDisplayLabels() -> [UIButton] {
     let conjugationLabels: [UIButton] = [
-      formLblSingle,
+      formLblSingle
     ]
 
     return conjugationLabels
@@ -1253,7 +1253,7 @@ class KeyboardViewController: UIInputViewController {
       && [
         .accusativeDefinite, .accusativeIndefinite, .accusativeDemonstrative,
         .dativeDefinite, .dativeIndefinite, .dativeDemonstrative,
-        .genitiveDefinite, .genitiveIndefinite, .genitiveDemonstrative,
+        .genitiveDefinite, .genitiveIndefinite, .genitiveDemonstrative
       ].contains(deCaseDeclensionState)
     {
       formsDisplayDimensions = .view2x2

Keyboards/KeyboardsBase/ScribeFunctionality/Annotate.swift

@@ -30,19 +30,19 @@ var nounFormToColorDict = [
   "Ж": annotateRed,
   "М": annotateBlue,
   "Н": annotateGreen,
-  "МН": annotateOrange,
+  "МН": annotateOrange
 ]
 
 // Dictionary to convert noun annotations into the keyboard language.
 let nounAnnotationConversionDict = [
   "Swedish": ["C": "U"],
-  "Russian": ["F": "Ж", "M": "М", "N": "Н", "PL": "МН"],
+  "Russian": ["F": "Ж", "M": "М", "N": "Н", "PL": "МН"]
 ]
 
 // Dictionary to convert case annotations into the keyboard language.
 let prepAnnotationConversionDict = [
   "German": ["Acc": "Akk"],
-  "Russian": ["Acc": "Вин", "Dat": "Дат", "Gen": "Род", "Loc": "Мес", "Pre": "Пре", "Ins": "Инс"],
+  "Russian": ["Acc": "Вин", "Dat": "Дат", "Gen": "Род", "Loc": "Мес", "Pre": "Пре", "Ins": "Инс"]
 ]
 
 /// The base function for annotation that's accessed by `selectedWordAnnotation` and `typedWordAnnotation`.

Keyboards/KeyboardsBase/ScribeFunctionality/CommandBar.swift

@@ -96,7 +96,7 @@ class CommandBar: UILabel {
       infoButton.heightAnchor.constraint(equalTo: heightAnchor),
       infoButton.widthAnchor.constraint(equalTo: heightAnchor),
       infoButton.centerYAnchor.constraint(equalTo: centerYAnchor),
-      infoButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8),
+      infoButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8)
     ])
   }
 

Keyboards/KeyboardsBase/ScribeFunctionality/CommandVariables.swift

@@ -163,7 +163,7 @@ var formLabelsDict = [
   "BR": "",
   "Left": "",
   "Right": "",
-  "Single": "",
+  "Single": ""
 ]
 
 var verbToConjugate = ""

Keyboards/KeyboardsBase/ScribeFunctionality/Conjugate.swift

@@ -27,7 +27,7 @@ let keyboardConjTitleDict: [String: Any] = [
   "Portuguese": ptGetConjugationTitle,
   "Russian": ruGetConjugationTitle,
   "Spanish": esGetConjugationTitle,
-  "Swedish": svGetConjugationTitle,
+  "Swedish": svGetConjugationTitle
 ]
 
 // Dictionary for accessing keyboard conjugation state.
@@ -38,7 +38,7 @@ let keyboardConjStateDict: [String: Any] = [
   "Portuguese": ptGetConjugationState,
   "Russian": ruGetConjugationState,
   "Spanish": esGetConjugationState,
-  "Swedish": svGetConjugationState,
+  "Swedish": svGetConjugationState
 ]
 
 // Dictionary for accessing keyboard conjugation state.
@@ -49,7 +49,7 @@ let keyboardConjLabelDict: [String: Any] = [
   "Portuguese": ptSetConjugationLabels,
   "Russian": ruSetConjugationLabels,
   "Spanish": esSetConjugationLabels,
-  "Swedish": svSetConjugationLabels,
+  "Swedish": svSetConjugationLabels
 ]
 
 /// Returns a declension once a user presses a key in the conjugateView.

Keyboards/KeyboardsBase/ScribeFunctionality/ScribeKey.swift

@@ -78,7 +78,7 @@ class ScribeKey: UIButton {
   func setFullCornerRadius() {
     layer.borderColor = UIColor.clear.cgColor // border is set by the shadow
     layer.maskedCorners = [
-      .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner,
+      .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner
     ]
   }
 
@@ -102,7 +102,7 @@ class ScribeKey: UIButton {
     shadow.backgroundColor = specialKeyColor
     shadow.layer.cornerRadius = commandKeyCornerRadius
     shadow.layer.maskedCorners = [
-      .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner,
+      .layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner
     ]
     shadow.clipsToBounds = true
     shadow.layer.masksToBounds = false

Keyboards/KeyboardsBase/ToolTip/Model/InformationToolTipData.swift

@@ -26,7 +26,7 @@ enum InformationToolTipData {
     attributes: [
       NSAttributedString.Key.font: UIFont.systemFont(
         ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.5
-      ),
+      )
     ]
   )
 
@@ -35,7 +35,7 @@ enum InformationToolTipData {
     attributes: [
       NSAttributedString.Key.font: UIFont.systemFont(
         ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.5
-      ),
+      )
     ]
   )
 
@@ -44,15 +44,15 @@ enum InformationToolTipData {
     attributes: [
       NSAttributedString.Key.font: UIFont.systemFont(
         ofSize: DeviceType.isPhone ? letterKeyWidth / 2 : letterKeyWidth / 2.75
-      ),
+      )
     ]
   )
 
   static func getContent() -> [NSMutableAttributedString] {
     [
       InformationToolTipData.wikiDataExplanation,
       InformationToolTipData.wikiDataContationOrigin,
-      InformationToolTipData.howToContribute,
+      InformationToolTipData.howToContribute
     ]
   }
 }

Keyboards/LanguageKeyboards/Danish/DAInterfaceVariables.swift

@@ -25,21 +25,21 @@ public enum DanishKeyboardConstants {
     ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å"],
     ["a", "s", "d", "f", "g", "h", "j", "k", "l", "æ", "ø"],
     ["shift", "z", "x", "c", "v", "b", "n", "m", "delete"],
-    ["123", "selectKeyboard", "space", "return"], // "undo"
+    ["123", "selectKeyboard", "space", "return"] // "undo"
   ]
 
   static let numberKeysPhone = [
     ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"],
     ["-", "/", ":", ";", "(", ")", "€", "&", "@", "\""],
     ["#+=", ".", ",", "?", "!", "'", "delete"],
-    ["ABC", "selectKeyboard", "space", "return"], // "undo"
+    ["ABC", "selectKeyboard", "space", "return"] // "undo"
   ]
 
   static let symbolKeysPhone = [
     ["[", "]", "{", "}", "#", "%", "^", "*", "+", "="],
     ["_", "\\", "|", "~", "<", ">", "€", "£", "¥", "·"],
     ["123", ".", ",", "?", "!", "'", "delete"],
-    ["ABC", "selectKeyboard", "space", "return"], // "undo"
+    ["ABC", "selectKeyboard", "space", "return"] // "undo"
   ]
 
   // iPad keyboard layouts.
@@ -48,21 +48,21 @@ public enum DanishKeyboardConstants {
     ["q", "w", "e", "r", "t", "y", "u", "i", "o", "æ", "ø", "delete"],
     ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "return"],
     ["shift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"],
-    ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "undo"
+    ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "undo"
   ]
 
   static let numberKeysPad = [
     ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "`", "delete"],
     ["@", "#", "kr", "&", "*", "(", ")", "'", "\"", "+", "·", "return"],
     ["#+=", "%", "_", "-", "=", "/", ";", ":", ",", ".", "?", "#+="],
-    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo"
+    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo"
   ]
 
   static let symbolKeysPad = [
     ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "'", "delete"],
     ["€", "$", "£", "^", "[", "]", "{", "}", "―", "ᵒ", "...", "return"],
     ["123", "§", "|", "~", "≠", "≈", "\\", "<", ">", "!", "?", "123"],
-    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "undo"
+    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "undo"
   ]
 
   // Expanded iPad keyboard layouts for wider devices.
@@ -71,15 +71,15 @@ public enum DanishKeyboardConstants {
     [SpecialKeys.indent, "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "å", "@", "¨"],
     [SpecialKeys.capsLock, "a", "s", "d", "f", "g", "h", "j", "k", "l", "æ", "ø", "'", "return"],
     ["shift", "*", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "shift"],
-    ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"], // "microphone", "scribble"
+    ["selectKeyboard", ".?123", "space", ".?123", "hideKeyboard"] // "microphone", "scribble"
   ]
 
   static let symbolKeysPadExpanded = [
     ["`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "<", ">", "delete"],
     [SpecialKeys.indent, "[", "]", "{", "}", "#", "%", "^", "*", "+", "=", "\"", "|", "—"],
     [SpecialKeys.capsLock, "°", "/", ":", ";", "(", ")", "$", "&", "@", "£", "¥", "~", "return"], // "undo"
     ["shift", "…", "?", "!", "≠", "'", "\"", "_", "€", ",", ".", "-", "shift"], // "redo"
-    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"], // "microphone", "scribble"
+    ["selectKeyboard", "ABC", "space", "ABC", "hideKeyboard"] // "microphone", "scribble"
   ]
 
   // Alternate key vars.