From 0e0e66775e3a82c3767623aba251f98526fe94f4 Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 5 Jun 2020 12:34:49 +0300 Subject: [PATCH 1/4] Add new rule --- xcode/.swiftlint.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 3fc2c03..7a89f38 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -242,7 +242,13 @@ custom_rules: redundant_type_annotation_bool: name: "Redundant type annotation for Bool" regex: '((var|let)) *\w+ *((: *Bool *=)|((\w| |<|>|:)*= *BehaviorRelay\( *value *:)) *((true)|(false))' - message: "Using a type annotation for Bool is redundant" + message: "Using a type annotation for Bool is redundant." + severity: error + + parameter_repetition: + name: "Parameter repetition" + regex: 'func \w*(\w+)(<.+>)?\((?i)\1' + message: "The parameter name is actually used in the function name. Use _ instead." severity: error # Rx From f03660eb7992d294aa727bdd8a70f6c5b295ce4f Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 5 Jun 2020 12:38:47 +0300 Subject: [PATCH 2/4] Update rule --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 7a89f38..e97739b 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -247,7 +247,7 @@ custom_rules: parameter_repetition: name: "Parameter repetition" - regex: 'func \w*(\w+)(<.+>)?\((?i)\1' + regex: 'func \w*([A-Z]\w+) *(<.+>)? *\( *(?i)\1' message: "The parameter name is actually used in the function name. Use _ instead." severity: error From 08481ba0d33b71d7f14671a45de55f71269e8395 Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 5 Jun 2020 12:44:11 +0300 Subject: [PATCH 3/4] Update rule --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index e97739b..5ffd1da 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -247,7 +247,7 @@ custom_rules: parameter_repetition: name: "Parameter repetition" - regex: 'func \w*([A-Z]\w+) *(<.+>)? *\( *(?i)\1' + regex: 'func ((\w+[A-Z])?\w+) *(<.+>)? *\( *(?i)\1:' message: "The parameter name is actually used in the function name. Use _ instead." severity: error From a8c20aa760aef39c55a59740e335b72555a91a8e Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 5 Jun 2020 12:48:35 +0300 Subject: [PATCH 4/4] Update rule --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 5ffd1da..6acd37c 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -247,7 +247,7 @@ custom_rules: parameter_repetition: name: "Parameter repetition" - regex: 'func ((\w+[A-Z])?\w+) *(<.+>)? *\( *(?i)\1:' + regex: 'func ((\w+([A-Z]\w+))|(\w+)) *(<.+>)? *\( *(?i)(\3|\4):' message: "The parameter name is actually used in the function name. Use _ instead." severity: error