synvert-core 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2c7961db23fe0b1984a90265b8a35d1927d7cfc7dfaa5d66cc7d71d80f3315a
-  data.tar.gz: 66826322dc49882fd9b718e895af0ff954e3c2137014661f97832a94d3de5104
+  metadata.gz: 327989a145ffc5562768e51cf54f6a86ad2bed0b329c7398eb9499a3fa0f4b07
+  data.tar.gz: d7cb9ca59c8a821329b7063e515a329ab451a83ce80439028af458d9cf745804
 SHA512:
-  metadata.gz: c396d7f949f0300cbac84fd1324728d3466c514cedcc463ab955f3c7cae3f83bd4e080c92d3ca88f32798ce8b0b6c882113cac4b4ea41a98540b8cc4977ebdb0
-  data.tar.gz: 804ebc08dd0fe453f932e767c960923bbe7270a3cef0fd95cb61d5b85488a137d0b2da8558823c4cf8cba22b150ca742fb1818d22a1bacccfc1a92da55daf1cc
+  metadata.gz: 7e3afcda5002e5d275faba969dc193e0d8f88781e647ab7fecb44bbbe3b0de383aa74bfad2341b406e148005c4ec7b44fbe941ab884f2a1968d4c81ec1cb9080
+  data.tar.gz: 2b504f8c0a822ae0874e154d45f811b9301bda4c7399bf4c54c365d30bf719367d17a04f0bd41fd77c618c0045901bf70e825301b3811ba023fe0f20bf1c17d5

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # CHANGELOG
 
+* Abstract `find_matching_nodes`
+
 ## 0.16.0 (2021-01-17)
 
 * Use parser 3.0.0

data/lib/synvert/core/exceptions.rb

@@ -2,14 +2,14 @@
 
 module Synvert::Core
   # Rewriter not found exception.
-  class RewriterNotFound < Exception
+  class RewriterNotFound < RuntimeError
   end
 
   # Gemfile.lock not found exception.
-  class GemfileLockNotFound < Exception
+  class GemfileLockNotFound < RuntimeError
   end
 
   # Method not supported exception.
-  class MethodNotSupported < Exception
+  class MethodNotSupported < RuntimeError
   end
 end

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

@@ -108,7 +108,7 @@ module Synvert::Core
             if @actions.length > 0
               @actions.sort_by! { |action| action.send(@options[:sort_by]) }
               conflict_actions = get_conflict_actions
-              @actions.reverse.each do |action|
+              @actions.reverse_each do |action|
                 source[action.begin_pos...action.end_pos] = action.rewritten_code
                 source = remove_code_or_whole_line(source, action.line)
               end

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

@@ -22,18 +22,8 @@ module Synvert::Core
       current_node = @instance.current_node
       return unless current_node
 
+      matching_nodes = find_matching_nodes(current_node)
       @instance.process_with_node current_node do
-        matching_nodes = []
-        matching_nodes << current_node if current_node.match? @rules
-        if @options[:recursive]
-          current_node.recursive_children do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
-          end
-        else
-          current_node.children do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
-          end
-        end
         matching_nodes.each do |matching_node|
           @instance.process_with_node matching_node do
             @instance.instance_eval &@block
@@ -41,5 +31,22 @@ module Synvert::Core
         end
       end
     end
+
+    private
+
+    def find_matching_nodes(current_node)
+      matching_nodes = []
+      if @options[:recursive]
+        matching_nodes << current_node if current_node.match? @rules
+        current_node.recursive_children do |child_node|
+          matching_nodes << child_node if child_node.match? @rules
+        end
+      else
+        current_node.each do |child_node|
+          matching_nodes << child_node if child_node.match? @rules
+        end
+      end
+      matching_nodes
+    end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.16.0"
+    VERSION = "0.16.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser