synvert-core 0.54.1 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce993d0b27272e83abe3bd3a1ff2a9917a2c9953bb30e57671216aed001292c
-  data.tar.gz: 0b65093ca670d59065707e122a9964f163fbca2e4201fd75005295b7841e4db1
+  metadata.gz: 5d9026b58fc968fd19fb6bcfb02a7235ba90fa2dee89b74c4707191ddbe892e7
+  data.tar.gz: 80b9f33e6c34e9b575a1dfac6b89adc8e5362cca7506a0b64b86047e3e27afbf
 SHA512:
-  metadata.gz: 4bb49555a37b7778e37216f267b0e2ab938030ac5428f7bbef60d8462fb83597693bad9a5cd12c43c52a80330de48662151abbcc8edebb7572538f1520539bac
-  data.tar.gz: eaf5690913c21c3b043f5119f2b8b4afe08c16c5a9db8d9d209a42f0a64a72d4f19376da6dee6ed43b04b79d8077f4463a47acb5d18742a6dcb1499b3191db7a
+  metadata.gz: 40638d3f2674232745f15810f9f5d12d7f2f5f9b99dc353f7fc568812cad747c24b502aec3c50b1952dfba14db034545719e8f14792658bdd44c7ec7db6e05be
+  data.tar.gz: 3d9dc8284d401ec5453c8023a23b0b5096c38d8d9581155dca7069f57c25999315f5a075c1d6eff4b802b8f4d2cc4d8a037ce0c0cf33cd8e2c225781e7790b00

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # CHANGELOG
 
-## 0.54.1 (2021-09-08)
+## 0.56.0 (2021-09-14)
 
+* Support `name` for `:lvar`, `:ivar`, `:cvar`
+* Delete one more space if two spaces left
+
+## 0.55.0 (2021-09-11)
+
+* Add `Configuration.show_run_process`
+* Fix remove action `begin_pos` and `end_pos`
+* Fix `nil` match
 * Rewrite `remove` action
 
 ## 0.54.0 (2021-08-28)

data/lib/synvert/core/configuration.rb

@@ -4,7 +4,7 @@ module Synvert::Core
   # Synvert global configuration.
   class Configuration
     class << self
-      attr_writer :path, :skip_files
+      attr_writer :path, :skip_files, :show_run_process
 
       def path
         @path || '.'
@@ -13,6 +13,10 @@ module Synvert::Core
       def skip_files
         @skip_files || []
       end
+
+      def show_run_process
+        @show_run_process || false
+      end
     end
   end
 end

data/lib/synvert/core/node_ext.rb

@@ -9,7 +9,7 @@ module Parser::AST
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def name
       case type
-      when :class, :module, :def, :arg, :blockarg, :restarg
+      when :class, :module, :def, :arg, :blockarg, :restarg, :lvar, :ivar, :cvar
         children[0]
       when :defs, :const
         children[1]
@@ -576,7 +576,11 @@ module Parser::AST
 
         actual.zip(expected).all? { |a, e| match_value?(a, e) }
       when NilClass
-        actual.nil?
+        if actual.is_a?(Parser::AST::Node)
+          :nil == actual.type
+        else
+          actual.nil?
+        end
       when Numeric
         if actual.is_a?(Parser::AST::Node)
           actual.children[0] == expected

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

@@ -12,7 +12,12 @@ module Synvert::Core
     #
     # @return [Integer] begin position.
     def begin_pos
-      @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
+      pos = @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
+      if @instance.file_source[pos - 1] == ' ' && @instance.file_source[end_pos] == ' '
+        pos - 1
+      else
+        pos
+      end
     end
 
     # End position of code to delete.

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

@@ -41,11 +41,13 @@ module Synvert::Core
     end
 
     def start_index
-      file_source[0..@node.loc.expression.begin_pos].rindex("\n") + "\n".length
+      index = file_source[0..@node.loc.expression.begin_pos].rindex("\n")
+      index ? index + "\n".length : @node.loc.expression.begin_pos
     end
 
     def end_index
-      file_source[@node.loc.expression.end_pos..-1].index("\n") + @node.loc.expression.end_pos + "\n".length
+      index = file_source[@node.loc.expression.end_pos..-1].index("\n")
+      index ? @node.loc.expression.end_pos + index + "\n".length : @node.loc.expression.end_pos
     end
 
     def file_source

data/lib/synvert/core/rewriter/condition/if_only_exist_condition.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # IfExistCondition checks if node has only one child node and the child node matches rules.
+  # IfOnlyExistCondition checks if node has only one child node and the child node matches rules.
   class Rewriter::IfOnlyExistCondition < Rewriter::Condition
     # check if only have one child node and the child node matches rules.
     def match?

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

@@ -46,7 +46,7 @@ module Synvert::Core
       # @param source [String] file source
       def write_file(file_path, source)
         source = Engine::ERB.decode(source) if /\.erb/.match?(file_path)
-        File.write file_path, source.gsub(/ +\n/, "\n")
+        File.write(file_path, source.gsub(/ +\n/, "\n"))
         @file_source[file_path] = nil
         @file_ast[file_path] = nil
       end
@@ -92,6 +92,7 @@ module Synvert::Core
         next if Configuration.skip_files.include? file_path
 
         begin
+          puts file_path if Configuration.show_run_process
           conflict_actions = []
           source = +self.class.file_source(file_path)
           ast = self.class.file_ast(file_path)

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.54.1'
+    VERSION = '0.56.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -42,6 +42,21 @@ describe Parser::AST::Node do
       expect(node.name).to eq :Synvert
     end
 
+    it 'gets for lvar node' do
+      node = parse("foo = 'bar'\nfoo").children[1]
+      expect(node.name).to eq :foo
+    end
+
+    it 'gets for ivar node' do
+      node = parse("@foo = 'bar'\n@foo").children[1]
+      expect(node.name).to eq :@foo
+    end
+
+    it 'gets for cvar node' do
+      node = parse("@@foo = 'bar'\n@@foo").children[1]
+      expect(node.name).to eq :@@foo
+    end
+
     it 'gets for mlhs node' do
       node = parse('var.each { |(param1, param2)| }')
       expect(node.arguments.first.name).to eq node.arguments.first

data/spec/synvert/core/rewriter/action/delete_action_spec.rb

@@ -7,7 +7,7 @@ module Synvert::Core
     subject {
       source = 'arr.map {}.flatten'
       node = Parser::CurrentRuby.parse(source)
-      instance = double(current_node: node)
+      instance = double(current_node: node, file_source: source)
       Rewriter::DeleteAction.new(instance, :dot, :message)
     }
 

metadata

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