From dbd02e2e1a6a6b47fb2a52a6aae5af27e0ebb5d1 Mon Sep 17 00:00:00 2001 From: andre francois Date: Wed, 9 Jan 2019 11:08:20 -0500 Subject: [PATCH 1/5] Fix for new_cop rake task --- lib/rubocop/cop/generator/configuration_injector.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/rubocop/cop/generator/configuration_injector.rb b/lib/rubocop/cop/generator/configuration_injector.rb index a83d1256d24..e148ba83cc1 100644 --- a/lib/rubocop/cop/generator/configuration_injector.rb +++ b/lib/rubocop/cop/generator/configuration_injector.rb @@ -44,11 +44,13 @@ def new_configuration_entry end def find_target_line + last_line = 0 configuration_entries.find.with_index do |line, index| next if comment?(line) - + last_line = index break index if badge.to_s < line end + last_line end def comment?(yaml) From c151a1367bb16dca8e488190159311a14fabb7cc Mon Sep 17 00:00:00 2001 From: andre francois Date: Wed, 16 Jan 2019 12:55:40 -0500 Subject: [PATCH 2/5] Update configuration_injector.rb --- lib/rubocop/cop/generator/configuration_injector.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/rubocop/cop/generator/configuration_injector.rb b/lib/rubocop/cop/generator/configuration_injector.rb index e148ba83cc1..64bbb3814ba 100644 --- a/lib/rubocop/cop/generator/configuration_injector.rb +++ b/lib/rubocop/cop/generator/configuration_injector.rb @@ -47,10 +47,9 @@ def find_target_line last_line = 0 configuration_entries.find.with_index do |line, index| next if comment?(line) - last_line = index break index if badge.to_s < line end - last_line + configuration_entries.size - 1 end def comment?(yaml) From 5788157b6c854877f99efa4857a62b8bb71f3341 Mon Sep 17 00:00:00 2001 From: andre francois Date: Wed, 16 Jan 2019 12:56:10 -0500 Subject: [PATCH 3/5] Update configuration_injector.rb --- lib/rubocop/cop/generator/configuration_injector.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/rubocop/cop/generator/configuration_injector.rb b/lib/rubocop/cop/generator/configuration_injector.rb index 64bbb3814ba..733d044f2a1 100644 --- a/lib/rubocop/cop/generator/configuration_injector.rb +++ b/lib/rubocop/cop/generator/configuration_injector.rb @@ -44,7 +44,6 @@ def new_configuration_entry end def find_target_line - last_line = 0 configuration_entries.find.with_index do |line, index| next if comment?(line) break index if badge.to_s < line From 2f80dc826b0635eef9b23722101f21e6838c93ab Mon Sep 17 00:00:00 2001 From: andre francois Date: Wed, 16 Jan 2019 12:56:59 -0500 Subject: [PATCH 4/5] Update configuration_injector.rb --- lib/rubocop/cop/generator/configuration_injector.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/rubocop/cop/generator/configuration_injector.rb b/lib/rubocop/cop/generator/configuration_injector.rb index 733d044f2a1..6272b2dfc09 100644 --- a/lib/rubocop/cop/generator/configuration_injector.rb +++ b/lib/rubocop/cop/generator/configuration_injector.rb @@ -46,6 +46,7 @@ def new_configuration_entry def find_target_line configuration_entries.find.with_index do |line, index| next if comment?(line) + break index if badge.to_s < line end configuration_entries.size - 1 From 494f11f0d0f59c91a8f692d10faaa8029b526b3a Mon Sep 17 00:00:00 2001 From: andre francois Date: Mon, 21 Jan 2019 16:47:50 -0500 Subject: [PATCH 5/5] Update based on PR review --- lib/rubocop/cop/generator/configuration_injector.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rubocop/cop/generator/configuration_injector.rb b/lib/rubocop/cop/generator/configuration_injector.rb index 6272b2dfc09..0b9ee253c19 100644 --- a/lib/rubocop/cop/generator/configuration_injector.rb +++ b/lib/rubocop/cop/generator/configuration_injector.rb @@ -47,7 +47,7 @@ def find_target_line configuration_entries.find.with_index do |line, index| next if comment?(line) - break index if badge.to_s < line + return index if badge.to_s < line end configuration_entries.size - 1 end