Merge pull request #817 from ydah/change/presence

Preserve multiline semantics on `Rails/Presence`
rubocop · Oct 20, 2022 · d7db4d1 · d7db4d1
2 parents e7f9546 + 43fa456
commit d7db4d1
Show file tree

Hide file tree

Showing 2 changed files with 287 additions and 104 deletions.
diff --git a/lib/rubocop/cop/rails/presence.rb b/lib/rubocop/cop/rails/presence.rb
@@ -106,7 +106,17 @@ def ignore_other_node?(node)
         end
 
         def message(node, receiver, other)
-          format(MSG, prefer: replacement(receiver, other), current: node.source)
+          prefer = replacement(receiver, other).gsub(/^\s*|\n/, '')
+          current = current(node).gsub(/^\s*|\n/, '')
+          format(MSG, prefer: prefer, current: current)
+        end
+
+        def current(node)
+          if node.source.include?("\n")
+            "#{node.loc.keyword.with(end_pos: node.condition.loc.selector.end_pos).source} ... end"
+          else
+            node.source
+          end
         end
 
         def replacement(receiver, other)