From b2460f0683960aba7d99e5187eaa6485f2551638 Mon Sep 17 00:00:00 2001
From: Maxim Sorokin <maxim.sorokin@touchin.ru>
Date: Wed, 8 Apr 2020 17:30:01 +0300
Subject: [PATCH 1/7] added new swiftlint rules

---
 xcode/.swiftlint.yml | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index 0cddb78..5063fa5 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -222,4 +222,46 @@ custom_rules:
     regex: '(^\s*\w*\.?)(addSubview)\([\w]+\)\n\1\2'
     message: "Replace multiple addSubview calls with single addSubviews."
     severity: warning
+    
+  getter_setter_style:
+    name: "Wrong getter/setter code style"
+    regex: "(get|set|willSet|didSet) \\{ [.]*"
+    match_kinds:
+    - keyword
+    message: "Make a new line break when use getter or setter"
+    severity: error
 
+  boolean_redundant_condition:
+    name: "Redundant Boolean Condition"
+    regex: "(== true)|(== false)|(!= true)|(!= false)"
+    message: "Comparing a boolean to true is redundant (use `?? false` for optionals), and `!`-syntax is preferred over comparing to false."
+    severity: error
+
+  final_class:
+    name: "Final Class"
+    regex: "(?<!final )class (?!(\\{|private|func|var))"
+    message: "Classes without subclasses should be marked as `final`."
+    match_kinds:
+    - identifier
+    - keyword
+    - typeidentifier
+    severity: error
+
+  closing_brace_vertical_spacing:
+    name: "Closing Brace Vertical Spacing"
+    regex: "\\n{2,}\\}"
+    message: "Closing braces should not be followed by a new line before another closing brace."
+    severity: error
+    
+  # Custom rule violating when type inference is not used.
+  # Violating:
+  #   let view: UIView = UIView()
+  #   view.backgroundColor = UIColor.red()
+  # Non-violating:
+  #   let view = UIView()
+  #   view.backgroundColor = .red
+  type_inferred_context:
+    name: "type_inferred_context"
+    regex: "(\\:\\s(\\w+)\\s\\=\\s\\1|UIViewAutoResizing\\.|(?!AttributedStringKey.\\.\\*)UIFont\\.|UIControlState\\.|UIColor.\\.\\*(?!.cgColor)|CGPoint\\.|CGRect\\.)"
+    message: "Type inferred context is preferred over explicit types."
+    severity: warning

From b159715f6a620a94c3e8bc394178d0e08ecd7d1c Mon Sep 17 00:00:00 2001
From: Maxim Sorokin <maxim.sorokin@touchin.ru>
Date: Wed, 8 Apr 2020 17:59:17 +0300
Subject: [PATCH 2/7] added new swiftlint rules

---
 xcode/.swiftlint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index 5063fa5..1e67a30 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -239,7 +239,7 @@ custom_rules:
 
   final_class:
     name: "Final Class"
-    regex: "(?<!final )class (?!(\\{|private|func|var))"
+    regex: "(?<!final )class Base (?!(\\{|private|func|var))"
     message: "Classes without subclasses should be marked as `final`."
     match_kinds:
     - identifier

From e42fd8f2577b35d144440d2b841464c6a966b9d4 Mon Sep 17 00:00:00 2001
From: Maxim Sorokin <maxim.sorokin@touchin.ru>
Date: Wed, 8 Apr 2020 19:56:42 +0300
Subject: [PATCH 3/7] added new swiftlint rules

---
 xcode/.swiftlint.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index 1e67a30..03d9b04 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -237,31 +237,8 @@ custom_rules:
     message: "Comparing a boolean to true is redundant (use `?? false` for optionals), and `!`-syntax is preferred over comparing to false."
     severity: error
 
-  final_class:
-    name: "Final Class"
-    regex: "(?<!final )class Base (?!(\\{|private|func|var))"
-    message: "Classes without subclasses should be marked as `final`."
-    match_kinds:
-    - identifier
-    - keyword
-    - typeidentifier
-    severity: error
-
   closing_brace_vertical_spacing:
     name: "Closing Brace Vertical Spacing"
     regex: "\\n{2,}\\}"
     message: "Closing braces should not be followed by a new line before another closing brace."
     severity: error
-    
-  # Custom rule violating when type inference is not used.
-  # Violating:
-  #   let view: UIView = UIView()
-  #   view.backgroundColor = UIColor.red()
-  # Non-violating:
-  #   let view = UIView()
-  #   view.backgroundColor = .red
-  type_inferred_context:
-    name: "type_inferred_context"
-    regex: "(\\:\\s(\\w+)\\s\\=\\s\\1|UIViewAutoResizing\\.|(?!AttributedStringKey.\\.\\*)UIFont\\.|UIControlState\\.|UIColor.\\.\\*(?!.cgColor)|CGPoint\\.|CGRect\\.)"
-    message: "Type inferred context is preferred over explicit types."
-    severity: warning

From 882759b6fa523e2eb0a375554037c3a954b6cb1d Mon Sep 17 00:00:00 2001
From: Maxim Sorokin <maxim.sorokin@touchin.ru>
Date: Wed, 8 Apr 2020 20:40:46 +0300
Subject: [PATCH 4/7] added new swiftlint rules

---
 xcode/.swiftlint.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index 03d9b04..c61442e 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -236,9 +236,3 @@ custom_rules:
     regex: "(== true)|(== false)|(!= true)|(!= false)"
     message: "Comparing a boolean to true is redundant (use `?? false` for optionals), and `!`-syntax is preferred over comparing to false."
     severity: error
-
-  closing_brace_vertical_spacing:
-    name: "Closing Brace Vertical Spacing"
-    regex: "\\n{2,}\\}"
-    message: "Closing braces should not be followed by a new line before another closing brace."
-    severity: error

From 9dee92ef6fe8a2a8b458b85457a74e1deeda0b70 Mon Sep 17 00:00:00 2001
From: Maxim Sorokin <maxim.sorokin@touchin.ru>
Date: Fri, 10 Apr 2020 13:34:40 +0300
Subject: [PATCH 5/7] added new swiftlint rules

---
 xcode/.swiftlint.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index c61442e..799ada0 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -207,6 +207,20 @@ custom_rules:
       - string_interpolation_anchor
       - typeidentifier
 
+  getter_setter_style:
+    name: "Wrong getter/setter code style"
+    regex: "(get|set|willSet|didSet) \\{ [.]*"
+    match_kinds:
+    - keyword
+    message: "Make a new line break when use getter or setter"
+    severity: error
+
+  boolean_redundant_condition:
+    name: "Redundant Boolean Condition"
+    regex: "(== true)|(== false)|(!= true)|(!= false)||(\\? true \\: false)|(\\? false \\: true)"
+    message: "Comparing a boolean to true is redundant (use `?? false` for optionals), and `!`-syntax is preferred over comparing to false."
+    severity: error
+
   # Rx
 
   unused_map_parameter:
@@ -222,17 +236,3 @@ custom_rules:
     regex: '(^\s*\w*\.?)(addSubview)\([\w]+\)\n\1\2'
     message: "Replace multiple addSubview calls with single addSubviews."
     severity: warning
-    
-  getter_setter_style:
-    name: "Wrong getter/setter code style"
-    regex: "(get|set|willSet|didSet) \\{ [.]*"
-    match_kinds:
-    - keyword
-    message: "Make a new line break when use getter or setter"
-    severity: error
-
-  boolean_redundant_condition:
-    name: "Redundant Boolean Condition"
-    regex: "(== true)|(== false)|(!= true)|(!= false)"
-    message: "Comparing a boolean to true is redundant (use `?? false` for optionals), and `!`-syntax is preferred over comparing to false."
-    severity: error

From 9b759003ff296f7c892a6bd64d62d00f262c3a33 Mon Sep 17 00:00:00 2001
From: Maxim Sorokin <maxim.sorokin@touchin.ru>
Date: Fri, 10 Apr 2020 13:45:26 +0300
Subject: [PATCH 6/7] added new swiftlint rules

---
 xcode/.swiftlint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index 799ada0..570d8ea 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -217,7 +217,7 @@ custom_rules:
 
   boolean_redundant_condition:
     name: "Redundant Boolean Condition"
-    regex: "(== true)|(== false)|(!= true)|(!= false)||(\\? true \\: false)|(\\? false \\: true)"
+    regex: "(== true)|(== false)|(!= true)|(!= false)|(\\? true \\: false)|(\\? false \\: true)"
     message: "Comparing a boolean to true is redundant (use `?? false` for optionals), and `!`-syntax is preferred over comparing to false."
     severity: error
 

From 23789510b3b2dfdc815026259eba249ba806e7a1 Mon Sep 17 00:00:00 2001
From: Maxim Sorokin <maxim.sorokin@touchin.ru>
Date: Sun, 12 Apr 2020 13:54:01 +0300
Subject: [PATCH 7/7] added new swiftlint rules

---
 xcode/.swiftlint.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index 570d8ea..e7dd90c 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -215,12 +215,18 @@ custom_rules:
     message: "Make a new line break when use getter or setter"
     severity: error
 
-  boolean_redundant_condition:
+  redundant_boolean_condition:
     name: "Redundant Boolean Condition"
-    regex: "(== true)|(== false)|(!= true)|(!= false)|(\\? true \\: false)|(\\? false \\: true)"
+    regex: "(== true)|(== false)|(!= true)|(!= false)"
     message: "Comparing a boolean to true is redundant (use `?? false` for optionals), and `!`-syntax is preferred over comparing to false."
     severity: error
 
+  redundant_ternary_operator:
+    name: "Redundant Ternary Operator"
+    regex: "(\\? true \\: false)|(\\? false \\: true)"
+    message: "Returning a boolean as true is redundant, and `!`-syntax is preferred over returning as false."
+    severity: error
+
   # Rx
 
   unused_map_parameter: