From 6986100357ba6b66ae85b08e0deac58ce75a6ad4 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 10:44:40 +0300 Subject: [PATCH 1/8] [Add] rule contentView in cell rule --- xcode/.swiftlint.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 5b743a1..e4491ca 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -233,6 +233,12 @@ custom_rules: message: "Too complex expression for single line closure. Improve readability by making it multiline." severity: error + addSubview_cell: + name: "AddSubview cell" + regex: '\s*class\s*\w+Cell:.*|\s*((self\.)|\s)addSubviews?\(' + message: "Using addSubview or addSubviews incorrect" + severity: error + # Rx unused_map_parameter: From d8fd6d4262b142d955fdf6a36d30c3fed133dd66 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 11:05:51 +0300 Subject: [PATCH 2/8] [Update] regexp --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index e4491ca..7d61f29 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -235,7 +235,7 @@ custom_rules: addSubview_cell: name: "AddSubview cell" - regex: '\s*class\s*\w+Cell:.*|\s*((self\.)|\s)addSubviews?\(' + regex: '\s*class\s*\w+Cell:[\s\S]*func [\s\S]+(self\.|\s)add(Subv|V)iew(s)?\(' message: "Using addSubview or addSubviews incorrect" severity: error From b99d405e87bbfb4e9bcab82c9169b5c80f30e7cf Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 11:11:41 +0300 Subject: [PATCH 3/8] [Update] regexp --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 7d61f29..af688ba 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -235,7 +235,7 @@ custom_rules: addSubview_cell: name: "AddSubview cell" - regex: '\s*class\s*\w+Cell:[\s\S]*func [\s\S]+(self\.|\s)add(Subv|V)iew(s)?\(' + regex: '\s*class\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(' message: "Using addSubview or addSubviews incorrect" severity: error From a719bb555880b2b6ce175473f9112bd67dba98a6 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 11:15:11 +0300 Subject: [PATCH 4/8] [Update] regexp --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index af688ba..519b7e0 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -235,7 +235,7 @@ custom_rules: addSubview_cell: name: "AddSubview cell" - regex: '\s*class\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(' + regex: '\s*class\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' message: "Using addSubview or addSubviews incorrect" severity: error From 02f6f184a70d2e4275dc66b8a387230f1a6504ae Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 11:28:23 +0300 Subject: [PATCH 5/8] [Update] regexp --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 519b7e0..1d904db 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -235,7 +235,7 @@ custom_rules: addSubview_cell: name: "AddSubview cell" - regex: '\s*class\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' + regex: '\s*(extension|class)\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' message: "Using addSubview or addSubviews incorrect" severity: error From 1181278091ff0a81a17138d7579e31a3ca11c5e4 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 11:37:02 +0300 Subject: [PATCH 6/8] [Update] regexp --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 1d904db..edc9048 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -235,7 +235,7 @@ custom_rules: addSubview_cell: name: "AddSubview cell" - regex: '\s*(extension|class)\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' + regex: '(extension|class)\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' message: "Using addSubview or addSubviews incorrect" severity: error From 14cce365b87296c7d5d26ef36deda5dc94ff296c Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 11:49:23 +0300 Subject: [PATCH 7/8] [Update] info --- xcode/.swiftlint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index edc9048..a4c1c83 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -233,10 +233,10 @@ custom_rules: message: "Too complex expression for single line closure. Improve readability by making it multiline." severity: error - addSubview_cell: - name: "AddSubview cell" - regex: '(extension|class)\s*\w+Cell:(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' - message: "Using addSubview or addSubviews incorrect" + addSubview_in_cell: + name: "Usage addSubview in cell" + regex: '(extension|class)\s*\w+Cell(:| )(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' + message: "Use сontentView instead of self for addSubview or addSubviews methods." severity: error # Rx From 917ff13a0a2f70afad06e0bb620966425b03a2b9 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 21 May 2020 11:51:43 +0300 Subject: [PATCH 8/8] [Update] info --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index a4c1c83..4bbc84c 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -236,7 +236,7 @@ custom_rules: addSubview_in_cell: name: "Usage addSubview in cell" regex: '(extension|class)\s*\w+Cell(:| )(?s).*(self\.|\s{2,})add(Subv|V)iews?\(\w' - message: "Use сontentView instead of self for addSubview or addSubviews methods." + message: "Use сontentView instead of self for addSubview or addSubviews methods in cell." severity: error # Rx