synvert-core 0.42.1 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29440498ff5186fde3ea7828482bfc0e93551350682f68b2fd26f3054894460
-  data.tar.gz: 055d1a185ed10f154f3b6a5ee99d8f142ead2a62935e461f3b73d15a32822496
+  metadata.gz: 7a78fc903b7e0a34ec7a8226a2ce3d1108a86d832f307d40f9b0e5a1c9fda8fd
+  data.tar.gz: d4577da2ba4a6ef01cd7caf2bd122757bed29c2669fd8ee3df6881170335ccf8
 SHA512:
-  metadata.gz: 757170374b87d2941befeaa9e1d17681bfff6bd8486880dec9fa9549e4a71ec660983e7f8bf3d9e71046ae4d24c4fc4ec0282aba71d62cd5de240d3f36962f5e
-  data.tar.gz: ad55dd58dc35f53804d11a99f2dc926881b84a05eb0e13ab3f0a3c07e374fddb1dd8ddae91ec1d8a36a3564d3c61ab3bf1c0282ac45193cb4cc93e90500ef17d
+  metadata.gz: e23329aff2a0719c600d866304a7a423fe76c9be84748bdf90dbfd88aefe521294c8543d8bf5cbaff0ea75dc224e0f2d79bd4c5adf29b2d04182421f92b9a672
+  data.tar.gz: 7ba47c6feeddd305c610285a47cc6a144ee734a4fdf2ba05f103eeea2a06b3386eb861971a9ac79c503303c8417336da3b190524fa6a32c4362ee641f48fcefb

data/CHANGELOG.md

@@ -1,8 +1,11 @@
 # CHANGELOG
 
-# 0.42.1 (2021-07-14)
+# 0.43.0 (2021-07-18)
 
 * Return rewrtier after executing snippet
+* `left_value` and `right_value` support `or_asgn` node
+* `child_node_range` supports send `parentheses`
+* Fix conflict actions
 
 # 0.42.0 (2021-07-11)
 

data/lib/synvert/core/node_ext.rb

@@ -217,6 +217,8 @@ module Parser::AST
     def left_value
       if %i[masgn lvasgn ivasgn].include? type
         children[0]
+      elsif :or_asgn == type
+        children[0].children[0]
       else
         raise Synvert::Core::MethodNotSupported, "left_value is not handled for #{debug_info}"
       end
@@ -227,7 +229,7 @@ module Parser::AST
     # @return [Array<Parser::AST::Node>] variable nodes.
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def right_value
-      if %i[masgn lvasgn ivasgn].include? type
+      if %i[masgn lvasgn ivasgn or_asgn].include? type
         children[1]
       else
         raise Synvert::Core::MethodNotSupported, "right_value is not handled for #{debug_info}"
@@ -360,6 +362,12 @@ module Parser::AST
         else
           loc.selector
         end
+      when %i[send parentheses]
+        if loc.begin && loc.end
+          Parser::Source::Range.new('(string)', loc.begin.begin_pos, loc.end.end_pos)
+        else
+          nil
+        end
       else
         if respond_to?(child_name)
           child_node = send(child_name)

data/lib/synvert/core/rewriter/instance.rb

@@ -113,7 +113,7 @@ module Synvert::Core
               source[action.begin_pos...action.end_pos] = action.rewritten_code
               source = remove_code_or_whole_line(source, action.line)
             end
-            @actions = []
+            @actions = conflict_actions
 
             update_file(file_path, source)
           end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.42.1'
+    VERSION = '0.43.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -261,6 +261,11 @@ describe Parser::AST::Node do
       node = parse('@a = 1')
       expect(node.left_value).to eq :@a
     end
+
+    it 'gets for or_asgn' do
+      node = parse('a ||= 1')
+      expect(node.left_value).to eq :a
+    end
   end
 
   describe '#right_value' do
@@ -283,6 +288,11 @@ describe Parser::AST::Node do
       node = parse('@a = 1')
       expect(node.right_value).to eq parse('1')
     end
+
+    it 'gets for or_asgn' do
+      node = parse('a ||= 1')
+      expect(node.right_value).to eq parse('1')
+    end
   end
 
   describe '#to_value' do
@@ -614,6 +624,20 @@ describe Parser::AST::Node do
         range = node.child_node_range(:arguments)
         expect(range).to be_nil
       end
+
+      it 'checks parentheses' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(7...13)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(6...12)
+
+        node = parse('foo.bar')
+        range = node.child_node_range(:parentheses)
+        expect(range).to be_nil
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.43.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport