Merge 21b1215 into 69b6680

synvert-hq · Mar 14, 2021 · f181663 · f181663
2 parents 69b6680 + 21b1215
commit f181663
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/rails/convert_active_record_dirty_5_0_to_5_1.rb b/lib/rails/convert_active_record_dirty_5_0_to_5_1.rb
@@ -79,8 +79,8 @@ def call_after_create
     with_node type: 'sym', to_value: before_name do
       if before_name.is_a?(Regexp)
         node.to_value =~ before_name
-        if attributes.include?($1)
-          replace_with ":#{after_name.sub('{{attribute}}', $1)}"
+        if attributes.include?(Regexp.last_match(1))
+          replace_with ":#{after_name.sub('{{attribute}}', Regexp.last_match(1))}"
         end
       else
         replace_with after_name
@@ -89,8 +89,8 @@ def call_after_create
     with_node type: 'send', receiver: nil, message: before_name do
       if before_name.is_a?(Regexp)
         node.message.to_s =~ before_name
-        if attributes.include?($1)
-          replace_with after_name.sub('{{attribute}}', $1)
+        if attributes.include?(Regexp.last_match(1))
+          replace_with after_name.sub('{{attribute}}', Regexp.last_match(1))
         end
       else
         replace_with after_name

diff --git a/lib/ruby/new_2_2_hash_syntax.rb b/lib/ruby/new_2_2_hash_syntax.rb
@@ -33,9 +33,9 @@
         when :sym
           case node.key.to_source
           when /\A:"([^"'\\]*)"\z/
-            replace_with "'#{$1}': {{value}}"
+            replace_with "'#{Regexp.last_match(1)}': {{value}}"
           when /\A:(.+)\z/
-            replace_with "#{$1}: {{value}}"
+            replace_with "#{Regexp.last_match(1)}: {{value}}"
           end
         when :dsym
           if new_key = node.key.to_source[/\A:(.+)/, 1]