rufo 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '050197c783154878217024914afe1fc208e624521b5c3c1c4cd182c29ce70795'
-  data.tar.gz: 8ec88b8b3bc5fa60afbfa7eb7bcf395a2dd906c2b51e2c256d9f11876540279f
+  metadata.gz: 1862ef1cb223254a0b735f6af30b3364045bd1c8673ad2c34ccd381571174377
+  data.tar.gz: 38d6908494f4a93cc527e914281e44c329dbec4b82a3ca4873acbf188856a559
 SHA512:
-  metadata.gz: 7cce9d7529456084473d761247402c659950460bb75155d3689d8c89bc89993793d9638fc0bc47d45a40d97eaf2d06d13c175f1db0aeef1356ad12a8124f5bfe
-  data.tar.gz: f4e46d300e1a94fc05c1d2aaa99ea6f24fa244faba984e8841f9874e5326ef324cc38b915008948156ec5825c572024dc0e57a0600f6b235fe06f7b7f3695e60
+  metadata.gz: c8d78360444224de4502c9f727171e7df9e4ff3344e48b28475d0cf9d92f53d6807755542db05c99d3eaa54cde3f6c2cbe5b67c7b1583d3d5e4346b4c93c7afa
+  data.tar.gz: f62ce1f77275410744f235c74a2293d838a5dfe6110768f6434735cc935e7520d6bc0511496e9d5c5912a945a783ac989c990a8bc8b7f61bfffb05c7055f7008

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  NewCops: enable
   Exclude:
     - "spec/**/*"
     - "vendor/**/*"

data/CHANGELOG.md

@@ -12,6 +12,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.15.0] - 2023-02-08
+
+### Fixed
+
+### Changed
+
+### Added
+
+- Support for anonymous block argument forwarding
+- Support for valueless hash literals and keyword arguments
+- Support for anonymous rest and rest keyword arguments forwarding
+
 ## [0.14.0] - 2023-01-25
 
 ### Fixed

data/lib/rufo/formatter.rb

@@ -227,12 +227,11 @@ class Rufo::Formatter
     when :@CHAR
       # [:@CHAR, "?a", [1, 0]]
       consume_token :on_CHAR
-    when :@gvar
+    when :@gvar, :@backref, :@label, :@op
       # [:@gvar, "$abc", [1, 0]]
-      write node[1]
-      next_token
-    when :@backref
       # [:@backref, "$1", [1, 0]]
+      # [:@label, "foo:", [1, 3]]
+      # [:@op, "*", [1, 1]]
       write node[1]
       next_token
     when :@backtick
@@ -289,11 +288,12 @@ class Rufo::Formatter
       visit_quoted_symbol_literal(node)
     when :@ident
       consume_token :on_ident
-    when :var_ref
+    when :var_ref, :var_field, :const_ref, :vcall, :fcall
       # [:var_ref, exp]
-      visit node[1]
-    when :var_field
       # [:var_field, exp]
+      # [:const_ref, [:@const, "Foo", [1, 8]]]
+      # [:vcall, exp]
+      # [:fcall, [:@ident, "foo", [1, 0]]]
       visit node[1]
     when :@kw
       # [:@kw, "nil", [1, 0]]
@@ -307,9 +307,6 @@ class Rufo::Formatter
     when :@const
       # [:@const, "FOO", [1, 0]]
       consume_token :on_const
-    when :const_ref
-      # [:const_ref, [:@const, "Foo", [1, 8]]]
-      visit node[1]
     when :top_const_ref
       # [:top_const_ref, [:@const, "Foo", [1, 2]]]
       consume_op "::"
@@ -319,9 +316,7 @@ class Rufo::Formatter
       # [:top_const_field, [:@const, "Foo", [1, 2]]]
       consume_op "::"
       visit node[1]
-    when :const_path_ref
-      visit_path(node)
-    when :const_path_field
+    when :const_path_ref, :const_path_field
       visit_path(node)
     when :assign
       visit_assign(node)
@@ -341,12 +336,6 @@ class Rufo::Formatter
       visit_suffix(node, "until")
     when :rescue_mod
       visit_suffix(node, "rescue")
-    when :vcall
-      # [:vcall, exp]
-      visit node[1]
-    when :fcall
-      # [:fcall, [:@ident, "foo", [1, 0]]]
-      visit node[1]
     when :command
       visit_command(node)
     when :command_call
@@ -422,10 +411,6 @@ class Rufo::Formatter
       visit_hash_key_value(node)
     when :assoc_splat
       visit_splat_inside_hash(node)
-    when :@label
-      # [:@label, "foo:", [1, 3]]
-      write node[1]
-      next_token
     when :dot2
       visit_range(node, true)
     when :dot3
@@ -452,10 +437,6 @@ class Rufo::Formatter
       consume_keyword "yield"
     when :yield
       visit_yield(node)
-    when :@op
-      # [:@op, "*", [1, 1]]
-      write node[1]
-      next_token
     when :lambda
       visit_lambda(node)
     when :zsuper
@@ -1516,6 +1497,9 @@ class Rufo::Formatter
       consume_op "&"
       skip_space_or_newline
       visit block_arg
+    elsif current_token_kind == :on_op && current_token_value == "&"
+      consume_op "&"
+      skip_space_or_newline
     end
   end
 
@@ -1544,7 +1528,10 @@ class Rufo::Formatter
     write_indent(base_column) if needs_indent
     consume_op "*"
     skip_space_or_newline
-    visit star
+    # The name of rest arguments might be omitted.
+    if star
+      visit star
+    end
 
     if post_args && !post_args.empty?
       write_params_comma
@@ -2226,7 +2213,10 @@ class Rufo::Formatter
       skip_space_or_newline
       consume_op "&"
       skip_space_or_newline
-      visit blockarg[1]
+      # Ruby 3.1 or above, block arg might be anonymous
+      if blockarg[1]
+        visit blockarg[1]
+      end
     end
   end
 
@@ -2403,16 +2393,21 @@ class Rufo::Formatter
     arrow = symbol || !(key[0] == :@label || key[0] == :dyna_symbol)
 
     visit key
-    consume_space
 
     # Don't output `=>` for keys that are `label: value`
     # or `"label": value`
     if arrow
-      consume_op "=>"
       consume_space
+      consume_op "=>"
     end
 
-    visit value
+    if value.nil?
+      # The value for the key is omitted.
+      skip_space
+    else
+      consume_space
+      visit value
+    end
   end
 
   def visit_splat_inside_hash(node)
@@ -2421,7 +2416,11 @@ class Rufo::Formatter
     # [:assoc_splat, exp]
     consume_op "**"
     skip_space_or_newline
-    visit node[1]
+    exp = node[1]
+    # The name of rest kwargs might be omitted.
+    if exp
+      visit exp
+    end
   end
 
   def visit_range(node, inclusive)
@@ -3554,7 +3553,7 @@ class Rufo::Formatter
   end
 
   def write_indent(indent = @indent)
-    @output << " " * indent
+    @output << (" " * indent)
     @column += indent
   end
 
@@ -3899,7 +3898,7 @@ class Rufo::Formatter
     # get line of node, it is only used in visit_hash right now,
     # so handling the following node types is enough.
     case node.first
-    when :hash, :string_literal, :symbol_literal, :symbol, :vcall, :string_content, :assoc_splat, :var_ref
+    when :hash, :string_literal, :symbol_literal, :symbol, :vcall, :string_content, :assoc_splat, :var_ref, :dyna_symbol
       node_line(node[1], beginning: beginning)
     when :assoc_new
       # There's no line number info for empty strings or hashes.
@@ -3912,8 +3911,6 @@ class Rufo::Formatter
       end
     when :assoclist_from_args
       node_line(beginning ? node[1][0] : node[1].last, beginning: beginning)
-    when :dyna_symbol
-      node_line(node[1], beginning: beginning)
     when :@label, :@int, :@ident, :@tstring_content, :@kw
       node[2][0]
     end

data/lib/rufo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufo
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/rufo.gemspec

@@ -21,15 +21,16 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.7.0"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.add_development_dependency "bundler", ">= 1.15"
-  spec.add_development_dependency "byebug", "~> 11.0.1"
+  spec.add_development_dependency "byebug", "~> 11.1.3"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rexml", "~> 3.2.5"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
-  spec.add_development_dependency "rubocop", "~> 0.79.0"
-  spec.add_development_dependency "simplecov", "~> 0.18.5"
-  spec.add_development_dependency "simplecov-cobertura", "~> 1.3.1"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0"
+  spec.add_development_dependency "rubocop", "~> 1.44.1"
+  spec.add_development_dependency "simplecov", "~> 0.22.0"
+  spec.add_development_dependency "simplecov-cobertura", "~> 2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: 11.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: 11.1.3
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.44.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.44.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.5
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.5
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.1'
 description: Fast and unobtrusive Ruby code formatter
 email:
 - asterite@gmail.com
@@ -193,7 +193,8 @@ files:
 homepage: https://github.com/ruby-formatter/rufo
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Ruby code formatter