spoom 1.7.13 → 1.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02432e9390507a5cc9072d83c3eaf7952d430fdb4329cf5e33e969513d21f58b
-  data.tar.gz: 693d74660c7aa1faad796f5a948bb06302c1b8d62dc3855665ea1125cb0ee1fd
+  metadata.gz: '0726847d39f3461a3ac2998e8a84c235633275b9f15549e7ecaa24730496e12a'
+  data.tar.gz: a21f1fc2df2b4b9467d59c676aea601b733711709895daa47f80d8af5543f301
 SHA512:
-  metadata.gz: 3f34e8b9207ed4b538ef2ca5450041aa62baede9429d295e4348b68008cfe3df43e7e0f626b6e41e872e808afebeabe34bcd33536c6e6520e053b5b9be43a76d
-  data.tar.gz: b4e28008f5529e134664d250bd17f2934ed978045861031d9f4b9e5d13a4e7fbde24b86d07fbeca9e0e4e114a1e6bc07bf599efa4c0e1a5ee7ccfa322c57ab3b
+  metadata.gz: 625897a0c781818fefa36d6bf2c49c9674300d162e54d939e53b3b2e4b128d9dd97674c5418364e018e1cc01513ac664048191a9fdeda0667b7c41218815688c
+  data.tar.gz: 8b269cb7ec6f258e4403f83993609985078fba2512d7d96fc89ad8d63522cd2913e30019edb1ae2e7b7aeaf2f4476c6d5141cc4aa594ca317db04a7cb975d4b0

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

@@ -213,8 +213,10 @@ module Spoom
                 contents = contents.force_encoding(encoding)
               end
 
-              contents = block.call(file, contents)
-              File.write(file, contents)
+              new_contents = block.call(file, contents)
+              next if new_contents == contents
+
+              File.write(file, new_contents)
               transformed_count += 1
             rescue RBI::Error => error
               say_warning("Can't parse #{file}: #{error.message}")

data/lib/spoom/context/bundle.rb

@@ -10,12 +10,16 @@ module Spoom
       #: -> String?
       def read_gemfile
         read("Gemfile")
+      rescue Errno::ENOENT, Errno::EACCES
+        nil
       end
 
       # Read the contents of the Gemfile.lock in this context directory
       #: -> String?
       def read_gemfile_lock
         read("Gemfile.lock")
+      rescue Errno::ENOENT, Errno::EACCES
+        nil
       end
 
       # Set the `contents` of the Gemfile in this context directory
@@ -45,9 +49,10 @@ module Spoom
 
       #: -> Hash[String, Bundler::LazySpecification]
       def gemfile_lock_specs
-        return {} unless file?("Gemfile.lock")
+        lockfile = read_gemfile_lock
+        return {} unless lockfile
 
-        parser = Bundler::LockfileParser.new(read_gemfile_lock)
+        parser = Bundler::LockfileParser.new(lockfile)
         parser.specs.to_h { |spec| [spec.name, spec] }
       end
 

data/lib/spoom/context/sorbet.rb

@@ -42,10 +42,15 @@ module Spoom
           sorbet_bin: sorbet_bin,
           capture_err: capture_err,
         )
-        return unless file?(metrics_file)
 
         metrics_path = absolute_path_to(metrics_file)
-        metrics = Spoom::Sorbet::Metrics::MetricsFileParser.parse_file(metrics_path)
+
+        begin
+          metrics = Spoom::Sorbet::Metrics::MetricsFileParser.parse_file(metrics_path)
+        rescue Errno::ENOENT, Errno::EACCES
+          return
+        end
+
         remove!(metrics_file)
         metrics
       end

data/lib/spoom/file_collector.rb

@@ -33,11 +33,17 @@ module Spoom
 
       return if excluded_path?(path)
 
-      if File.file?(path)
+      begin
+        stat = File.stat(path)
+      rescue Errno::ENOENT, Errno::EACCES
+        return
+      end
+
+      if stat.file?
         visit_file(path)
-      elsif File.directory?(path)
+      elsif stat.directory?
         visit_directory(path)
-      else # rubocop:disable Style/EmptyElse
+      else
         # Ignore aliases, sockets, etc.
       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/metrics/metrics_file_parser.rb

@@ -10,6 +10,7 @@ module Spoom
         DEFAULT_PREFIX = "ruby_typer.unknown."
 
         class << self
+          # Raises if `path` doesn't point to a valid file that we have access to (see `File.read` for details)
           #: (String path, ?String prefix) -> Hash[String, Integer]
           def parse_file(path, prefix = DEFAULT_PREFIX)
             parse_string(File.read(path), prefix)

data/lib/spoom/sorbet/sigils.rb

@@ -44,6 +44,13 @@ module Spoom
           SIGIL_REGEXP.match(content)&.[](1)
         end
 
+        # returns true if the passed content contains a valid sigil
+        #: (String content) -> bool
+        def contains_valid_sigil?(content)
+          strictness = strictness_in_content(content)
+          !!strictness && valid_strictness?(strictness)
+        end
+
         # returns a string which is the passed content but with the sigil updated to a new strictness
         #: (String content, String new_strictness) -> String
         def update_sigil(content, new_strictness)

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

@@ -7,6 +7,33 @@ module Spoom
       class RBSCommentsToSorbetSigs < Translator
         include Spoom::RBS::ExtractRBSComments
 
+        RBS_ANNOTATION_MARKERS = [
+          "# @abstract",
+          "# @interface",
+          "# @sealed",
+          "# @final",
+          "# @requires_ancestor:",
+          "# @override",
+          "# @overridable",
+          "# @without_runtime",
+        ].freeze #: Array[String]
+        RBS_REWRITE_PATTERN = Regexp.union(["#:", "#|", *RBS_ANNOTATION_MARKERS]).freeze #: Regexp
+        private_constant :RBS_ANNOTATION_MARKERS, :RBS_REWRITE_PATTERN
+
+        class << self
+          #: (String source) -> bool
+          def contains_rbs_syntax?(source)
+            Sigils.contains_valid_sigil?(source) && source.match?(RBS_REWRITE_PATTERN)
+          end
+
+          #: (String ruby_contents, file: String, ?max_line_length: Integer?) -> String
+          def rewrite_if_needed(ruby_contents, file:, max_line_length: nil)
+            return ruby_contents unless contains_rbs_syntax?(ruby_contents)
+
+            new(ruby_contents, file:, max_line_length:).rewrite
+          end
+        end
+
         #: (String, file: String, ?max_line_length: Integer?) -> void
         def initialize(ruby_contents, file:, max_line_length: nil)
           super(ruby_contents, file: file)

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/sorbet/translate.rb

@@ -55,7 +55,7 @@ module Spoom
         # It also handles type members and class annotations.
         #: (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
+          RBSCommentsToSorbetSigs.rewrite_if_needed(ruby_contents, file: file, max_line_length: max_line_length)
         end
 
         # Converts all `T.let` and `T.cast` nodes to RBS comments in the given Ruby code.

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.7.13"
+  VERSION = "1.7.15"
 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
@@ -2823,6 +2823,9 @@ module Spoom::Sorbet::Sigils
     sig { params(path_list: T::Array[::String], new_strictness: ::String).returns(T::Array[::String]) }
     def change_sigil_in_files(path_list, new_strictness); end
 
+    sig { params(content: ::String).returns(T::Boolean) }
+    def contains_valid_sigil?(content); end
+
     sig { params(path: T.any(::Pathname, ::String)).returns(T.nilable(::String)) }
     def file_strictness(path); end
 
@@ -2938,8 +2941,19 @@ class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs < ::Spoom::Sorbet::Trans
 
   sig { params(node: ::Prism::CallNode).void }
   def visit_attr(node); end
+
+  class << self
+    sig { params(source: ::String).returns(T::Boolean) }
+    def contains_rbs_syntax?(source); end
+
+    sig { params(ruby_contents: ::String, file: ::String, max_line_length: T.nilable(::Integer)).returns(::String) }
+    def rewrite_if_needed(ruby_contents, file:, max_line_length: T.unsafe(nil)); end
+  end
 end
 
+Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::RBS_ANNOTATION_MARKERS = T.let(T.unsafe(nil), Array)
+Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::RBS_REWRITE_PATTERN = T.let(T.unsafe(nil), Regexp)
+
 class Spoom::Sorbet::Translate::SorbetAssertionsToRBSComments < ::Spoom::Sorbet::Translate::Translator
   sig do
     params(

metadata

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