rufo 0.16.3 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d409deea0a4597c0cab778d78b5d055ef0efe09246063f94d4902b92967590a
-  data.tar.gz: c49924d1209e5ae8e0387ba93596273dfca7e71ae788dc17820fecbf286f62a6
+  metadata.gz: f5df151931108df0740d8602c1bf8b931503e3bede6a337f25a9bf75cb549c70
+  data.tar.gz: 73a321c4a0960f8fc021b062149ccbe3f96ccfc231c780e2612de00e011f590b
 SHA512:
-  metadata.gz: 21b4a9ce483440f4a0765b13e2ee5b2101ed9556d59ddc5714df046a773b9060d97d84c7ddfc76e9320f72cb76c5ec4ee304876c77c193108e7e29c7ab630f8e
-  data.tar.gz: f09a85d28f35f086d980ed9d4db3d27503bb6b71ad35d8298d812464d0118f02b28ec25968ebbb822f1266254271970e3960c31cc6de0cd1b04961c7fa1fa250
+  metadata.gz: 8a2176ae1780bce5ec076052b63576fc54370a4a5b2a7837166e8d42ec4f6f4f47cc1b4590f5742a6b7a263d7cb2b59fc7985a2dd9f1a37fa41939c502515253
+  data.tar.gz: aad26fad18830aad211ba7d16f65643b78648b4f755d0a43ac1b65edbba1d7f97e05535f7c2f499dc3a5a7fa2cfff295e2a5da1aa63af859090873598406ab60

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ['3.2', '3.1', '3.0', '2.7']
+        ruby_version: ['3.3', '3.2', '3.1', '3.0', '2.7']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -12,6 +12,27 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.17.1] - 2024-02-03
+
+### Fixed
+- Fix incorrect indentation methods call with splat ([#320](https://github.com/ruby-formatter/rufo/pull/320))
+
+### Changed
+- Remove unused internal methods from `Rufo::Formatter` ([#321](https://github.com/ruby-formatter/rufo/pull/321))
+  - This change may affect behavior with versions of Ruby not currently supported by Rufo (< 2.7)
+
+### Added
+
+## [0.17.0] - 2024-01-06
+
+### Fixed
+
+### Changed
+
+### Added
+- Add Ruby 3.3 to test runs on CI. ([#314](https://github.com/ruby-formatter/rufo/issues/314))
+- Add `mixed` option for quote_style setting. ([#315](https://github.com/ruby-formatter/rufo/issues/315))
+
 ## [0.16.3] - 2023-11-09
 
 ### Fixed

data/bin/verify-sample-code

@@ -1,18 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 repos = {
-  "rspec/rspec-core" => {
-    "--exclude-pattern" => [
-      "spec/rspec/core/world_spec.rb",
-      "spec/rspec/core/formatters/exception_presenter_spec.rb",
-      "spec/rspec/core/formatters/snippet_extractor_spec.rb",
-      "spec/rspec/core/metadata_spec.rb",
-      "spec/rspec/core/formatters/html_formatter_spec.rb",
-      "spec/rspec/core/formatters_spec.rb",
-      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
-      "spec/rspec/core/formatters/progress_formatter_spec.rb"
-    ].join(","),
-  },
+  "rspec/rspec-expectations" => {},
+  "rspec/rspec-mocks" => {},
 }
 
 def run_command(cmd, allowed_statuses: [0])

data/docs/settings.md

@@ -227,6 +227,7 @@ Use the specified quotation marks.
 
 - `:double`: (default) use doublequotations unless one or more escaped double-quotations are included
 - `:single`: use single quotations unless one or more interpolations `#{}` or escaped single quotations are included
+- `:mixed`: use mixed quotations if you don't want to change quotes
 
 This does not affect `%q()` (single), `%Q()` (double), or quotation marks within heredocs.
 
@@ -278,6 +279,8 @@ code = <<CODE
 CODE
 ```
 
+With `:mixed`, the formatter will keep lines as is
+
 ### Includes and excludes
 Files can be excluded or included in formatting with rufo by specifying glob patterns for the `includes` or `excludes` configuration options. Multiple patterns are separated by a comma.
 

data/lib/rufo/formatter.rb

@@ -396,8 +396,6 @@ class Rufo::Formatter
       visit_module(node)
     when :mrhs_new_from_args
       visit_mrhs_new_from_args(node)
-    when :mlhs_paren
-      visit_mlhs_paren(node)
     when :mlhs
       visit_mlhs(node)
     when :mrhs_add_star
@@ -457,8 +455,6 @@ class Rufo::Formatter
       visit_alias(node)
     when :undef
       visit_undef(node)
-    when :mlhs_add_star
-      visit_mlhs_add_star(node)
     when :rest_param
       visit_rest_param(node)
     when :kwrest_param
@@ -636,6 +632,7 @@ class Rufo::Formatter
 
   # should we format this string according to :quote_style?
   def should_format_string?(string)
+    return if quote_style == :mixed
     # don't format %q or %Q
     return unless current_token_value == "'" || current_token_value == '"'
     # don't format strings containing slashes
@@ -905,26 +902,6 @@ class Rufo::Formatter
     end
   end
 
-  def indentable_value?(value)
-    return unless current_token_kind == :on_kw
-
-    case current_token_value
-    when "if", "unless", "case"
-      true
-    when "begin"
-      # Only indent if it's begin/rescue
-      return false unless value[0] == :begin
-
-      body = value[1]
-      return false unless body[0] == :bodystmt
-
-      _, _, rescue_body, else_body, ensure_body = body
-      rescue_body || else_body || ensure_body
-    else
-      false
-    end
-  end
-
   def current_comment_aligned_to_previous_one?
     @last_comment &&
       @last_comment[0][0] + 1 == current_token_line &&
@@ -1540,7 +1517,8 @@ class Rufo::Formatter
 
     skip_space
 
-    write_params_comma if comma?
+    # Disable indentation in write_params_comma to avoid double indentation with write_indent
+    write_params_comma(with_indent: !needs_indent) if comma?
     write_indent(base_column) if needs_indent
     consume_op "*"
     skip_space_or_newline
@@ -1550,7 +1528,8 @@ class Rufo::Formatter
     end
 
     if post_args && !post_args.empty?
-      write_params_comma
+      # Disable indentation in write_params_comma to avoid double indentation with visit_comma_separated_list
+      write_params_comma(with_indent: !needs_indent)
       visit_comma_separated_list post_args, needs_indent: needs_indent, base_column: base_column
     end
   end
@@ -1658,23 +1637,10 @@ class Rufo::Formatter
     end
   end
 
-  def visit_mlhs_paren(node)
-    # [:mlhs_paren,
-    #   [[:mlhs_paren, [:@ident, "x", [1, 12]]]]
-    # ]
-    _, args = node
-
-    visit_mlhs_or_mlhs_paren(args)
-  end
-
   def visit_mlhs(node)
     # [:mlsh, *args]
     _, *args = node
 
-    visit_mlhs_or_mlhs_paren(args)
-  end
-
-  def visit_mlhs_or_mlhs_paren(args)
     # Sometimes a paren comes, some times not, so act accordingly.
     has_paren = current_token_kind == :on_lparen
     if has_paren
@@ -1818,35 +1784,6 @@ class Rufo::Formatter
     end
   end
 
-  def visit_mlhs_add_star(node)
-    # [:mlhs_add_star, before, star, after]
-    _, before, star, after = node
-
-    if before && !before.empty?
-      # Maybe a Ripper bug, but if there's something before a star
-      # then a star shouldn't be here... but if it is... handle it
-      # somehow...
-      if op?("*")
-        star = before
-      else
-        visit_comma_separated_list to_ary(before)
-        write_params_comma
-      end
-    end
-
-    consume_op "*"
-
-    if star
-      skip_space_or_newline
-      visit star
-    end
-
-    if after && !after.empty?
-      write_params_comma
-      visit_comma_separated_list after
-    end
-  end
-
   def visit_rest_param(node)
     # [:rest_param, name]
 
@@ -2249,12 +2186,14 @@ class Rufo::Formatter
     end
   end
 
-  def write_params_comma
+  def write_params_comma(with_indent: true)
     skip_space
     check :on_comma
     write ","
     next_token
-    skip_space_or_newline_using_setting(:one)
+
+    indent_size = with_indent ? @indent : 0
+    skip_space_or_newline_using_setting(:one, indent_size)
   end
 
   def visit_array(node)
@@ -2315,6 +2254,12 @@ class Rufo::Formatter
         write_indent next_indent
       end
       next_token
+
+      # fix for 3.3 ripper change. two :on_words_sep are generated for "#\n "
+      while current_token_kind == :on_words_sep
+        next_token
+      end
+
       has_space = true if current_token_value.start_with?(" ")
     end
 
@@ -2337,6 +2282,10 @@ class Rufo::Formatter
             next_token
             write_line
             write_indent(column)
+            # two :on_words_sep are generated for "#\n " on ruby 3.3
+            while current_token_kind == :on_words_sep
+              next_token
+            end
           else
             next_token
             write_space

data/lib/rufo/settings.rb

@@ -4,7 +4,7 @@ module Rufo::Settings
     align_case_when: [false, true],
     align_chained_calls: [false, true],
     trailing_commas: [true, false],
-    quote_style: [:double, :single],
+    quote_style: [:double, :single, :mixed],
     includes: nil,
     excludes: nil,
   }

data/lib/rufo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.17.1
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby code formatter