synvert-core 0.52.0 → 0.52.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346c7567c1fec413a81afbe2ec5348f9cd66ac03ed08e8a6cf0fbf47ba049d08
-  data.tar.gz: c4a274d516c1301eb0be17777bd26a16561943077260508925cc3c5eae43e799
+  metadata.gz: b0ab6b6fbee0d7b58203ccde9af31179caa3f6cd0b52bdceb8262683daa31e1e
+  data.tar.gz: 0670bf038c8e7074893e68eafc4a60e4a27c94d4287dda21a7ab6a03322ce044
 SHA512:
-  metadata.gz: ee568051d2872db9f81c7d9a3609379eba74db82862ad55976b962e0c4b835dca9f7af74c67014554f6ee919edde2dab050a77fc248bc71ed2c4969009cede1d
-  data.tar.gz: 80dd4085d700581a02dd9507e88e0cbf28e978cbbd61d0e0906c73d2f713abbdd9393caec13d6854b3727d1b1fdd87a673d67323b4b315990a00f06fa23a1f44
+  metadata.gz: ceae8c9049ae4488f4831594ba2527c970ba88a8479d0eb1477e832597de59f7ca2e9e45389eab4bfa609f8eb2de9498d54340163323cc1329278ad90de1db70
+  data.tar.gz: 5a74ad849852d919bc274726201a03f00aec7741ddd8a8a3abd4a38e3f1584a358a7ca65c2238d885686274d1cfe9157dd4b5b74ac971bb05efd0af411366ae0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.52.1 (2021-08-21)
+
+* Fix nested child in Node#child_node_range
+
 ## 0.52.0 (2021-08-21)
 
 * ``Node#child_node_range`` supports nested child

data/lib/synvert/core/node_ext.rb

@@ -341,7 +341,7 @@ module Parser::AST
     # @param [String] name of child node.
     # @return [Parser::Source::Range] source range of child node.
     def child_node_range(child_name)
-      case [type, child_name]
+      case [type, child_name.to_sym]
       when %i[block pipes], %i[def parentheses], %i[defs parentheses]
         Parser::Source::Range.new('(string)', arguments.loc.expression.begin_pos, arguments.loc.expression.end_pos)
       when %i[block arguments], %i[def arguments], %i[defs arguments]
@@ -369,35 +369,38 @@ module Parser::AST
           Parser::Source::Range.new('(string)', loc.begin.begin_pos, loc.end.end_pos)
         end
       else
-        child_node = self
-        child_name.to_s.split('.').each do |key|
-          if child_node.respond_to?(key)
-            child_node = child_node.send(key)
-            return nil if child_node.nil?
-          else
-            raise Synvert::Core::MethodNotSupported,
-                  "child_node_range is not handled for #{child_node.debug_info}, child_name: #{child_name}"
+        direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
+        if respond_to?(direct_child_name)
+          child_node = send(direct_child_name)
+
+          return child_node.child_node_range(nested_child_name) if nested_child_name
+
+          return nil if child_node.nil?
+
+          if child_node.is_a?(Parser::AST::Node)
+            return(
+              Parser::Source::Range.new(
+                '(string)',
+                child_node.loc.expression.begin_pos,
+                child_node.loc.expression.end_pos
+              )
+            )
           end
-        end
 
-        if child_node.is_a?(Parser::AST::Node)
+          # arguments
+          return nil if child_node.empty?
+
           return(
             Parser::Source::Range.new(
               '(string)',
-              child_node.loc.expression.begin_pos,
-              child_node.loc.expression.end_pos
+              child_node.first.loc.expression.begin_pos,
+              child_node.last.loc.expression.end_pos
             )
           )
         end
 
-        # arguments
-        return nil if child_node.empty?
-
-        Parser::Source::Range.new(
-          '(string)',
-          child_node.first.loc.expression.begin_pos,
-          child_node.last.loc.expression.end_pos
-        )
+        raise Synvert::Core::MethodNotSupported,
+              "child_node_range is not handled for #{debug_info}, child_name: #{child_name}"
       end
     end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.52.0'
+    VERSION = '0.52.1'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -526,6 +526,12 @@ describe Parser::AST::Node do
         range = node.child_node_range('caller.receiver')
         expect(range.to_range).to eq(0...7)
       end
+
+      it 'checks caller.message' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range('caller.message')
+        expect(range.to_range).to eq(8...14)
+      end
     end
 
     context 'class node' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.52.1
 platform: ruby
 authors:
 - Richard Huang