spoom 1.7.3 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8447b66e12a52fef3147761f8331749ba52cebaaba146888a7ca35a253acdf9
-  data.tar.gz: d6a84c3091e71c56d26aceebb40f3a6486589266c0b9b984268bf32036b98a26
+  metadata.gz: 8704c33b8976616ddeb6d404521a47ab654b6bb652212f35ea9b2c92fa3a9469
+  data.tar.gz: c85e35bac3a99847a82c8234f4303434fede477317fd99ffc79dfcd66789d14b
 SHA512:
-  metadata.gz: 9827d000700721b1e30028eedcaf41c5e5e45811e1b62693dbaa2d859b5adf379c5f5da4acbaac8e0a0a78a8bb4928fbd5d8a395b5527a7c1f3fc0a72f207cc3
-  data.tar.gz: a7c46380dc2e26c622b8b96290964ede0b5f455d060a176d1336db3aa09ca3e7dbccb656d7a6c1451e43406b0e9cf7847b9a985418b905ae8114c20dae294240
+  metadata.gz: d83c8596f8e10ccb36256d42ed97c3b6eeb69bbb50b922e4b09d088d5a2decadee5103583fa2ab638a359c7f97cb48eec9be695886d11755b24f66ca3c10a538
+  data.tar.gz: 990bcdfb1851ccd8808f4dfd02739cfb96cc35f65ac8b4167849d03b4c08b95904b2cda2c6ef3ec6173df0f7348bac3d1e404c57c39cffa863d83acaf1573160

data/lib/spoom/cli/helper.rb

@@ -7,13 +7,10 @@ require "stringio"
 
 module Spoom
   module Cli
+    # @requires_ancestor: Thor
     module Helper
-      extend T::Helpers
-
       include Colorize
 
-      requires_ancestor { Thor }
-
       # Print `message` on `$stdout`
       #: (String message) -> void
       def say(message)

data/lib/spoom/cli/srb/assertions.rb

@@ -10,6 +10,11 @@ module Spoom
         desc "translate", "Translate type assertions from/to RBI and RBS"
         option :from, type: :string, aliases: :f, desc: "From format", enum: ["rbi"], default: "rbi"
         option :to, type: :string, aliases: :t, desc: "To format", enum: ["rbs"], default: "rbs"
+        option :translate_t_let, type: :boolean, aliases: :t_let, desc: "Translate `T.let`", default: true
+        option :translate_t_cast, type: :boolean, aliases: :t_cast, desc: "Translate `T.cast`", default: true
+        option :translate_t_bind, type: :boolean, aliases: :t_bind, desc: "Translate `T.bind`", default: true
+        option :translate_t_must, type: :boolean, aliases: :t_must, desc: "Translate `T.must`", default: true
+        option :translate_t_unsafe, type: :boolean, aliases: :t_unsafe, desc: "Translate `T.unsafe`", default: true
         def translate(*paths)
           from = options[:from]
           to = options[:to]
@@ -19,7 +24,15 @@ module Spoom
             "in `#{files.size}` file#{files.size == 1 ? "" : "s"}...\n\n")
 
           transformed_files = transform_files(files) do |file, contents|
-            Spoom::Sorbet::Translate.sorbet_assertions_to_rbs_comments(contents, file: file)
+            Spoom::Sorbet::Translate.sorbet_assertions_to_rbs_comments(
+              contents,
+              file: file,
+              translate_t_let: options[:translate_t_let],
+              translate_t_cast: options[:translate_t_cast],
+              translate_t_bind: options[:translate_t_bind],
+              translate_t_must: options[:translate_t_must],
+              translate_t_unsafe: options[:translate_t_unsafe],
+            )
           end
 
           say("Translated type assertions in `#{transformed_files}` file#{transformed_files == 1 ? "" : "s"}.")

data/lib/spoom/cli/srb/sigs.rb

@@ -16,15 +16,29 @@ module Spoom
           desc: "Use positional names when translating from RBI to RBS",
           default: true
         option :include_rbi_files, type: :boolean, desc: "Include RBI files", default: false
+        option :max_line_length, type: :numeric, desc: "Max line length (pass 0 to disable)", default: 120
+        option :translate_generics, type: :boolean, desc: "Translate generics", default: false
+        option :translate_helpers, type: :boolean, desc: "Translate helpers", default: false
+        option :translate_abstract_methods, type: :boolean, desc: "Translate abstract methods", default: false
         def translate(*paths)
           from = options[:from]
           to = options[:to]
+          max_line_length = options[:max_line_length]
 
           if from == to
             say_error("Can't translate signatures from `#{from}` to `#{to}`")
             exit(1)
           end
 
+          if max_line_length.nil? || max_line_length.zero?
+            max_line_length = nil
+          elsif max_line_length.negative?
+            say_error("--max-line-length can't be negative")
+            exit(1)
+          else
+            max_line_length = max_line_length.to_i
+          end
+
           files = collect_files(paths, include_rbi_files: options[:include_rbi_files])
 
           say("Translating signatures from `#{from}` to `#{to}` " \
@@ -33,11 +47,23 @@ module Spoom
           case from
           when "rbi"
             transformed_files = transform_files(files) do |file, contents|
-              Spoom::Sorbet::Translate.sorbet_sigs_to_rbs_comments(contents, file: file, positional_names: options[:positional_names])
+              Spoom::Sorbet::Translate.sorbet_sigs_to_rbs_comments(
+                contents,
+                file: file,
+                positional_names: options[:positional_names],
+                max_line_length: max_line_length,
+                translate_generics: options[:translate_generics],
+                translate_helpers: options[:translate_helpers],
+                translate_abstract_methods: options[:translate_abstract_methods],
+              )
             end
           when "rbs"
             transformed_files = transform_files(files) do |file, contents|
-              Spoom::Sorbet::Translate.rbs_comments_to_sorbet_sigs(contents, file: file)
+              Spoom::Sorbet::Translate.rbs_comments_to_sorbet_sigs(
+                contents,
+                file: file,
+                max_line_length: max_line_length,
+              )
             end
           end
 
@@ -136,7 +162,7 @@ module Spoom
 
             # DO NOT EDIT MANUALLY
             # This is an autogenerated file for types exported from the `#{spec.name}` gem.
-            # Please instead update this file by running `spoom srb sigs export`.
+            # Please instead update this file by running `bundle exec spoom srb sigs export`.
           RB
 
           output_path ||= "rbi/#{spec.name}.rbi"
@@ -149,7 +175,7 @@ module Spoom
               say_error(<<~ERR, status: "\nError")
                 The RBI file at `#{output_path}` is not up to date
 
-                Please run `spoom srb sigs export` to update it.
+                Please run `bundle exec spoom srb sigs export` to update it.
               ERR
               exit(1)
             end

data/lib/spoom/context/bundle.rb

@@ -4,11 +4,8 @@
 module Spoom
   class Context
     # Bundle features for a context
+    # @requires_ancestor: Context
     module Bundle
-      extend T::Helpers
-
-      requires_ancestor { Context }
-
       # Read the contents of the Gemfile in this context directory
       #: -> String?
       def read_gemfile

data/lib/spoom/context/exec.rb

@@ -22,11 +22,8 @@ module Spoom
 
   class Context
     # Execution features for a context
+    # @requires_ancestor: Context
     module Exec
-      extend T::Helpers
-
-      requires_ancestor { Context }
-
       # Run a command in this context directory
       #: (String command, ?capture_err: bool) -> ExecResult
       def exec(command, capture_err: true)

data/lib/spoom/context/file_system.rb

@@ -4,11 +4,8 @@
 module Spoom
   class Context
     # File System features for a context
+    # @requires_ancestor: Context
     module FileSystem
-      extend T::Helpers
-
-      requires_ancestor { Context }
-
       # Returns the absolute path to `relative_path` in the context's directory
       #: (String relative_path) -> String
       def absolute_path_to(relative_path)

data/lib/spoom/context/git.rb

@@ -28,11 +28,8 @@ module Spoom
 
   class Context
     # Git features for a context
+    # @requires_ancestor: Context
     module Git
-      extend T::Helpers
-
-      requires_ancestor { Context }
-
       # Run a command prefixed by `git` in this context directory
       #: (String command) -> ExecResult
       def git(command)

data/lib/spoom/context/sorbet.rb

@@ -4,11 +4,8 @@
 module Spoom
   class Context
     # Sorbet features for a context
+    # @requires_ancestor: Context
     module Sorbet
-      extend T::Helpers
-
-      requires_ancestor { Context }
-
       # Run `bundle exec srb` in this context directory
       #: (*String arg, ?sorbet_bin: String?, ?capture_err: bool) -> ExecResult
       def srb(*arg, sorbet_bin: nil, capture_err: true)

data/lib/spoom/coverage/d3/base.rb

@@ -4,12 +4,8 @@
 module Spoom
   module Coverage
     module D3
+      # @abstract
       class Base
-        extend T::Sig
-        extend T::Helpers
-
-        abstract!
-
         #: String
         attr_reader :id
 
@@ -44,8 +40,9 @@ module Spoom
           ""
         end
 
-        sig { abstract.returns(String) }
-        def script; end
+        # @abstract
+        #: -> String
+        def script = raise NotImplementedError, "Abstract method called"
       end
     end
   end

data/lib/spoom/coverage/d3/pie.rb

@@ -6,11 +6,8 @@ require_relative "base"
 module Spoom
   module Coverage
     module D3
+      # @abstract
       class Pie < Base
-        extend T::Helpers
-
-        abstract!
-
         #: (String id, String title, untyped data) -> void
         def initialize(id, title, data)
           super(id, data)

data/lib/spoom/coverage/d3/timeline.rb

@@ -6,11 +6,8 @@ require_relative "base"
 module Spoom
   module Coverage
     module D3
+      # @abstract
       class Timeline < Base
-        extend T::Helpers
-
-        abstract!
-
         #: (String id, untyped data, Array[String] keys) -> void
         def initialize(id, data, keys)
           super(id, data)
@@ -120,8 +117,9 @@ module Spoom
           HTML
         end
 
-        sig { abstract.returns(String) }
-        def plot; end
+        # @abstract
+        #: -> String
+        def plot = raise NotImplementedError, "Abstract method called"
 
         #: -> String
         def x_scale
@@ -324,11 +322,8 @@ module Spoom
           end
         end
 
+        # @abstract
         class Stacked < Timeline
-          extend T::Helpers
-
-          abstract!
-
           # @override
           #: -> String
           def script

data/lib/spoom/coverage/report.rb

@@ -7,11 +7,8 @@ require "erb"
 
 module Spoom
   module Coverage
+    # @abstract
     class Template
-      extend T::Helpers
-
-      abstract!
-
       # Create a new template from an Erb file path
       #: (template: String) -> void
       def initialize(template:)
@@ -34,12 +31,8 @@ module Spoom
       end
     end
 
+    # @abstract
     class Page < Template
-      extend T::Sig
-      extend T::Helpers
-
-      abstract!
-
       TEMPLATE = "#{Spoom::SPOOM_PATH}/templates/page.erb" #: String
 
       #: String
@@ -75,8 +68,9 @@ module Spoom
         cards.map(&:html).join("\n")
       end
 
-      sig { abstract.returns(T::Array[Cards::Card]) }
-      def cards; end
+      # @abstract
+      #: -> Array[Cards::Card]
+      def cards = raise NotImplementedError, "Abstract method called"
 
       #: -> String
       def footer_html
@@ -86,8 +80,6 @@ module Spoom
 
     module Cards
       class Card < Template
-        extend T::Sig
-
         TEMPLATE = "#{Spoom::SPOOM_PATH}/templates/card.erb" #: String
 
         #: String?
@@ -101,11 +93,8 @@ module Spoom
         end
       end
 
+      # @abstract
       class Erb < Card
-        extend T::Helpers
-
-        abstract!
-
         #: -> void
         def initialize; end # rubocop:disable Lint/MissingSuper
 
@@ -115,8 +104,9 @@ module Spoom
           ERB.new(erb).result(get_binding)
         end
 
-        sig { abstract.returns(String) }
-        def erb; end
+        # @abstract
+        #: -> String
+        def erb = raise NotImplementedError, "Abstract method called"
       end
 
       class Snapshot < Card

data/lib/spoom/deadcode/plugins/base.rb

@@ -6,11 +6,8 @@ require "set"
 module Spoom
   module Deadcode
     module Plugins
+      # @abstract
       class Base
-        extend T::Helpers
-
-        abstract!
-
         class << self
           # Plugins DSL
 

data/lib/spoom/file_tree.rb

@@ -94,11 +94,8 @@ module Spoom
     end
 
     # An abstract visitor for FileTree
+    # @abstract
     class Visitor
-      extend T::Helpers
-
-      abstract!
-
       #: (FileTree tree) -> void
       def visit_tree(tree)
         visit_nodes(tree.roots)

data/lib/spoom/model/model.rb

@@ -63,11 +63,8 @@ module Spoom
     #
     # It can be a class, module, constant, method, etc.
     # A SymbolDef has a location pointing to the actual code that defines the symbol.
+    # @abstract
     class SymbolDef
-      extend T::Helpers
-
-      abstract!
-
       # The symbol this definition belongs to
       #: Symbol
       attr_reader :symbol
@@ -109,9 +106,8 @@ module Spoom
     end
 
     # A class or module
+    # @abstract
     class Namespace < SymbolDef
-      abstract!
-
       #: Array[SymbolDef]
       attr_reader :children
 
@@ -156,9 +152,8 @@ module Spoom
     end
 
     # A method or an attribute accessor
+    # @abstract
     class Property < SymbolDef
-      abstract!
-
       #: Visibility
       attr_reader :visibility
 
@@ -176,8 +171,8 @@ module Spoom
 
     class Method < Property; end
 
+    # @abstract
     class Attr < Property
-      abstract!
     end
 
     class AttrReader < Attr; end
@@ -193,11 +188,8 @@ module Spoom
     end
 
     # A mixin (include, prepend, extend) to a namespace
+    # @abstract
     class Mixin
-      extend T::Helpers
-
-      abstract!
-
       #: String
       attr_reader :name
 
@@ -234,7 +226,7 @@ module Spoom
     #: -> void
     def initialize
       @symbols = {} #: Hash[String, Symbol]
-      @symbols_hierarchy = Poset[Symbol].new #: Poset[Symbol]
+      @symbols_hierarchy = Poset.new #: Poset[Symbol]
     end
 
     # Get a symbol by it's full name

data/lib/spoom/model/namespace_visitor.rb

@@ -3,11 +3,8 @@
 
 module Spoom
   class Model
+    # @abstract
     class NamespaceVisitor < Visitor
-      extend T::Helpers
-
-      abstract!
-
       #: -> void
       def initialize
         super()

data/lib/spoom/poset.rb

@@ -6,13 +6,10 @@ module Spoom
   #
   # The partial order relation is a binary relation that is reflexive, antisymmetric, and transitive.
   # It can be used to represent a hierarchy of classes or modules, the dependencies between gems, etc.
+  #: [E < Object]
   class Poset
-    extend T::Generic
-
     class Error < Spoom::Error; end
 
-    E = type_member { { upper: Object } }
-
     #: -> void
     def initialize
       @elements = {} #: Hash[E, Element[E]]
@@ -35,7 +32,7 @@ module Spoom
       element = @elements[value]
       return element if element
 
-      @elements[value] = Element[E].new(value)
+      @elements[value] = Element.new(value) #: Element[E]
     end
 
     # Is the given value a element in the POSet?
@@ -132,12 +129,10 @@ module Spoom
     end
 
     # An element in a POSet
+    #: [E < Object]
     class Element
-      extend T::Generic
       include Comparable
 
-      E = type_member { { upper: Object } }
-
       # The value held by this element
       #: E
       attr_reader :value

data/lib/spoom/sorbet/lsp/structures.rb

@@ -6,14 +6,11 @@ require "set"
 
 module Spoom
   module LSP
+    # @interface
     module PrintableSymbol
-      extend T::Sig
-      extend T::Helpers
-
-      interface!
-
-      sig { abstract.params(printer: SymbolPrinter).void }
-      def accept_printer(printer); end
+      # @abstract
+      #: (SymbolPrinter printer) -> void
+      def accept_printer(printer) = raise NotImplementedError, "Abstract method called"
     end
 
     class Hover < T::Struct

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

@@ -7,6 +7,13 @@ module Spoom
       class RBSCommentsToSorbetSigs < Translator
         include Spoom::RBS::ExtractRBSComments
 
+        #: (String, file: String, ?max_line_length: Integer?) -> void
+        def initialize(ruby_contents, file:, max_line_length: nil)
+          super(ruby_contents, file: file)
+
+          @max_line_length = max_line_length
+        end
+
         # @override
         #: (Prism::ClassNode node) -> void
         def visit_class_node(node)
@@ -34,31 +41,7 @@ module Spoom
         # @override
         #: (Prism::DefNode node) -> void
         def visit_def_node(node)
-          comments = node_rbs_comments(node)
-          return if comments.empty?
-
-          return if comments.signatures.empty?
-
-          builder = RBI::Parser::TreeBuilder.new(@ruby_contents, comments: [], file: @file)
-          builder.visit(node)
-          rbi_node = builder.tree.nodes.first #: as RBI::Method
-
-          comments.signatures.each do |signature|
-            method_type = ::RBS::Parser.parse_method_type(signature.string)
-            translator = RBI::RBS::MethodTypeTranslator.new(rbi_node)
-            translator.visit(method_type)
-            sig = translator.result
-            apply_member_annotations(comments.method_annotations, sig)
-
-            @rewriter << Source::Replace.new(
-              signature.location.start_offset,
-              signature.location.end_offset,
-              sig.string,
-            )
-          rescue ::RBS::ParsingError, ::RBI::Error
-            # Ignore signatures with errors
-            next
-          end
+          rewrite_def(node, node_rbs_comments(node))
         end
 
         # @override
@@ -68,6 +51,12 @@ module Spoom
           when "attr_reader", "attr_writer", "attr_accessor"
             visit_attr(node)
           else
+            def_node = node.arguments&.arguments&.first
+            if def_node&.is_a?(Prism::DefNode)
+              rewrite_def(def_node, node_rbs_comments(node))
+              return
+            end
+
             super
           end
         end
@@ -104,7 +93,7 @@ module Spoom
             @rewriter << Source::Replace.new(
               signature.location.start_offset,
               signature.location.end_offset,
-              sig.string,
+              sig.string(max_line_length: @max_line_length),
             )
           rescue ::RBS::ParsingError, ::RBI::Error
             # Ignore signatures with errors
@@ -112,6 +101,42 @@ module Spoom
           end
         end
 
+        #: (Prism::DefNode, RBS::Comments) -> void
+        def rewrite_def(def_node, comments)
+          return if comments.empty?
+          return if comments.signatures.empty?
+
+          builder = RBI::Parser::TreeBuilder.new(@ruby_contents, comments: [], file: @file)
+          builder.visit(def_node)
+          rbi_node = builder.tree.nodes.first #: as RBI::Method
+
+          comments.signatures.each do |signature|
+            begin
+              method_type = ::RBS::Parser.parse_method_type(signature.string)
+            rescue ::RBS::ParsingError
+              next
+            end
+
+            translator = RBI::RBS::MethodTypeTranslator.new(rbi_node)
+
+            begin
+              translator.visit(method_type)
+            rescue ::RBI::Error
+              next
+            end
+
+            sig = translator.result
+
+            apply_member_annotations(comments.method_annotations, sig)
+
+            @rewriter << Source::Replace.new(
+              signature.location.start_offset,
+              signature.location.end_offset,
+              sig.string(max_line_length: @max_line_length),
+            )
+          end
+        end
+
         #: (Prism::ClassNode | Prism::ModuleNode | Prism::SingletonClassNode) -> void
         def apply_class_annotations(node)
           comments = node_rbs_comments(node)

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

@@ -8,6 +8,33 @@ module Spoom
       class SorbetAssertionsToRBSComments < Translator
         LINE_BREAK = "\n".ord #: Integer
 
+        #: (
+        #|  String,
+        #|  file: String,
+        #|  ?translate_t_let: bool,
+        #|  ?translate_t_cast: bool,
+        #|  ?translate_t_bind: bool,
+        #|  ?translate_t_must: bool,
+        #|  ?translate_t_unsafe: bool,
+        #| ) -> void
+        def initialize(
+          ruby_contents,
+          file:,
+          translate_t_let: true,
+          translate_t_cast: true,
+          translate_t_bind: true,
+          translate_t_must: true,
+          translate_t_unsafe: true
+        )
+          super(ruby_contents, file: file)
+
+          @translate_t_let = translate_t_let
+          @translate_t_cast = translate_t_cast
+          @translate_t_bind = translate_t_bind
+          @translate_t_must = translate_t_must
+          @translate_t_unsafe = translate_t_unsafe
+        end
+
         # @override
         #: (Prism::StatementsNode) -> void
         def visit_statements_node(node)
@@ -59,7 +86,7 @@ module Spoom
           end
 
           return false unless node.is_a?(Prism::CallNode)
-          return false unless t_annotation?(node)
+          return false unless translatable_annotation?(node)
           return false unless at_end_of_line?(node)
 
           value = T.must(node.arguments&.arguments&.first)
@@ -116,16 +143,20 @@ module Spoom
 
         # Is this node a `T.let` or `T.cast`?
         #: (Prism::CallNode) -> bool
-        def t_annotation?(node)
+        def translatable_annotation?(node)
           return false unless t?(node.receiver)
 
           case node.name
-          when :let, :cast
-            return node.arguments&.arguments&.size == 2
+          when :let
+            return @translate_t_let && node.arguments&.arguments&.size == 2
+          when :cast
+            return @translate_t_cast && node.arguments&.arguments&.size == 2
           when :bind
-            return node.arguments&.arguments&.size == 2 && node.arguments&.arguments&.first.is_a?(Prism::SelfNode)
-          when :must, :unsafe
-            return node.arguments&.arguments&.size == 1
+            return @translate_t_bind && node.arguments&.arguments&.size == 2 && node.arguments&.arguments&.first.is_a?(Prism::SelfNode)
+          when :must
+            return @translate_t_must && node.arguments&.arguments&.size == 1
+          when :unsafe
+            return @translate_t_unsafe && node.arguments&.arguments&.size == 1
           end
 
           false

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

@@ -7,8 +7,24 @@ module Spoom
       # Converts all `sig` nodes to RBS comments in the given Ruby code.
       # It also handles type members and class annotations.
       class SorbetSigsToRBSComments < Translator
-        #: (String, file: String, positional_names: bool) -> void
-        def initialize(ruby_contents, file:, positional_names:)
+        #: (
+        #|   String,
+        #|   file: String,
+        #|   positional_names: bool,
+        #|   ?max_line_length: Integer?,
+        #|   ?translate_generics: bool,
+        #|   ?translate_helpers: bool,
+        #|   ?translate_abstract_methods: bool
+        #| ) -> void
+        def initialize(
+          ruby_contents,
+          file:,
+          positional_names:,
+          max_line_length: nil,
+          translate_generics: true,
+          translate_helpers: true,
+          translate_abstract_methods: true
+        )
           super(ruby_contents, file: file)
 
           @positional_names = positional_names #: bool
@@ -18,6 +34,11 @@ module Spoom
           @extend_t_helpers = [] #: Array[Prism::CallNode]
           @extend_t_generics = [] #: Array[Prism::CallNode]
           @seen_mixes_in_class_methods = false #: bool
+          @max_line_length = max_line_length #: Integer?
+
+          @translate_generics = translate_generics #: bool
+          @translate_helpers = translate_helpers #: bool
+          @translate_abstract_methods = translate_abstract_methods #: bool
         end
 
         # @override
@@ -43,7 +64,6 @@ module Spoom
         def visit_def_node(node)
           last_sigs = collect_last_sigs
           return if last_sigs.empty?
-          return if last_sigs.any? { |_, sig| sig.is_abstract }
 
           apply_member_annotations(last_sigs)
 
@@ -53,12 +73,25 @@ module Spoom
           rbi_node = builder.tree.nodes.first #: as RBI::Method
 
           last_sigs.each do |node, sig|
-            out = StringIO.new
-            p = RBI::RBSPrinter.new(out: out, indent: node.location.start_column, positional_names: @positional_names)
-            p.print("#: ")
-            p.send(:print_method_sig, rbi_node, sig)
-            p.print("\n")
-            @rewriter << Source::Replace.new(node.location.start_offset, node.location.end_offset, out.string)
+            next if sig.is_abstract && !@translate_abstract_methods
+
+            out = rbs_print(node.location.start_column) do |printer|
+              printer.print_method_sig(rbi_node, sig)
+            end
+            @rewriter << Source::Replace.new(node.location.start_offset, node.location.end_offset, out)
+          end
+
+          if @translate_abstract_methods && last_sigs.any? { |_, sig| sig.is_abstract }
+            @rewriter << Source::Replace.new(
+              node.rparen_loc&.end_offset || node.name_loc.end_offset,
+              node.location.end_offset - 1,
+              if node.name.end_with?("=")
+                indent = " " * node.location.start_column
+                "\n#{indent}  raise NotImplementedError, \"Abstract method called\"\n#{indent}end"
+              else
+                " = raise NotImplementedError, \"Abstract method called\""
+              end,
+            )
           end
         end
 
@@ -84,6 +117,8 @@ module Spoom
         # @override
         #: (Prism::ConstantWriteNode) -> void
         def visit_constant_write_node(node)
+          return super unless @translate_generics
+
           call = node.value
           return super unless call.is_a?(Prism::CallNode)
           return super unless call.message == "type_member"
@@ -114,19 +149,23 @@ module Spoom
 
           yield
 
-          delete_extend_t_generics
+          if @translate_generics
+            delete_extend_t_generics
 
-          if @type_members.any?
-            indent = " " * node.location.start_column
-            @rewriter << Source::Insert.new(node.location.start_offset, "#: [#{@type_members.join(", ")}]\n#{indent}")
+            if @type_members.any?
+              indent = " " * node.location.start_column
+              @rewriter << Source::Insert.new(node.location.start_offset, "#: [#{@type_members.join(", ")}]\n#{indent}")
+            end
           end
 
-          unless @seen_mixes_in_class_methods
-            delete_extend_t_helpers
-          end
+          if @translate_helpers
+            unless @seen_mixes_in_class_methods
+              delete_extend_t_helpers
+            end
 
-          @class_annotations.each do |call|
-            apply_class_annotation(node, call)
+            @class_annotations.each do |call|
+              apply_class_annotation(node, call)
+            end
           end
 
           @class_annotations = old_class_annotations
@@ -165,12 +204,10 @@ module Spoom
           rbi_node = builder.tree.nodes.first #: as RBI::Attr
 
           last_sigs.each do |node, sig|
-            out = StringIO.new
-            p = RBI::RBSPrinter.new(out: out, indent: node.location.start_column, positional_names: @positional_names)
-            p.print("#: ")
-            p.print_attr_sig(rbi_node, sig)
-            p.print("\n")
-            @rewriter << Source::Replace.new(node.location.start_offset, node.location.end_offset, out.string)
+            out = rbs_print(node.location.start_column) do |printer|
+              printer.print_attr_sig(rbi_node, sig)
+            end
+            @rewriter << Source::Replace.new(node.location.start_offset, node.location.end_offset, out)
           end
         end
 
@@ -240,23 +277,25 @@ module Spoom
           node, _sig = sigs.first #: as [Prism::CallNode, RBI::Sig]
           insert_pos = node.location.start_offset
 
+          indent = " " * node.location.start_column
+
           if sigs.any? { |_, sig| sig.without_runtime }
-            @rewriter << Source::Insert.new(insert_pos, "# @without_runtime\n")
+            @rewriter << Source::Insert.new(insert_pos, "# @without_runtime\n#{indent}")
           end
 
           if sigs.any? { |_, sig| sig.is_final }
-            @rewriter << Source::Insert.new(insert_pos, "# @final\n")
+            @rewriter << Source::Insert.new(insert_pos, "# @final\n#{indent}")
           end
 
-          if sigs.any? { |_, sig| sig.is_abstract }
-            @rewriter << Source::Insert.new(insert_pos, "# @abstract\n")
+          if sigs.any? { |_, sig| sig.is_abstract } && @translate_abstract_methods
+            @rewriter << Source::Insert.new(insert_pos, "# @abstract\n#{indent}")
           end
 
           if sigs.any? { |_, sig| sig.is_override }
             @rewriter << if sigs.any? { |_, sig| sig.allow_incompatible_override }
-              Source::Insert.new(insert_pos, "# @override(allow_incompatible: true)\n")
+              Source::Insert.new(insert_pos, "# @override(allow_incompatible: true)\n#{indent}")
             else
-              Source::Insert.new(insert_pos, "# @override\n")
+              Source::Insert.new(insert_pos, "# @override\n#{indent}")
             end
           end
 
@@ -342,6 +381,22 @@ module Spoom
           @last_sigs = []
           last_sigs
         end
+
+        #: (Integer) { (RBI::RBSPrinter) -> void } -> String
+        def rbs_print(indent, &block)
+          out = StringIO.new
+          p = RBI::RBSPrinter.new(out: out, positional_names: @positional_names, max_line_length: @max_line_length)
+          block.call(p)
+          string = out.string
+
+          string.lines.map.with_index do |line, index|
+            if index == 0
+              "#: #{line}"
+            else
+              "#{" " * indent}#| #{line}"
+            end
+          end.join + "\n"
+        end
       end
     end
   end

data/lib/spoom/sorbet/translate.rb

@@ -25,23 +25,67 @@ module Spoom
 
         # Converts all `sig` nodes to RBS comments in the given Ruby code.
         # It also handles type members and class annotations.
-        #: (String ruby_contents, file: String, ?positional_names: bool) -> String
-        def sorbet_sigs_to_rbs_comments(ruby_contents, file:, positional_names: true)
-          SorbetSigsToRBSComments.new(ruby_contents, file: file, positional_names: positional_names).rewrite
+        #: (
+        #|   String,
+        #|   file: String,
+        #|   ?positional_names: bool,
+        #|   ?max_line_length: Integer?,
+        #|   ?translate_generics: bool,
+        #|   ?translate_helpers: bool,
+        #|   ?translate_abstract_methods: bool
+        #| ) -> String
+        def sorbet_sigs_to_rbs_comments(
+          ruby_contents, file:, positional_names: true, max_line_length: nil,
+          translate_generics: true,
+          translate_helpers: true,
+          translate_abstract_methods: true
+        )
+          SorbetSigsToRBSComments.new(
+            ruby_contents,
+            file: file,
+            positional_names: positional_names,
+            max_line_length: max_line_length,
+            translate_generics: translate_generics,
+            translate_helpers: translate_helpers,
+            translate_abstract_methods: translate_abstract_methods,
+          ).rewrite
         end
 
         # Converts all the RBS comments in the given Ruby code to `sig` nodes.
         # It also handles type members and class annotations.
-        #: (String ruby_contents, file: String) -> String
-        def rbs_comments_to_sorbet_sigs(ruby_contents, file:)
-          RBSCommentsToSorbetSigs.new(ruby_contents, file: file).rewrite
+        #: (String ruby_contents, file: String, ?max_line_length: Integer?) -> String
+        def rbs_comments_to_sorbet_sigs(ruby_contents, file:, max_line_length: nil)
+          RBSCommentsToSorbetSigs.new(ruby_contents, file: file, max_line_length: max_line_length).rewrite
         end
 
         # Converts all `T.let` and `T.cast` nodes to RBS comments in the given Ruby code.
         # It also handles type members and class annotations.
-        #: (String ruby_contents, file: String) -> String
-        def sorbet_assertions_to_rbs_comments(ruby_contents, file:)
-          SorbetAssertionsToRBSComments.new(ruby_contents, file: file).rewrite
+        #: (
+        #|  String,
+        #|  file: String,
+        #|  ?translate_t_let: bool,
+        #|  ?translate_t_cast: bool,
+        #|  ?translate_t_bind: bool,
+        #|  ?translate_t_must: bool,
+        #|  ?translate_t_unsafe: bool
+        #| ) -> String
+        def sorbet_assertions_to_rbs_comments(
+          ruby_contents, file:,
+          translate_t_let: true,
+          translate_t_cast: true,
+          translate_t_bind: true,
+          translate_t_must: true,
+          translate_t_unsafe: true
+        )
+          SorbetAssertionsToRBSComments.new(
+            ruby_contents,
+            file: file,
+            translate_t_let: translate_t_let,
+            translate_t_cast: translate_t_cast,
+            translate_t_bind: translate_t_bind,
+            translate_t_must: translate_t_must,
+            translate_t_unsafe: translate_t_unsafe,
+          ).rewrite
         end
       end
     end

data/lib/spoom/source/rewriter.rb

@@ -29,11 +29,11 @@ module Spoom
     class Edit
       # @abstract
       #: (Array[Integer]) -> void
-      def apply(bytes); end
+      def apply(bytes) = raise NotImplementedError, "Abstract method called"
 
       # @abstract
       #: -> [Integer, Integer]
-      def range; end
+      def range = raise NotImplementedError, "Abstract method called"
     end
 
     class Insert < Edit

data/lib/spoom/version.rb

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

data/rbi/spoom.rbi

@@ -2,7 +2,7 @@
 
 # DO NOT EDIT MANUALLY
 # This is an autogenerated file for types exported from the `spoom` gem.
-# Please instead update this file by running `spoom srb sigs export`.
+# Please instead update this file by running `bundle exec spoom srb sigs export`.
 
 module Spoom
   class << self
@@ -2839,14 +2839,34 @@ Spoom::Sorbet::Sigils::VALID_STRICTNESS = T.let(T.unsafe(nil), Array)
 
 module Spoom::Sorbet::Translate
   class << self
-    sig { params(ruby_contents: ::String, file: ::String).returns(::String) }
-    def rbs_comments_to_sorbet_sigs(ruby_contents, file:); end
+    sig { params(ruby_contents: ::String, file: ::String, max_line_length: T.nilable(::Integer)).returns(::String) }
+    def rbs_comments_to_sorbet_sigs(ruby_contents, file:, max_line_length: T.unsafe(nil)); end
 
-    sig { params(ruby_contents: ::String, file: ::String).returns(::String) }
-    def sorbet_assertions_to_rbs_comments(ruby_contents, file:); end
+    sig do
+      params(
+        ruby_contents: ::String,
+        file: ::String,
+        translate_t_let: T::Boolean,
+        translate_t_cast: T::Boolean,
+        translate_t_bind: T::Boolean,
+        translate_t_must: T::Boolean,
+        translate_t_unsafe: T::Boolean
+      ).returns(::String)
+    end
+    def sorbet_assertions_to_rbs_comments(ruby_contents, file:, translate_t_let: T.unsafe(nil), translate_t_cast: T.unsafe(nil), translate_t_bind: T.unsafe(nil), translate_t_must: T.unsafe(nil), translate_t_unsafe: T.unsafe(nil)); end
 
-    sig { params(ruby_contents: ::String, file: ::String, positional_names: T::Boolean).returns(::String) }
-    def sorbet_sigs_to_rbs_comments(ruby_contents, file:, positional_names: T.unsafe(nil)); end
+    sig do
+      params(
+        ruby_contents: ::String,
+        file: ::String,
+        positional_names: T::Boolean,
+        max_line_length: T.nilable(::Integer),
+        translate_generics: T::Boolean,
+        translate_helpers: T::Boolean,
+        translate_abstract_methods: T::Boolean
+      ).returns(::String)
+    end
+    def sorbet_sigs_to_rbs_comments(ruby_contents, file:, positional_names: T.unsafe(nil), max_line_length: T.unsafe(nil), translate_generics: T.unsafe(nil), translate_helpers: T.unsafe(nil), translate_abstract_methods: T.unsafe(nil)); end
 
     sig { params(ruby_contents: ::String, file: ::String).returns(::String) }
     def strip_sorbet_sigs(ruby_contents, file:); end
@@ -2858,6 +2878,9 @@ class Spoom::Sorbet::Translate::Error < ::Spoom::Error; end
 class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs < ::Spoom::Sorbet::Translate::Translator
   include ::Spoom::RBS::ExtractRBSComments
 
+  sig { params(ruby_contents: ::String, file: ::String, max_line_length: T.nilable(::Integer)).void }
+  def initialize(ruby_contents, file:, max_line_length: T.unsafe(nil)); end
+
   sig { override.params(node: ::Prism::CallNode).void }
   def visit_call_node(node); end
 
@@ -2889,11 +2912,27 @@ class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs < ::Spoom::Sorbet::Trans
   sig { params(annotations: T::Array[::Spoom::RBS::Annotation], sig: ::RBI::Sig).void }
   def apply_member_annotations(annotations, sig); end
 
+  sig { params(def_node: ::Prism::DefNode, comments: ::Spoom::RBS::Comments).void }
+  def rewrite_def(def_node, comments); end
+
   sig { params(node: ::Prism::CallNode).void }
   def visit_attr(node); end
 end
 
 class Spoom::Sorbet::Translate::SorbetAssertionsToRBSComments < ::Spoom::Sorbet::Translate::Translator
+  sig do
+    params(
+      ruby_contents: ::String,
+      file: ::String,
+      translate_t_let: T::Boolean,
+      translate_t_cast: T::Boolean,
+      translate_t_bind: T::Boolean,
+      translate_t_must: T::Boolean,
+      translate_t_unsafe: T::Boolean
+    ).void
+  end
+  def initialize(ruby_contents, file:, translate_t_let: T.unsafe(nil), translate_t_cast: T.unsafe(nil), translate_t_bind: T.unsafe(nil), translate_t_must: T.unsafe(nil), translate_t_unsafe: T.unsafe(nil)); end
+
   sig { override.params(node: ::Prism::IfNode).void }
   def visit_if_node(node); end
 
@@ -2918,14 +2957,24 @@ class Spoom::Sorbet::Translate::SorbetAssertionsToRBSComments < ::Spoom::Sorbet:
   def t?(node); end
 
   sig { params(node: ::Prism::CallNode).returns(T::Boolean) }
-  def t_annotation?(node); end
+  def translatable_annotation?(node); end
 end
 
 Spoom::Sorbet::Translate::SorbetAssertionsToRBSComments::LINE_BREAK = T.let(T.unsafe(nil), Integer)
 
 class Spoom::Sorbet::Translate::SorbetSigsToRBSComments < ::Spoom::Sorbet::Translate::Translator
-  sig { params(ruby_contents: ::String, file: ::String, positional_names: T::Boolean).void }
-  def initialize(ruby_contents, file:, positional_names:); end
+  sig do
+    params(
+      ruby_contents: ::String,
+      file: ::String,
+      positional_names: T::Boolean,
+      max_line_length: T.nilable(::Integer),
+      translate_generics: T::Boolean,
+      translate_helpers: T::Boolean,
+      translate_abstract_methods: T::Boolean
+    ).void
+  end
+  def initialize(ruby_contents, file:, positional_names:, max_line_length: T.unsafe(nil), translate_generics: T.unsafe(nil), translate_helpers: T.unsafe(nil), translate_abstract_methods: T.unsafe(nil)); end
 
   sig { override.params(node: ::Prism::CallNode).void }
   def visit_call_node(node); end
@@ -2970,6 +3019,9 @@ class Spoom::Sorbet::Translate::SorbetSigsToRBSComments < ::Spoom::Sorbet::Trans
   sig { void }
   def delete_extend_t_helpers; end
 
+  sig { params(indent: ::Integer, block: T.proc.params(arg0: ::RBI::RBSPrinter).void).returns(::String) }
+  def rbs_print(indent, &block); end
+
   sig { params(node: ::Prism::CallNode).void }
   def visit_attr(node); end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.5
 platform: ruby
 authors:
 - Alexandre Terrasa