rufo 0.16.3 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d409deea0a4597c0cab778d78b5d055ef0efe09246063f94d4902b92967590a
-  data.tar.gz: c49924d1209e5ae8e0387ba93596273dfca7e71ae788dc17820fecbf286f62a6
+  metadata.gz: 2415782555ad95778ec90751f3c438320fb1797c44213c458c0d0a7f956cf2fc
+  data.tar.gz: 6e2bed742d8efedef98b59b74acaef679764eeb5911e6fc0b596da1a9cec7807
 SHA512:
-  metadata.gz: 21b4a9ce483440f4a0765b13e2ee5b2101ed9556d59ddc5714df046a773b9060d97d84c7ddfc76e9320f72cb76c5ec4ee304876c77c193108e7e29c7ab630f8e
-  data.tar.gz: f09a85d28f35f086d980ed9d4db3d27503bb6b71ad35d8298d812464d0118f02b28ec25968ebbb822f1266254271970e3960c31cc6de0cd1b04961c7fa1fa250
+  metadata.gz: f103da0397ad0415a031601e14016d0080c9c22cac9d4b3af45a01f7f32a6fd851118d871d09272a8c41c7373ab8e77caac81b815899634eac66941e1f67121c
+  data.tar.gz: dcc1b6e6430818500a3238c1d403dd23abdfc840757318e1746bd388e0d1f4ce9a0df12a232bad5f6691dc69cd9cf6421ea1c74df8ed58c29453ac5260c91c4b

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,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### 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,17 +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(","),
+  "lostisland/faraday" => {
+    "--format" => "progress",
   },
 }
 

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

@@ -636,6 +636,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
@@ -2315,6 +2316,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 +2344,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.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.17.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler