Merge pull request rails#53523 from fatkodima/enable-KeywordArgumentsMerging-cop

Enable `Style/KeywordArgumentsMerging` rubocop cop

Author: kamipo

.rubocop.yml

@@ -328,6 +328,9 @@ Style/OpenStructUse:
 Style/ArrayIntersect:
   Enabled: true
 
+Style/KeywordArgumentsMerging:
+  Enabled: true
+
 Performance/BindCall:
   Enabled: true
 

Gemfile.lock

@@ -321,7 +321,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.7.2)
+    json (2.7.5)
     jwt (2.9.3)
       base64
     kamal (2.2.2)
@@ -418,7 +418,7 @@ GEM
     os (1.1.4)
     ostruct (0.6.0)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
     path_expander (1.1.3)
@@ -494,7 +494,7 @@ GEM
     retriable (3.1.2)
     rexml (3.3.8)
     rouge (4.4.0)
-    rubocop (1.67.0)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -504,7 +504,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.33.1)
       parser (>= 3.3.1.0)
     rubocop-md (1.2.4)
       rubocop (>= 1.45)

actionmailer/lib/action_mailer/base.rb

@@ -935,7 +935,7 @@ def set_content_type(m, user_content_type, class_default) # :doc:
       # If the subject has interpolations, you can pass them through the +interpolations+ parameter.
       def default_i18n_subject(interpolations = {}) # :doc:
         mailer_scope = self.class.mailer_name.tr("/", ".")
-        I18n.t(:subject, **interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
+        I18n.t(:subject, **interpolations, scope: [mailer_scope, action_name], default: action_name.humanize)
       end
 
       # Emails do not support relative path links.

activemodel/lib/active_model/error.rb

@@ -83,7 +83,7 @@ def self.generate_message(attribute, type, base, options) # :nodoc:
         defaults << :"#{i18n_scope}.errors.messages.#{type}"
 
         catch(:exception) do
-          translation = I18n.translate(defaults.first, **options.merge(default: defaults.drop(1), throw: true))
+          translation = I18n.translate(defaults.first, **options, default: defaults.drop(1), throw: true)
           return translation unless translation.nil?
         end unless options[:message]
       else

activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -302,7 +302,7 @@ module ColumnMethods
       # Appends a primary key definition to the table definition.
       # Can be called multiple times, but this is probably not a good idea.
       def primary_key(name, type = :primary_key, **options)
-        column(name, type, **options.merge(primary_key: true))
+        column(name, type, **options, primary_key: true)
       end
 
       ##

activerecord/lib/active_record/delegated_type.rb

@@ -229,7 +229,7 @@ module DelegatedType
     #   Entry#message_uuid      # => returns entryable_uuid, when entryable_type == "Message", otherwise nil
     #   Entry#comment_uuid      # => returns entryable_uuid, when entryable_type == "Comment", otherwise nil
     def delegated_type(role, types:, **options)
-      belongs_to role, options.delete(:scope), **options.merge(polymorphic: true)
+      belongs_to role, options.delete(:scope), **options, polymorphic: true
       define_delegated_type_methods role, types: types, options: options
     end
 

activerecord/lib/active_record/encryption/scheme.rb

@@ -59,7 +59,7 @@ def key_provider
       end
 
       def merge(other_scheme)
-        self.class.new(**to_h.merge(other_scheme.to_h))
+        self.class.new(**to_h, **other_scheme.to_h)
       end
 
       def to_h

activerecord/lib/active_record/validations/associated.rb

@@ -7,7 +7,7 @@ def validate_each(record, attribute, value)
         context = record_validation_context_for_association(record)
 
         if Array(value).reject { |association| valid_object?(association, context) }.any?
-          record.errors.add(attribute, :invalid, **options.merge(value: value))
+          record.errors.add(attribute, :invalid, **options, value: value)
         end
       end
 

activesupport/lib/active_support/cache.rb

@@ -556,7 +556,7 @@ def write_multi(hash, options = nil)
 
         instrument_multi :write_multi, normalized_hash, options do |payload|
           entries = hash.each_with_object({}) do |(name, value), memo|
-            memo[normalize_key(name, options)] = Entry.new(value, **options.merge(version: normalize_version(name, options)))
+            memo[normalize_key(name, options)] = Entry.new(value, **options, version: normalize_version(name, options))
           end
 
           write_multi_entries entries, **options
@@ -664,7 +664,7 @@ def write(name, value, options = nil)
         key = normalize_key(name, options)
 
         instrument(:write, key, options) do
-          entry = Entry.new(value, **options.merge(version: normalize_version(name, options)))
+          entry = Entry.new(value, **options, version: normalize_version(name, options))
           write_entry(key, entry, **options)
         end
       end