node_mutation 1.19.2 → 1.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec537b5f02531d1a6134c09db1be0d0845226a231da01cbda1e9331103a04fb3
-  data.tar.gz: f5cf6c624b25b08de8ea2f82c46401a3ce530c58720fa47cac11f04445c11894
+  metadata.gz: 8089525a411cf3e7400148cba0d3cd21b763d6ec034dd5a627c0faf2419d8ec3
+  data.tar.gz: c5e0137f1da08ac49ffa45124cc39cb095543e5b5d5cc788e32093c581de2e2d
 SHA512:
-  metadata.gz: 7d491e39ed40c9392c0bd4b1ca47cb2d6078756526b85d2ff5a01b9b5c7ec4cf452fe14c502a1066c878a00d532d88152d026e367b67b8c2de6904577e0c3ef0
-  data.tar.gz: d0946badaef12e2bc7701df604d7186174f72cc74d7dc797e38a82f20e05cfd6c07ea6d677c818bc16db583b735f4ae5652c799b7df2d664463977bd524d7b71
+  metadata.gz: 0ecd574ae42a8cabdee2bdae86a14b905fdb4df3205af93753de47e9eb86f595371332f7b9dc5c560c3cd0b48db45d41680784b44fa4be9fba7ef36eefa8d9a7
+  data.tar.gz: c67d25471f221f0c9d7bd1bd6c40c95c2dfc995154dd9264ce4268eb4990c380ca38c7732a5da6c1b75518c68aeb8e3ea32c644259de12ce01559abac722d63a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # NodeMutation
 
+## 1.19.3 (2023-07-01)
+
+* Rewrite `SyntaxTreeAdapter#child_node_range` to support Binary operator
+
 ## 1.19.2 (2023-06-30)
 
 * Support `operator` of `Binary` node in `child_node_range`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.19.2)
+    node_mutation (1.19.3)
 
 GEM
   remote: https://rubygems.org/
@@ -34,14 +34,16 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    parser_node_ext (1.1.0)
+      racc
+    parser_node_ext (1.2.0)
       parser
     prettier_print (1.2.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.7.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
@@ -62,7 +64,7 @@ GEM
     shellany (0.0.1)
     syntax_tree (6.1.1)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.6.1)
+    syntax_tree_ext (0.6.3)
       syntax_tree
     thor (1.2.1)
 

data/lib/node_mutation/adapter/parser.rb

@@ -177,6 +177,7 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
       end
     when %i[class name], %i[const name], %i[cvar name], %i[def name], %i[defs name],
          %i[gvar name], %i[ivar name], %i[lvar name]
+
       NodeMutation::Struct::Range.new(node.loc.name.begin_pos, node.loc.name.end_pos)
     when %i[const double_colon]
       NodeMutation::Struct::Range.new(node.loc.double_colon.begin_pos, node.loc.double_colon.end_pos)
@@ -281,7 +282,7 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
     elsif direct_child_name == 'to_symbol' && node.type == :str
       child_node = ":#{node.to_value}"
     elsif direct_child_name == 'to_string' && node.type == :sym
-        child_node = node.to_value.to_s
+      child_node = node.to_value.to_s
     elsif direct_child_name == 'to_single_quote' && node.type == :str
       child_node = "'#{node.to_value}'"
     elsif direct_child_name == 'to_double_quote' && node.type == :str

data/lib/node_mutation/adapter/syntax_tree.rb

@@ -115,14 +115,28 @@ class NodeMutation::SyntaxTreeAdapter < NodeMutation::Adapter
   #     node = SyntaxTree::Parser.new('foo | bar').parse.statements.body.first
   #     child_node_range(node, 'operator') => { start: 'foo '.length, end: 'foo |'.length }
   def child_node_range(node, child_name)
-    child_node = child_node_by_name(node, child_name)
-    return nil if child_node.nil?
+    direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
+
+    if node.is_a?(Array)
+      if direct_child_name =~ INDEX_REGEXP
+        child_node = node[direct_child_name.to_i]
+        raise NodeMutation::MethodNotSupported,
+              "#{direct_child_name} is not supported for #{get_source(node)}" unless child_node
+        return child_node_range(child_node, nested_child_name) if nested_child_name
+
+        return NodeMutation::Struct::Range.new(child_node.location.start_char, child_node.location.end_char)
+      end
+
+      raise NodeMutation::MethodNotSupported,
+            "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
+
+      child_node = node.send(direct_child_name)
+      return child_node_range(child_node, nested_child_name) if nested_child_name
 
-    if child_node.is_a?(Array)
-      return NodeMutation::Struct::Range.new(child_node.first.location.start_char, child_node.last.location.end_char)
+      return NodeMutation::Struct::Range.new(child_node.location.start_char, child_node.location.end_char)
     end
 
-    if node.is_a?(SyntaxTree::Binary) && child_name == 'operator'
+    if node.is_a?(SyntaxTree::Binary) && child_name.to_sym == :operator
       start_char = node.left.location.end_char
       start_char += 1 while node.source[start_char] == ' '
       end_char = node.right.location.start_char
@@ -130,7 +144,24 @@ class NodeMutation::SyntaxTreeAdapter < NodeMutation::Adapter
       return NodeMutation::Struct::Range.new(start_char, end_char)
     end
 
-    return NodeMutation::Struct::Range.new(child_node.location.start_char, child_node.location.end_char)
+    raise NodeMutation::MethodNotSupported,
+          "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
+
+    child_node = node.send(direct_child_name)
+
+    return child_node_range(child_node, nested_child_name) if nested_child_name
+
+    return nil if child_node.nil?
+
+    if child_node.is_a?(SyntaxTree::Node)
+      return(
+        NodeMutation::Struct::Range.new(child_node.location.start_char, child_node.location.end_char)
+      )
+    end
+
+    return(
+      NodeMutation::Struct::Range.new(child_node.first.location.start_char, child_node.last.location.end_char)
+    )
   end
 
   def get_start(node, child_name = nil)
@@ -195,7 +226,7 @@ class NodeMutation::SyntaxTreeAdapter < NodeMutation::Adapter
       if node.block.block_var
         child_node = "->(#{node.block.block_var.params.to_source}) {#{node.block.bodystmt.to_source}}"
       else
-        child_node = "-> {#{node.block.bodystmt.to_source }}"
+        child_node = "-> {#{node.block.bodystmt.to_source}}"
       end
     elsif direct_child_name == 'strip_curly_braces' && node.is_a?(SyntaxTree::HashLiteral)
       child_node = node.to_source.sub(/^{(.*)}$/) { Regexp.last_match(1).strip }

data/lib/node_mutation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeMutation
-  VERSION = "1.19.2"
+  VERSION = "1.19.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.19.3
 platform: ruby
 authors:
 - Richard Huang