synvert-core 0.51.1 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3a46917323dc90674ad343c09d06621ac8817a3700c4b4ff205dbfb96a4ad7f
-  data.tar.gz: 1a72f62df4f1711af2b17e2ac2c556ac57bb5cf984cfc9f00d74ce4c7d540442
+  metadata.gz: 346c7567c1fec413a81afbe2ec5348f9cd66ac03ed08e8a6cf0fbf47ba049d08
+  data.tar.gz: c4a274d516c1301eb0be17777bd26a16561943077260508925cc3c5eae43e799
 SHA512:
-  metadata.gz: 8a150ae7cd1eef26c911c29a20911d370ec227405671218c2a4fee51b05ab5cc963002b719c2380c621fa603cd9082500eed91ace57fea6294e16a026e70193b
-  data.tar.gz: 78b9d45a11f131d20790a84d40c4547582d043fc779b77d398660ca35cc0eb415c4b55d8aba3e8b1d949cc864e7c71fe7ad5565af7e47ec4e5a5079b5cd095fc
+  metadata.gz: ee568051d2872db9f81c7d9a3609379eba74db82862ad55976b962e0c4b835dca9f7af74c67014554f6ee919edde2dab050a77fc248bc71ed2c4969009cede1d
+  data.tar.gz: 80dd4085d700581a02dd9507e88e0cbf28e978cbbd61d0e0906c73d2f713abbdd9393caec13d6854b3727d1b1fdd87a673d67323b4b315990a00f06fa23a1f44

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # CHANGELOG
 
-## 0.51.1 (2021-08-19)
+## 0.52.0 (2021-08-21)
 
+* ``Node#child_node_range`` supports nested child
 * Require `fileutils`
+* Rename `Node#indent` to `Node#column`
 
 ## 0.51.0 (2021-08-12)
 

data/lib/synvert/core/node_ext.rb

@@ -322,10 +322,10 @@ module Parser::AST
       loc.expression&.source
     end
 
-    # Get the indent of current node.
+    # Get the column of current node.
     #
-    # @return [Integer] indent.
-    def indent
+    # @return [Integer] column.
+    def column
       loc.expression.column
     end
 
@@ -369,34 +369,35 @@ module Parser::AST
           Parser::Source::Range.new('(string)', loc.begin.begin_pos, loc.end.end_pos)
         end
       else
-        if respond_to?(child_name)
-          child_node = send(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
-              )
-            )
+        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}"
           end
+        end
 
-          # arguments
-          return nil if child_node.empty?
-
+        if child_node.is_a?(Parser::AST::Node)
           return(
             Parser::Source::Range.new(
               '(string)',
-              child_node.first.loc.expression.begin_pos,
-              child_node.last.loc.expression.end_pos
+              child_node.loc.expression.begin_pos,
+              child_node.loc.expression.end_pos
             )
           )
         end
 
-        raise Synvert::Core::MethodNotSupported,
-              "child_node_range is not handled for #{debug_info}, child_name: #{child_name}"
+        # 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
+        )
       end
     end
 

data/lib/synvert/core/rewriter/action/append_action.rb

@@ -12,7 +12,7 @@ module Synvert::Core
       if :begin == @node.type
         @node.loc.expression.end_pos
       else
-        @node.loc.expression.end_pos - @node.indent - END_LENGTH
+        @node.loc.expression.end_pos - @node.column - END_LENGTH
       end
     end
 
@@ -31,9 +31,9 @@ module Synvert::Core
     # @return [String] n times whitesphace
     def indent(node)
       if %i[block class].include? node.type
-        ' ' * (node.indent + DEFAULT_INDENT)
+        ' ' * (node.column + DEFAULT_INDENT)
       else
-        ' ' * node.indent
+        ' ' * node.column
       end
     end
   end

data/lib/synvert/core/rewriter/action/insert_after_action.rb

@@ -24,7 +24,7 @@ module Synvert::Core
     # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
     def indent(node)
-      ' ' * node.indent
+      ' ' * node.column
     end
   end
 end

data/lib/synvert/core/rewriter/action/prepend_action.rb

@@ -38,9 +38,9 @@ module Synvert::Core
     # @return [String] n times whitesphace
     def indent(node)
       if %i[block class].include? node.type
-        ' ' * (node.indent + DEFAULT_INDENT)
+        ' ' * (node.column + DEFAULT_INDENT)
       else
-        ' ' * node.indent
+        ' ' * node.column
       end
     end
   end

data/lib/synvert/core/rewriter/action/replace_with_action.rb

@@ -24,7 +24,7 @@ module Synvert::Core
       if rewritten_source.include?("\n")
         new_code = []
         rewritten_source.split("\n").each_with_index do |line, index|
-          new_code << (index == 0 ? line : indent(@node) + line)
+          new_code << (index == 0 ? line : indent + line)
         end
         new_code.join("\n")
       else
@@ -36,10 +36,9 @@ module Synvert::Core
 
     # Indent of the node
     #
-    # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
-    def indent(node)
-      ' ' * node.indent
+    def indent
+      ' ' * @node.column
     end
   end
 end

data/lib/synvert/core/rewriter/action/wrap_action.rb

@@ -8,7 +8,7 @@ module Synvert::Core
   class Rewriter::WrapAction < Rewriter::Action
     def initialize(instance, with:, indent: nil)
       super(instance, with)
-      @indent = indent || @node.indent
+      @indent = indent || @node.column
     end
 
     # Begin position of code to wrap.

data/lib/synvert/core/rewriter/scope/within_scope.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # WithinScope finds out nodes which match rules, then change its scope to matching node.
+  # WithinScope finds out nodes which match rules, then changes its scope to matching node.
   class Rewriter::WithinScope < Rewriter::Scope
     # Initialize a scope
     #
@@ -16,8 +16,9 @@ module Synvert::Core
       @block = block
     end
 
-    # Find out the matching nodes. It checks the current node and iterates all child nodes,
-    # then run the block code with each matching node.
+    # Find out the matching nodes.
+    # It checks the current node and iterates all child nodes,
+    # then run the block code on each matching node.
     def process
       current_node = @instance.current_node
       return unless current_node

data/lib/synvert/core/version.rb

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

data/spec/synvert/core/node_ext_spec.rb

@@ -359,10 +359,10 @@ describe Parser::AST::Node do
     end
   end
 
-  describe '#indent' do
+  describe '#column' do
     it 'gets column number' do
       node = parse('  FactoryGirl.create :post')
-      expect(node.indent).to eq 2
+      expect(node.column).to eq 2
     end
   end
 
@@ -520,6 +520,12 @@ describe Parser::AST::Node do
         range = node.child_node_range(:pipes)
         expect(range.to_range).to eq(24...30)
       end
+
+      it 'checks caller.receiver' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range('caller.receiver')
+        expect(range.to_range).to eq(0...7)
+      end
     end
 
     context 'class node' do

metadata

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