synvert-core 1.33.1 → 1.33.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc05338573c2a8a930dfbbafec5aa122da815e072fea47e1ac9c83f97753fa97
-  data.tar.gz: 40764685f615c7b236e6f96a8242d9b9088dce8c5901384e9ef74428ce04a0da
+  metadata.gz: a0b171e345173ce6e1519cc68c1fd4aca91e796d56554ba63875c0402b3b202f
+  data.tar.gz: 218dcbcacb00ff39d4de981dc76178c552081577fe4cfaeadad291a1b42b7d46
 SHA512:
-  metadata.gz: 5a02ad97db0eaea55a971d5fd58c244f49ce442e2d38dd170d41132e55ecb785f39627e90826454f89f55d3f7b41b701c6bdca46b58639d9fbb185924d1eaf35
-  data.tar.gz: e64da537b70a1d2f4e25b9a0e74955b9f51acdcd57f1dd241bf8a497af57b1c7f2ff427a400dfbe3fff00dc23c556ec54f59f01eea9879cd0ee56b99a6f6d41f
+  metadata.gz: 6c96410cb92044bfeca2ebbc07cd2340973bd3320a10060c4bdad4a95db48d31d62e358a9929c40639904633dd9cd09238d34b3ce877b51d2af1a7a920cb8747
+  data.tar.gz: '0702947b02c043b28fc52456497e03834e94407514ccc34ae9be9f562a885cffbd9f08f0e598fe0df6d03e9c36bc4f521c1169079de748c0fadc082f76865bac'

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.33.3 (2024-02-28)
+
+* Preserve current parser
+
+## 1.33.2 (2024-02-24)
+
+* Reset `@warnings`, `@affected_files`, and `@test_results`
+* Puts `Parser::SyntaxError` message only when `ENV[DEBUG]` is true
+* Raise `ParserNotSupported` if parser is not supported
+
 ## 1.33.1 (2024-02-23)
 
 * Try 10 times at maximum when process

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.33.1)
+    synvert-core (1.33.3)
       activesupport (< 7.0.0)
       node_mutation (>= 1.23.2)
       node_query (>= 1.15.1)

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

@@ -68,8 +68,10 @@ module Synvert::Core
           end
           break unless result.conflicted?
         rescue Parser::SyntaxError => e
-          puts "[Warn] file #{file_path} was not parsed correctly."
-          puts e.message
+          if ENV['DEBUG'] == 'true'
+            puts "[Warn] file #{file_path} was not parsed correctly."
+            puts e.message
+          end
           break
         end
       end
@@ -95,8 +97,10 @@ module Synvert::Core
         result.file_path = file_path
         result
       rescue Parser::SyntaxError => e
-        puts "[Warn] file #{file_path} was not parsed correctly."
-        puts e.message
+        if ENV['DEBUG'] == 'true'
+          puts "[Warn] file #{file_path} was not parsed correctly."
+          puts e.message
+        end
       end
     end
 
@@ -498,8 +502,10 @@ module Synvert::Core
         parse_code_by_syntax_tree(file_path, encoded_source)
       when Synvert::PRISM_PARSER
         parse_code_by_prism(file_path, encoded_source)
-      else
+      when Synvert::PARSER_PARSER
         parse_code_by_parser(file_path, encoded_source)
+      else
+        raise Errors::ParserNotSupported.new("Parser #{@rewriter.parser} not supported")
       end
     end
 

data/lib/synvert/core/rewriter.rb

@@ -117,10 +117,8 @@ module Synvert::Core
       @block = block
       @helpers = []
       @sub_snippets = []
-      @warnings = []
-      @affected_files = Set.new
       @options = DEFAULT_OPTIONS.dup
-      @test_results = Hash.new { |h, k| h[k] = [] }
+      reset
       self.class.register(@group, @name, self)
     end
 
@@ -184,6 +182,13 @@ module Synvert::Core
       @options[:parser]
     end
 
+    # Reset @warnings, @affected_files, and @test_results.
+    def reset
+      @warnings = []
+      @affected_files = Set.new
+      @test_results = Hash.new { |h, k| h[k] = [] }
+    end
+
     #######
     # DSL #
     #######
@@ -356,13 +361,15 @@ module Synvert::Core
       return unless rewriter && rewriter.is_a?(Rewriter)
 
       rewriter.options = @options
-      if !rewriter.options[:write_to_file]
-        results = rewriter.test
-        merge_test_results(results)
-      elsif rewriter.options[:run_instance]
-        rewriter.process
-      else
-        rewriter.process_with_sandbox
+      preserve_current_parser do
+        if !rewriter.options[:write_to_file]
+          results = rewriter.test
+          merge_test_results(results)
+        elsif rewriter.options[:run_instance]
+          rewriter.process
+        else
+          rewriter.process_with_sandbox
+        end
       end
       @sub_snippets << rewriter
     end
@@ -380,7 +387,9 @@ module Synvert::Core
       helper = Synvert::Core::Helper.fetch(name) || Utils.eval_snippet(name)
       return unless helper && helper.is_a?(Synvert::Core::Helper)
 
-      instance_exec(options, &helper.block)
+      preserve_current_parser do
+        instance_exec(options, &helper.block)
+      end
     end
 
     # It defines helper method for {Synvert::Core::Rewriter::Instance}.
@@ -427,5 +436,12 @@ module Synvert::Core
     def merge_test_result(result)
       @test_results[result.file_path] << result
     end
+
+    def preserve_current_parser
+      current_parser = @options[:parser]
+      yield
+    ensure
+      @options[:parser] = current_parser
+    end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.33.1'
+    VERSION = '1.33.3'
   end
 end

data/spec/synvert/core/rewriter_spec.rb

@@ -4,6 +4,19 @@ require 'spec_helper'
 
 module Synvert::Core
   RSpec.describe Rewriter do
+    describe '#reset' do
+      it 'resets warnings, affected_files, and test_results' do
+        rewriter = Rewriter.new 'group', 'name'
+        rewriter.instance_variable_set(:@warnings, ['warnings'])
+        rewriter.instance_variable_set(:@affected_files, ['files'])
+        rewriter.instance_variable_set(:@test_results, { foo: 'bar' })
+        rewriter.reset
+        expect(rewriter.warnings).to eq []
+        expect(rewriter.affected_files).to eq Set.new
+        expect(rewriter.test_results).to eq Hash.new
+      end
+    end
+
     describe '#configure' do
       it 'parses parser' do
         running_mutation_adapter = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.33.1
+  version: 1.33.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport