Merge pull request #380 from mbj/upgrade/dependencies

Upgrade dependencies
mbj · Feb 14, 2025 · fb943c8 · fb943c8
2 parents f5c44b7 + 82ed87f
commit fb943c8
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 27 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,16 +2,16 @@ PATH
   remote: .
   specs:
     unparser (0.6.15)
-      diff-lcs (~> 1.3)
+      diff-lcs (~> 1.6)
       parser (>= 3.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.5.1)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    diff-lcs (1.6.0)
+    json (2.10.1)
+    language_server-protocol (3.17.0.4)
     mutant (0.12.3)
       diff-lcs (~> 1.3)
       parser (~> 3.3.0)
@@ -21,15 +21,13 @@ GEM
     mutant-rspec (0.12.3)
       mutant (= 0.12.3)
       rspec-core (>= 3.8.0, < 4.0.0)
-    parallel (1.25.1)
-    parser (3.3.2.0)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    regexp_parser (2.9.2)
-    rexml (3.2.9)
-      strscan
+    regexp_parser (2.9.3)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -46,25 +44,25 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
     ruby-progressbar (1.13.0)
     sorbet-runtime (0.5.11422)
-    strscan (3.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   ruby

diff --git a/lib/unparser/generation.rb b/lib/unparser/generation.rb
@@ -222,7 +222,7 @@ def writer_with(klass, node)
     end
 
     def emitter(node)
-      Emitter.emitter(**to_h.merge(node: node))
+      Emitter.emitter(**to_h, node: node)
     end
 
     def visit(node)

diff --git a/spec/unit/unparser/diff_spec.rb b/spec/unit/unparser/diff_spec.rb
@@ -25,9 +25,10 @@
 
       let(:expectation) do
         [
-          "@@ -1 +1 @@\n",
+          "@@ -1,2 +1,2 @@\n",
           Unparser::Color::RED.format("-foo\n"),
           Unparser::Color::GREEN.format("+baz\n"),
+          " bar\n"
         ].join
       end
 
@@ -57,7 +58,7 @@
 
       let(:expectation) do
         <<~STR
-          @@ -1,4 +1,4 @@
+          @@ -1,3 +1,3 @@
           -foo
           +baz
            bar
@@ -77,9 +78,10 @@
 
       let(:expectation) do
         <<~STR
-          @@ -1 +1 @@
+          @@ -1,2 +1,2 @@
           -foo
           +baz
+           bar
         STR
       end
 
@@ -112,7 +114,7 @@
 
       let(:expectation) do
         <<~STR
-          @@ -1,8 +1,9 @@
+          @@ -1,7 +1,8 @@
            foo
            bar
            baz
@@ -135,9 +137,15 @@
 
       let(:expectation) do
         <<~STR
-          @@ -1,2 +1 @@
+          @@ -1,8 +1,7 @@
           -other
            foo
+           bar
+           baz
+           boz
+           a
+           b
+           c
         STR
       end
 
@@ -152,9 +160,15 @@
 
       let(:expectation) do
         <<~STR
-          @@ -1 +1,2 @@
+          @@ -1,7 +1,8 @@
           +other
            foo
+           bar
+           baz
+           boz
+           a
+           b
+           c
         STR
       end
 

diff --git a/spec/unit/unparser/validation_spec.rb b/spec/unit/unparser/validation_spec.rb
@@ -217,7 +217,7 @@ def report
         (send
           (int 1) :bar)
         Node-Diff:
-        @@ -1,3 +1,3 @@
+        @@ -1,2 +1,2 @@
       REPORT
     end
   end

diff --git a/unparser.gemspec b/unparser.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 3.1'
 
-  gem.add_dependency('diff-lcs', '~> 1.3')
+  gem.add_dependency('diff-lcs', '~> 1.6')
   gem.add_dependency('parser',   '>= 3.3.0')
 
   gem.add_development_dependency('mutant',            '~> 0.12.2')