spoom 1.7.12 → 1.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5cf816e6ecd86209b75a94d71474288762d94b97da6e6637f2b67bb80c5fcf0
-  data.tar.gz: fafeb36ec7993a9632dfa0e7c1b47b7e671122e2e0a89358b1c1ab86dd611aca
+  metadata.gz: 7e36809d27f631413357c7b2287d7c51de3b8ed7d17ed7da03d4943bed071b23
+  data.tar.gz: b299e3da2929b3a80b1466566e22b207ddceeab71f8ee98ccbc85d259f39fcf8
 SHA512:
-  metadata.gz: a28c07c9f9ddbd22a754d6f4619696d6a82caa6f8b355dd99fc90b27c42c14b8bbb4377e433ad593b7133fffe8397fa929c75e9d309dd9499a7aa105b2126fcb
-  data.tar.gz: a098d8d9fba5cef4988d5e3e5fdc01493beec8c3ddd3a75e1b78353570872d447ab82f47a83d2cc3192b6f3699a7409f45b848e29d373eee03d273647e0afacf
+  metadata.gz: c39b635f9e3b26ca6bfa42ae4d89758d83e7f5c06bc4b7e263dae5f6b3b3debd7845e6cf90fdf54b854b1a8019957bc662dc36a05f2e560f6bb7e65a0dc224ba
+  data.tar.gz: f1ec06e214fc1f98ceb3915d659fe745951515e2edbd16219ebe1f77cb4d3ab79a28409b352dc35f92f9c9dbe85dcf176e696d7b1d48eae7bd665f21f12f997e

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

@@ -149,6 +149,7 @@ module Spoom
 
             #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("rbs")}
             #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("tapioca")}
+            #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("sorbet-static-and-runtime")}
 
             gem "#{spec.name}", path: "#{copy_context.absolute_path}"
           GEMFILE

data/lib/spoom/coverage.rb

@@ -15,7 +15,7 @@ module Spoom
         config = context.sorbet_config
         config.allowed_extensions.push(".rb", ".rbi") if config.allowed_extensions.empty?
 
-        new_config = config.copy
+        new_config = config.dup
         new_config.allowed_extensions.reject! { |ext| !rbi && ext == ".rbi" }
         flags = [
           "--no-config",

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

@@ -33,6 +33,12 @@ module Spoom
             if last_arg.is_a?(Prism::SymbolNode) || last_arg.is_a?(Prism::StringNode)
               @index.reference_method(last_arg.unescaped, send.location)
             end
+          when "dup"
+            @index.reference_method("initialize_dup", send.location)
+            @index.reference_method("initialize_copy", send.location)
+          when "clone"
+            @index.reference_method("initialize_clone", send.location)
+            @index.reference_method("initialize_copy", send.location)
           when "method"
             arg = send.args.first
             @index.reference_method(arg.unescaped, send.location) if arg.is_a?(Prism::SymbolNode)

data/lib/spoom/sorbet/config.rb

@@ -40,14 +40,12 @@ module Spoom
         @no_stdlib = false #: bool
       end
 
-      #: -> Config
-      def copy
-        new_config = Sorbet::Config.new
-        new_config.paths.concat(@paths)
-        new_config.ignore.concat(@ignore)
-        new_config.allowed_extensions.concat(@allowed_extensions)
-        new_config.no_stdlib = @no_stdlib
-        new_config
+      #: (Config source) -> void
+      def initialize_copy(source)
+        super
+        @paths = @paths.dup
+        @ignore = @ignore.dup
+        @allowed_extensions = @allowed_extensions.dup
       end
 
       # Returns self as a string of options that can be passed to Sorbet
@@ -107,8 +105,8 @@ module Spoom
             when /^--dir=/
               config.paths << parse_option(line)
               next
-            when /^--no-stdlib$/
-              config.no_stdlib = true
+            when /^--no-stdlib(=|$)/
+              config.no_stdlib = parse_bool_option(line)
               next
             when /^--.*=/
               next
@@ -143,6 +141,17 @@ module Spoom
         def parse_option(line)
           T.must(line.split("=").last).strip
         end
+
+        #: (String line) -> bool
+        def parse_bool_option(line)
+          return true unless line.include?("=") # `--foo` is equivalent to `--foo=true`
+
+          case parse_option(line)
+          when "true", "True", "t", "T", "1" then true
+          when "false", "False", "f", "F", "0" then false
+          else raise ArgumentError, "invalid boolean value: #{parse_option(line).inspect}"
+          end
+        end
       end
     end
   end

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

@@ -13,35 +13,6 @@ module Spoom
       def accept_printer(printer) = raise NotImplementedError, "Abstract method called"
     end
 
-    class Hover < T::Struct
-      include PrintableSymbol
-
-      const :contents, String
-      const :range, T.nilable(Range)
-
-      class << self
-        #: (Hash[untyped, untyped] json) -> Hover
-        def from_json(json)
-          Hover.new(
-            contents: json["contents"]["value"],
-            range: json["range"] ? Range.from_json(json["range"]) : nil,
-          )
-        end
-      end
-
-      # @override
-      #: (SymbolPrinter printer) -> void
-      def accept_printer(printer)
-        printer.print("#{contents}\n")
-        printer.print_object(range) if range
-      end
-
-      #: -> String
-      def to_s
-        "#{contents} (#{range})."
-      end
-    end
-
     class Position < T::Struct
       include PrintableSymbol
 
@@ -100,6 +71,35 @@ module Spoom
       end
     end
 
+    class Hover < T::Struct
+      include PrintableSymbol
+
+      const :contents, String
+      const :range, T.nilable(Range)
+
+      class << self
+        #: (Hash[untyped, untyped] json) -> Hover
+        def from_json(json)
+          Hover.new(
+            contents: json["contents"]["value"],
+            range: json["range"] ? Range.from_json(json["range"]) : nil,
+          )
+        end
+      end
+
+      # @override
+      #: (SymbolPrinter printer) -> void
+      def accept_printer(printer)
+        printer.print("#{contents}\n")
+        printer.print_object(range) if range
+      end
+
+      #: -> String
+      def to_s
+        "#{contents} (#{range})."
+      end
+    end
+
     class Location < T::Struct
       include PrintableSymbol
 

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

@@ -305,7 +305,7 @@ module Spoom
           end
 
           if sigs.any? { |_, sig| sig.is_overridable }
-            @rewriter << Source::Insert.new(insert_pos, "# @overridable\n")
+            @rewriter << Source::Insert.new(insert_pos, "# @overridable\n#{indent}")
           end
         end
 

data/lib/spoom/version.rb

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

data/rbi/spoom.rbi

@@ -1836,7 +1836,7 @@ class Spoom::LSP::Hover < ::T::Struct
   include ::Spoom::LSP::PrintableSymbol
 
   const :contents, ::String
-  const :range, T.nilable(T::Range[T.untyped])
+  const :range, T.nilable(::Spoom::LSP::Range)
 
   sig { override.params(printer: ::Spoom::LSP::SymbolPrinter).void }
   def accept_printer(printer); end
@@ -2603,10 +2603,6 @@ class Spoom::Sorbet::Config
 
   def allowed_extensions; end
   def allowed_extensions=(_arg0); end
-
-  sig { returns(::Spoom::Sorbet::Config) }
-  def copy; end
-
   def ignore; end
   def ignore=(_arg0); end
 
@@ -2623,6 +2619,11 @@ class Spoom::Sorbet::Config
 
   def paths=(_arg0); end
 
+  private
+
+  sig { params(source: ::Spoom::Sorbet::Config).void }
+  def initialize_copy(source); end
+
   class << self
     sig { params(sorbet_config_path: ::String).returns(::Spoom::Sorbet::Config) }
     def parse_file(sorbet_config_path); end
@@ -2632,6 +2633,9 @@ class Spoom::Sorbet::Config
 
     private
 
+    sig { params(line: ::String).returns(T::Boolean) }
+    def parse_bool_option(line); end
+
     sig { params(line: ::String).returns(::String) }
     def parse_option(line); end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.7.12
+  version: 1.7.14
 platform: ruby
 authors:
 - Alexandre Terrasa
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.3.0
+        version: 13.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.3.0
+        version: 13.4.2
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement