From 6b91a81f0cfe048f1cc24030c9d75caa3c3258ec Mon Sep 17 00:00:00 2001 From: goose Date: Thu, 11 Apr 2024 15:31:45 +0700 Subject: [PATCH] [#499] Ignore custom rubocop code while running Rubocop on generated projects --- .rubocop.yml | 1 + rubocop/custom_cops/class_template.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 266ab331..0d46853e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -17,6 +17,7 @@ AllCops: - 'node_modules/**/*' - 'config/**/*' - 'tmp/**/*' + - 'rubocop/**/*' TargetRubyVersion: 3 NewCops: enable diff --git a/rubocop/custom_cops/class_template.rb b/rubocop/custom_cops/class_template.rb index d73c7b38..a7b4345b 100644 --- a/rubocop/custom_cops/class_template.rb +++ b/rubocop/custom_cops/class_template.rb @@ -88,13 +88,17 @@ def error_message(out_of_order_expression, expressions) # rubocop:enable Metrics/MethodLength def before_first_expression(current_expression, out_of_order_expression) - return unless EXPRESSION_TYPE_ORDER[out_of_order_expression] < EXPRESSION_TYPE_ORDER[current_expression[:category]] + unless EXPRESSION_TYPE_ORDER[out_of_order_expression] < EXPRESSION_TYPE_ORDER[current_expression[:category]] + return + end "#{out_of_order_expression} should come before `#{current_expression[:expression].source}`." end def after_last_expression(current_expression, out_of_order_expression) - return unless EXPRESSION_TYPE_ORDER[out_of_order_expression] > EXPRESSION_TYPE_ORDER[current_expression[:category]] + unless EXPRESSION_TYPE_ORDER[out_of_order_expression] > EXPRESSION_TYPE_ORDER[current_expression[:category]] + return + end "#{out_of_order_expression} should come after `#{current_expression[:expression].source}`." end