rfmt 1.5.3 → 1.6.1

data/lib/rfmt/prism_bridge.rb

@@ -62,17 +62,28 @@ module Rfmt
     # Serialize the Prism AST with comments to JSON
     def self.serialize_ast_with_comments(result)
       comments = result.comments.map do |comment|
+        loc = comment.location
+        end_line = loc.end_line
+        # Prism's `=begin ... =end` (EmbDocComment) location ends at
+        # `<=end_line>:0`, i.e. the column-0 start of the line AFTER the
+        # `=end` terminator. Reporting that larger end_line makes the
+        # comment appear to overlap with the next statement, so the
+        # comment gets misattributed to a deeper node (e.g. the first
+        # expression inside the next method body) and ends up emitted in
+        # the wrong place. Snap it back to the terminator line.
+        end_line = loc.end_line - 1 if loc.end_column.zero? && loc.end_line > loc.start_line
+
         {
           comment_type: comment.class.name.split('::').last.downcase.gsub('comment', ''),
           location: {
-            start_line: comment.location.start_line,
-            start_column: comment.location.start_column,
-            end_line: comment.location.end_line,
-            end_column: comment.location.end_column,
-            start_offset: comment.location.start_offset,
-            end_offset: comment.location.end_offset
+            start_line: loc.start_line,
+            start_column: loc.start_column,
+            end_line: end_line,
+            end_column: loc.end_column,
+            start_offset: loc.start_offset,
+            end_offset: loc.end_offset
           },
-          text: comment.location.slice,
+          text: loc.slice,
           position: 'leading' # Default position, will be refined by Rust
         }
       end
@@ -120,7 +131,7 @@ module Rfmt
         closing = node.closing_loc
         if closing.end_offset > end_offset
           end_offset = closing.end_offset
-          end_line = closing.end_line
+          end_line = heredoc_terminator_line(closing)
           end_column = closing.end_column
         end
       end
@@ -145,6 +156,19 @@ module Rfmt
       }
     end
 
+    # Prism reports a heredoc's `closing_loc` as `<terminator_line>:0..(terminator_line+1):0`,
+    # i.e. its `end_line` is the LINE AFTER the terminator. Using that as the
+    # node's `end_line` makes blank-line preservation fail: a real blank line
+    # right after the terminator looks identical (diff == 1) to two adjacent
+    # statements with no separator. Use the terminator's own line instead.
+    def self.heredoc_terminator_line(closing_loc)
+      if closing_loc.end_column.zero? && closing_loc.end_line > closing_loc.start_line
+        closing_loc.start_line
+      else
+        closing_loc.end_line
+      end
+    end
+
     # Recursively find the maximum closing_loc among all descendant nodes
     # Returns nil if no closing_loc found, otherwise { end_offset:, end_line:, end_column: }
     def self.find_max_closing_loc_recursive(node, depth: 0)
@@ -158,7 +182,7 @@ module Rfmt
           if max_closing.nil? || closing.end_offset > max_closing[:end_offset]
             max_closing = {
               end_offset: closing.end_offset,
-              end_line: closing.end_line,
+              end_line: heredoc_terminator_line(closing),
               end_column: closing.end_column
             }
           end
@@ -424,9 +448,16 @@ module Rfmt
           metadata['name'] = name
         end
       when Prism::DefNode
-        if (name = extract_node_name(node))
-          metadata['name'] = name
-        end
+        # Prefer `name_loc.slice` over `name.to_s` so unary operator suffixes
+        # (`def !@`, `def +@`, `def -@`) survive the round-trip. Prism
+        # normalizes `name` to the symbol with the `@` stripped for `!@`,
+        # which would otherwise rewrite `def !@` to `def !` silently.
+        name = if node.respond_to?(:name_loc) && node.name_loc
+                 node.name_loc.slice
+               else
+                 extract_node_name(node)
+               end
+        metadata['name'] = name if name
         metadata['parameters_count'] = extract_parameter_count(node).to_s
         # Extract parameters text directly from source
         if node.parameters

data/lib/rfmt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfmt
-  VERSION = '1.5.3'
+  VERSION = '1.6.1'
 end

data/lib/ruby_lsp/rfmt/formatter_runner.rb

@@ -10,6 +10,8 @@ module RubyLsp
       # @return [String, nil] Formatted text or nil on error
       def run_formatting(_uri, document)
         source = document.source
+        return "\n" if source.empty?
+
         ::Rfmt.format(source)
       rescue ::Rfmt::Error
         nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfmt
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.1
 platform: ruby
 authors:
 - fujitani sora
@@ -84,8 +84,29 @@ files:
 - ext/rfmt/extconf.rb
 - ext/rfmt/src/ast/mod.rs
 - ext/rfmt/src/config/mod.rs
-- ext/rfmt/src/emitter/mod.rs
+- ext/rfmt/src/doc/builders.rs
+- ext/rfmt/src/doc/mod.rs
+- ext/rfmt/src/doc/printer.rs
 - ext/rfmt/src/error/mod.rs
+- ext/rfmt/src/format/context.rs
+- ext/rfmt/src/format/formatter.rs
+- ext/rfmt/src/format/mod.rs
+- ext/rfmt/src/format/registry.rs
+- ext/rfmt/src/format/rule.rs
+- ext/rfmt/src/format/rules/begin.rs
+- ext/rfmt/src/format/rules/body_end.rs
+- ext/rfmt/src/format/rules/call.rs
+- ext/rfmt/src/format/rules/case.rs
+- ext/rfmt/src/format/rules/class.rs
+- ext/rfmt/src/format/rules/def.rs
+- ext/rfmt/src/format/rules/fallback.rs
+- ext/rfmt/src/format/rules/if_unless.rs
+- ext/rfmt/src/format/rules/loops.rs
+- ext/rfmt/src/format/rules/mod.rs
+- ext/rfmt/src/format/rules/module.rs
+- ext/rfmt/src/format/rules/singleton_class.rs
+- ext/rfmt/src/format/rules/statements.rs
+- ext/rfmt/src/format/rules/variable_write.rs
 - ext/rfmt/src/lib.rs
 - ext/rfmt/src/logging/logger.rs
 - ext/rfmt/src/logging/mod.rs