lib/rubocop/cop/layout/class_structure.rb in rubocop-1.12.1 vs lib/rubocop/cop/layout/class_structure.rb in rubocop-1.13.0

- old
+ new

@@ -142,12 +142,11 @@ defs: :class_methods, def: :public_methods, sclass: :class_singleton }.freeze - MSG = '`%<category>s` is supposed to appear before ' \ - '`%<previous>s`.' + MSG = '`%<category>s` is supposed to appear before `%<previous>s`.' # @!method dynamic_constant?(node) def_node_matcher :dynamic_constant?, <<~PATTERN (casgn nil? _ (send ...)) PATTERN @@ -157,15 +156,12 @@ def on_class(class_node) previous = -1 walk_over_nested_class_definition(class_node) do |node, category| index = expected_order.index(category) if index < previous - message = format(MSG, category: category, - previous: expected_order[previous]) - add_offense(node, message: message) do |corrector| - autocorrect(corrector, node) - end + message = format(MSG, category: category, previous: expected_order[previous]) + add_offense(node, message: message) { |corrector| autocorrect(corrector, node) } end previous = index end end @@ -252,12 +248,10 @@ def ignore_for_autocorrect?(node, sibling) classification = classify(node) sibling_class = classify(sibling) - ignore?(sibling_class) || - classification == sibling_class || - dynamic_constant?(node) + ignore?(sibling_class) || classification == sibling_class || dynamic_constant?(node) end def humanize_node(node) if node.def_type? return :initializer if node.method?(:initialize)