rufo 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4dd74a9e383128ba24cedbdfc7f008332f3a540ab89f9a5ab33be306413269a
-  data.tar.gz: f725c8a39471a92251294a041a9ae63dcefab5f55614b4ed3215cf11bfb29c4e
+  metadata.gz: 87b000f131dd4c6b9e87e82513ed7009a9cbcc7078e44e51627a8b6205f15ea0
+  data.tar.gz: 05a5878c0d790d5fb867606b2cc6f064f0789757a9eecb62037e2adb41af249a
 SHA512:
-  metadata.gz: a59736abaa4d40516afea2e130c835da5683ac17fbe34f540f64c61ad7a4051c3ba02c05b846b90d97438c6bb0909922261463b3d62003931fde81140ab74295
-  data.tar.gz: 73bb9af67241c6552de2a3a6610d406c5566c50a5e473b753fbd18741d589a9009f6f2578754220456098f92cc91f4f457a29f3c95e51c89b16c8f5f671312b3
+  metadata.gz: 329e2b72b0755c40bb44226722b34199a8907a7911244c330e453d9fe3bc824d45179933d55736162727147068595e8e090f44e1852ad4b5ce0eb794a4dea517
+  data.tar.gz: e44a00c12494e7fd015583ed481e97fca7878115942fb4e5cfa5c10a6575ea46d6d1d21f4157871a738e2f2659354f310f0c4772bcd37922eb97dfb796887ae2

data/CHANGELOG.md

@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.18.2] - 2025-12-24
+
+### Fixed
+
+### Changed
+
+### Added
+- Support formatting ERB native comment. ([#352](https://github.com/ruby-formatter/rufo/pull/352))
+
 ## [0.18.1] - 2025-02-22
 
 ### Fixed

data/Gemfile

@@ -12,4 +12,4 @@ gem "rspec", "~> 3.0"
 gem "rspec_junit_formatter", "~> 0.6.0"
 gem "rubocop", "~> 1.69.2"
 gem "simplecov", "~> 0.22.0"
-gem "simplecov-cobertura", "~> 2.1"
+gem "simplecov-cobertura", "~> 3.1"

data/bin/verify-sample-code

@@ -1,17 +1,20 @@
 #!/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/progress_formatter_spec.rb",
-      "spec/rspec/core/formatters_spec.rb",
-      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
-    ].join(","),
+  "rspec/rspec" => {
+    path: "rspec-core",
+    rspec_flags: {
+      "--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/progress_formatter_spec.rb",
+        "spec/rspec/core/formatters_spec.rb",
+        "spec/rspec/core/formatters/documentation_formatter_spec.rb",
+      ].join(","),
+    },
   },
 }
 
@@ -45,7 +48,7 @@ end
 
 def format_repo(repo)
   run_command(
-    "bundle exec rake rufo:run sample_code/#{repo}",
+    "bundle exec rake rufo:run[sample_code/#{repo}]",
     allowed_statuses: [0, 1, 3],
   )
 end
@@ -54,10 +57,13 @@ def post_format_checks(repo, rspec_flags)
   run_rspec(repo, rspec_flags)
 end
 
-repos.each do |repo, rspec_flags|
+repos.each do |repo, options|
+  path = "#{repo}/#{options[:path]}"
+  rspec_flags = options[:rspec_flags]
+
   clone_repo(repo)
-  setup_repo(repo)
-  pre_format_checks(repo, rspec_flags)
-  format_repo(repo)
-  post_format_checks(repo, rspec_flags)
+  setup_repo(path)
+  pre_format_checks(path, rspec_flags)
+  format_repo(path)
+  post_format_checks(path, rspec_flags)
 end

data/lib/rufo/erb_formatter.rb

@@ -34,7 +34,7 @@ class Rufo::ErbFormatter
   def format
     out = []
     process_erb do |(type, content)|
-      if type == :code
+      if type == :code && !erb_comment?(content)
         formatted_code = process_code(content)
         indented_code = formatted_code.lines.join(" " * current_column)
         out << " #{indented_code} "
@@ -176,4 +176,8 @@ class Rufo::ErbFormatter
   def disable_code_mode
     @code_mode = false
   end
+
+  def erb_comment?(code)
+    code.start_with?("#")
+  end
 end

data/lib/rufo/formatter.rb

@@ -243,35 +243,7 @@ class Rufo::Formatter
     when :string_concat
       visit_string_concat node
     when :@tstring_content
-      # [:@tstring_content, "hello ", [1, 1]]
-      heredoc, tilde = @current_heredoc
-      looking_at_newline = current_token_kind == :on_tstring_content && current_token_value == "\n"
-      if heredoc && tilde && !@last_was_newline && looking_at_newline
-        check :on_tstring_content
-        consume_token_value(current_token_value)
-        next_token
-      else
-        # For heredocs with tilde we sometimes need to align the contents
-        if heredoc && tilde
-          while (current_token_kind == :on_ignored_sp) ||
-                (current_token_kind == :on_tstring_content)
-            if @last_was_newline && current_token_value != "\n"
-              write_indent(next_indent)
-              @last_was_newline = false
-            end
-            if current_token_kind == :on_ignored_sp
-              skip_ignored_space
-            else
-              consume_token current_token_kind
-            end
-          end
-        else
-          while (current_token_kind == :on_ignored_sp) ||
-                (current_token_kind == :on_tstring_content)
-            consume_token current_token_kind
-          end
-        end
-      end
+      visit_at_tstring_content node
     when :string_content
       # [:string_content, exp]
       visit_exps node[1..-1], with_lines: false
@@ -741,6 +713,38 @@ class Rufo::Formatter
     visit string2
   end
 
+  def visit_at_tstring_content(_node)
+    # [:@tstring_content, "hello ", [1, 1]]
+    heredoc, tilde = @current_heredoc
+    looking_at_newline = current_token_kind == :on_tstring_content && current_token_value == "\n"
+    if heredoc && tilde && !@last_was_newline && looking_at_newline
+      check :on_tstring_content
+      consume_token_value(current_token_value)
+      next_token
+    else
+      # For heredocs with tilde we sometimes need to align the contents
+      if heredoc && tilde
+        while (current_token_kind == :on_ignored_sp) ||
+              (current_token_kind == :on_tstring_content)
+          if @last_was_newline && current_token_value != "\n"
+            write_indent(next_indent)
+            @last_was_newline = false
+          end
+          if current_token_kind == :on_ignored_sp
+            skip_ignored_space
+          else
+            consume_token current_token_kind
+          end
+        end
+      else
+        while (current_token_kind == :on_ignored_sp) ||
+              (current_token_kind == :on_tstring_content)
+          consume_token current_token_kind
+        end
+      end
+    end
+  end
+
   def visit_string_interpolation(node)
     # [:string_embexpr, exps]
     consume_token :on_embexpr_beg

data/lib/rufo/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Ary Borenszweig
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-12-24 00:00:00.000000000 Z
 dependencies: []
 description: Fast and unobtrusive Ruby code formatter
 email:
@@ -55,7 +54,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -70,8 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby code formatter
 test_files: []