spoom 1.7.5 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8704c33b8976616ddeb6d404521a47ab654b6bb652212f35ea9b2c92fa3a9469
-  data.tar.gz: c85e35bac3a99847a82c8234f4303434fede477317fd99ffc79dfcd66789d14b
+  metadata.gz: dee74aa6f300c648be7b9c74808c1f24507e3c806a9fb80565f6bad3a84ca724
+  data.tar.gz: a6202c46d255610003479c753cd209a8511b5bc7511bcfe9d092e7619ed7d68a
 SHA512:
-  metadata.gz: d83c8596f8e10ccb36256d42ed97c3b6eeb69bbb50b922e4b09d088d5a2decadee5103583fa2ab638a359c7f97cb48eec9be695886d11755b24f66ca3c10a538
-  data.tar.gz: 990bcdfb1851ccd8808f4dfd02739cfb96cc35f65ac8b4167849d03b4c08b95904b2cda2c6ef3ec6173df0f7348bac3d1e404c57c39cffa863d83acaf1573160
+  metadata.gz: ed6f6fb93669b54ce54010fb657d8f3264e29e7c825382b49dbbc718aad8d48177392cc3ab89c9a2c669bf183c87653cb5c2682c222c311991cfaaca3f7e5088
+  data.tar.gz: b763bdbc1480b4e6290cd152190726855bd0c0347cfd582ba12d79e3d106703cf3117a471ff4493c7f579d1713260e3c7b423d2de633fafaacb3945b26ae37d4

data/lib/spoom/rbs.rb

@@ -75,9 +75,17 @@ module Spoom
 
         continuation_comments = [] #: Array[Prism::Comment]
 
+        last_line = node.location.start_line
+
         comments.each do |comment|
           string = comment.slice
 
+          comment_line = comment.location.end_line
+
+          break if comment_line < last_line - 1
+
+          last_line = comment_line
+
           if string.start_with?("# @")
             string = string.delete_prefix("#").strip
             res.annotations << Annotation.new(string, comment.location)

data/lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb

@@ -89,18 +89,26 @@ module Spoom
           return false unless translatable_annotation?(node)
           return false unless at_end_of_line?(node)
 
+          trailing_comment, comment_end_offset = extract_trailing_comment(node)
+          # If extract_trailing_comment returns nil when there's an RBS annotation, don't translate
+          return false if trailing_comment.nil? && has_rbs_annotation?(node)
+
           value = T.must(node.arguments&.arguments&.first)
           rbs_annotation = build_rbs_annotation(node)
 
           start_offset = node.location.start_offset
-          end_offset = node.location.end_offset
+          # If there's a trailing comment, replace up to the end of the comment
+          # Otherwise, replace up to the end of the node
+          end_offset = comment_end_offset || node.location.end_offset
 
-          @rewriter << if node.name == :bind
-            Source::Replace.new(start_offset, end_offset - 1, rbs_annotation)
+          replacement = if node.name == :bind
+            "#{rbs_annotation}#{trailing_comment}"
           else
-            Source::Replace.new(start_offset, end_offset - 1, "#{dedent_value(node, value)} #{rbs_annotation}")
+            "#{dedent_value(node, value)} #{rbs_annotation}#{trailing_comment}"
           end
 
+          @rewriter << Source::Replace.new(start_offset, end_offset - 1, replacement)
+
           true
         end
 
@@ -166,7 +174,40 @@ module Spoom
         def at_end_of_line?(node)
           end_offset = node.location.end_offset
           end_offset += 1 while (@ruby_bytes[end_offset] == " ".ord) && (end_offset < @ruby_bytes.size)
-          @ruby_bytes[end_offset] == LINE_BREAK
+          # Check if we're at a newline OR at the start of a comment
+          @ruby_bytes[end_offset] == LINE_BREAK || @ruby_bytes[end_offset] == "#".ord
+        end
+
+        # Check if the node has an RBS annotation comment (#:) after it
+        #: (Prism::Node) -> bool
+        def has_rbs_annotation?(node)
+          end_offset = node.location.end_offset
+          # Skip spaces
+          end_offset += 1 while (@ruby_bytes[end_offset] == " ".ord) && (end_offset < @ruby_bytes.size)
+          # Check if there's a comment starting with #:
+          @ruby_bytes[end_offset] == "#".ord && @ruby_bytes[end_offset + 1] == ":".ord
+        end
+
+        # Extract any trailing comment after the node
+        # Returns [comment_text, comment_end_offset] or [nil, nil] if no comment or RBS annotation
+        #: (Prism::Node) -> [String?, Integer?]
+        def extract_trailing_comment(node)
+          end_offset = node.location.end_offset
+          # Skip spaces
+          end_offset += 1 while (@ruby_bytes[end_offset] == " ".ord) && (end_offset < @ruby_bytes.size)
+          # Check if there's a comment
+          return [nil, nil] unless @ruby_bytes[end_offset] == "#".ord
+
+          # If it's an RBS annotation comment (#:), return nil to prevent translation
+          return [nil, nil] if @ruby_bytes[end_offset + 1] == ":".ord
+
+          # Find the end of the comment (end of line)
+          comment_start = end_offset
+          end_offset += 1 while @ruby_bytes[end_offset] != LINE_BREAK && end_offset < @ruby_bytes.size
+
+          # Extract the comment including the leading space and return the end offset
+          range = @ruby_bytes[comment_start...end_offset] #: as !nil
+          [" #{range.pack("C*")}", end_offset]
         end
 
         #: (Prism::Node, Prism::Node) -> String

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.7.5"
+  VERSION = "1.7.7"
 end

data/rbi/spoom.rbi

@@ -2950,6 +2950,12 @@ class Spoom::Sorbet::Translate::SorbetAssertionsToRBSComments < ::Spoom::Sorbet:
   sig { params(assign: ::Prism::Node, value: ::Prism::Node).returns(::String) }
   def dedent_value(assign, value); end
 
+  sig { params(node: ::Prism::Node).returns([T.nilable(::String), T.nilable(::Integer)]) }
+  def extract_trailing_comment(node); end
+
+  sig { params(node: ::Prism::Node).returns(T::Boolean) }
+  def has_rbs_annotation?(node); end
+
   sig { params(node: ::Prism::Node).returns(T::Boolean) }
   def maybe_translate_assertion(node); end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.7
 platform: ruby
 authors:
 - Alexandre Terrasa
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Useful tools for Sorbet enthusiasts.
 test_files: []