[#499] Ignore custom rubocop code while running Rubocop on generated …

…projects
nimblehq · Apr 11, 2024 · 6b91a81 · 6b91a81
1 parent b80b449
commit 6b91a81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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