solargraph 0.59.0.dev.1 → 0.59.0.dev.2

data/lib/solargraph/pin/signature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Signature < Callable
@@ -5,10 +7,6 @@ module Solargraph
       # to the method pin
       attr_writer :closure
 
-      def initialize **splat
-        super(**splat)
-      end
-
       def generics
         # @type [Array<::String, nil>]
         @generics ||= [].freeze
@@ -18,8 +16,6 @@ module Solargraph
         @identity ||= "signature#{object_id}"
       end
 
-      attr_writer :closure
-
       # @ sg-ignore need boolish support for ? methods
       def dodgy_return_type_source?
         super || closure&.dodgy_return_type_source?
@@ -49,16 +45,15 @@ module Solargraph
         method_stack = closure.rest_of_stack api_map
         logger.debug { "Signature#typify(self=#{self}) - method_stack: #{method_stack}" }
         method_stack.each do |pin|
-          sig = pin.signatures.find { |s| s.arity == self.arity }
+          sig = pin.signatures.find { |s| s.arity == arity }
           next unless sig
           # @sg-ignore Need to add nil check here
-          unless sig.return_type.undefined?
-            # @sg-ignore Need to add nil check here
-            qualified = sig.return_type.qualify(api_map, closure.namespace)
-            # @sg-ignore Need to add nil check here
-            logger.debug { "Signature#typify(self=#{self}) => #{qualified.rooted_tags.inspect}" }
-            return qualified
-          end
+          next if sig.return_type.undefined?
+          # @sg-ignore Need to add nil check here
+          qualified = sig.return_type.qualify(api_map, closure.namespace)
+          # @sg-ignore Need to add nil check here
+          logger.debug { "Signature#typify(self=#{self}) => #{qualified.rooted_tags.inspect}" }
+          return qualified
         end
         out = super
         logger.debug { "Signature#typify(self=#{self}) => #{out}" }

data/lib/solargraph/pin/symbol.rb

@@ -5,6 +5,7 @@ module Solargraph
     class Symbol < Base
       # @param location [Solargraph::Location, nil]
       # @param name [String]
+      # @param [Hash{Symbol => Object}] kwargs
       def initialize(location, name, **kwargs)
         # @sg-ignore "Unrecognized keyword argument kwargs to Solargraph::Pin::Base#initialize"
         super(location: location, name: name, **kwargs)

data/lib/solargraph/pin/until.rb

@@ -5,10 +5,8 @@ module Solargraph
     class Until < CompoundStatement
       include Breakable
 
-      # @param receiver [Parser::AST::Node, nil]
       # @param node [Parser::AST::Node, nil]
-      # @param context [ComplexType, nil]
-      # @param args [::Array<Parameter>]
+      # @param [Hash{Symbol => Object}] splat
       def initialize node: nil, **splat
         super(**splat)
         @node = node

data/lib/solargraph/pin/while.rb

@@ -5,10 +5,8 @@ module Solargraph
     class While < CompoundStatement
       include Breakable
 
-      # @param receiver [Parser::AST::Node, nil]
       # @param node [Parser::AST::Node, nil]
-      # @param context [ComplexType, nil]
-      # @param args [::Array<Parameter>]
+      # @param [Hash{Symbol => Object}] splat
       def initialize node: nil, **splat
         super(**splat)
         @node = node

data/lib/solargraph/pin_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'rbs'
 require 'rubygems'
@@ -408,6 +410,7 @@ module Solargraph
 
     # @return [void]
     # @param path_segments [Array<String>]
+    # @param out [StringIO, IO, nil]
     def uncache_by_prefix *path_segments, out: nil
       path = File.join(*path_segments)
       glob = "#{path}*"
@@ -447,7 +450,7 @@ module Solargraph
         path = File.join(*path_segments)
         if File.exist?(path)
           FileUtils.rm_rf path, secure: true
-          out.puts "Clearing pin cache in #{path}" unless out.nil?
+          out&.puts "Clearing pin cache in #{path}"
         else
           out&.puts "Pin cache file #{path} does not exist"
         end
@@ -459,11 +462,11 @@ module Solargraph
       def uncache_by_prefix *path_segments, out: nil
         path = File.join(*path_segments)
         glob = "#{path}*"
-        out.puts "Clearing pin cache in #{glob}" unless out.nil?
+        out&.puts "Clearing pin cache in #{glob}"
         Dir.glob(glob).each do |file|
           next unless File.file?(file)
           FileUtils.rm_rf file, secure: true
-          out.puts "Clearing pin cache in #{file}" unless out.nil?
+          out&.puts "Clearing pin cache in #{file}"
         end
       end
 
@@ -538,40 +541,34 @@ module Solargraph
 
       # @param gemspec [Gem::Specification]
       # @return [Array<Pin::Base>, nil]
-      def deserialize_yard_gem(gemspec)
+      def deserialize_yard_gem gemspec
         load(yard_gem_path(gemspec))
       end
 
       # @param gemspec [Gem::Specification]
       # @param pins [Array<Pin::Base>]
       # @return [void]
-      def serialize_yard_gem(gemspec, pins)
+      def serialize_yard_gem gemspec, pins
         save(yard_gem_path(gemspec), pins)
       end
 
-      # @param gemspec [Gem::Specification]
-      # @return [Boolean]
-      def has_yard?(gemspec)
-        exist?(yard_gem_path(gemspec))
-      end
-
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [String]
-      def rbs_collection_path(gemspec, hash)
+      def rbs_collection_path gemspec, hash
         File.join(work_dir, 'rbs', "#{gemspec.name}-#{gemspec.version}-#{hash || 0}.ser")
       end
 
       # @param gemspec [Gem::Specification]
       # @return [String]
-      def rbs_collection_path_prefix(gemspec)
+      def rbs_collection_path_prefix gemspec
         File.join(work_dir, 'rbs', "#{gemspec.name}-#{gemspec.version}-")
       end
 
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [Array<Pin::Base>, nil]
-      def deserialize_rbs_collection_gem(gemspec, hash)
+      def deserialize_rbs_collection_gem gemspec, hash
         load(rbs_collection_path(gemspec, hash))
       end
 
@@ -579,20 +576,20 @@ module Solargraph
       # @param hash [String, nil]
       # @param pins [Array<Pin::Base>]n
       # @return [void]
-      def serialize_rbs_collection_gem(gemspec, hash, pins)
+      def serialize_rbs_collection_gem gemspec, hash, pins
         save(rbs_collection_path(gemspec, hash), pins)
       end
 
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [String]
-      def combined_path(gemspec, hash)
+      def combined_path gemspec, hash
         File.join(work_dir, 'combined', "#{gemspec.name}-#{gemspec.version}-#{hash || 0}.ser")
       end
 
       # @param gemspec [Gem::Specification]
       # @return [String]
-      def combined_path_prefix(gemspec)
+      def combined_path_prefix gemspec
         File.join(work_dir, 'combined', "#{gemspec.name}-#{gemspec.version}-")
       end
 
@@ -600,7 +597,7 @@ module Solargraph
       # @param hash [String, nil]
       # @param pins [Array<Pin::Base>]
       # @return [void]
-      def serialize_combined_gem(gemspec, hash, pins)
+      def serialize_combined_gem gemspec, hash, pins
         save(combined_path(gemspec, hash), pins)
       end
 
@@ -614,7 +611,7 @@ module Solargraph
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [Boolean]
-      def has_rbs_collection?(gemspec, hash)
+      def has_rbs_collection? gemspec, hash
         exist?(rbs_collection_path(gemspec, hash))
       end
 

data/lib/solargraph/position.rb

@@ -21,12 +21,8 @@ module Solargraph
       @character = character
     end
 
-    protected def equality_fields
-      [line, character]
-    end
-
     # @param other [Position]
-    def <=>(other)
+    def <=> other
       return nil unless other.is_a?(Position)
       if line == other.line
         character <=> other.character
@@ -57,7 +53,22 @@ module Solargraph
     # @return [Integer]
     def self.to_offset text, position
       return 0 if text.empty?
-      text.lines[0...position.line].sum(&:length) + position.character
+
+      newline_index = -1
+      line = -1
+      last_line_index = 0
+
+      # @sg-ignore flow sensitive typing should be able to handle redefinition
+      while (newline_index = text.index("\n", newline_index + 1)) && line <= position.line
+        line += 1
+        break if line == position.line
+
+        last_line_index = newline_index
+      end
+
+      last_line_index += 1 if position.line.positive?
+      # @sg-ignore flow sensitive typing should be able to handle redefinition
+      last_line_index + position.character
     end
 
     # Get a numeric offset for the specified text and a position identified
@@ -73,25 +84,26 @@ module Solargraph
 
     # Get a position for the specified text and offset.
     #
+    # @raise [InvalidOffsetError] if the offset is outside the text range
+    #
     # @param text [String]
     # @param offset [Integer]
     # @return [Position]
     def self.from_offset text, offset
+      raise InvalidOffsetError if offset > text.length
+
       cursor = 0
       line = 0
-      # @type [Integer, nil]
-      character = nil
-      text.lines.each do |l|
-        line_length = l.length
-        char_length = l.chomp.length
-        if cursor + char_length >= offset
-          character = offset - cursor
-          break
-        end
-        cursor += line_length
+      character = offset
+      newline_index = -1
+
+      # @sg-ignore flow sensitive typing should be able to handle redefinition
+      while (newline_index = text.index("\n", newline_index + 1)) && newline_index < offset
         line += 1
+        # @sg-ignore flow sensitive typing should be able to handle redefinition
+        character = offset - newline_index - 1
       end
-      character = 0 if character.nil? and (cursor - offset).between?(0, 1)
+      character = 0 if character.nil? && (cursor - offset).between?(0, 1)
       raise InvalidOffsetError if character.nil?
       # @sg-ignore flow sensitive typing needs to handle 'raise if'
       Position.new(line, character)
@@ -114,5 +126,11 @@ module Solargraph
       return false unless other.is_a?(Position)
       line == other.line and character == other.character
     end
+
+    protected
+
+    def equality_fields
+      [line, character]
+    end
   end
 end

data/lib/solargraph/range.rb

@@ -19,12 +19,8 @@ module Solargraph
       @ending = ending
     end
 
-    protected def equality_fields
-      [start, ending]
-    end
-
     # @param other [BasicObject]
-    def <=>(other)
+    def <=> other
       return nil unless other.is_a?(Range)
       if start == other.start
         ending <=> other.ending
@@ -36,7 +32,7 @@ module Solargraph
     # Get a hash of the range. This representation is suitable for use in
     # the language server protocol.
     #
-    # @return [Hash<Symbol, Position>]
+    # @return [Hash{Symbol => Position}]
     def to_hash
       {
         start: start.to_hash,
@@ -86,9 +82,8 @@ module Solargraph
     # @param node [::Parser::AST::Node]
     # @return [Range, nil]
     def self.from_node node
-      if node&.loc && node.loc.expression
-        from_expr(node.loc.expression)
-      end
+      return unless node&.loc&.expression
+      from_expr(node.loc.expression)
     end
 
     # Get a range from a Parser range, usually found in
@@ -108,5 +103,11 @@ module Solargraph
     def inspect
       "#<#{self.class} #{start.inspect} to #{ending.inspect}>"
     end
+
+    protected
+
+    def equality_fields
+      [start, ending]
+    end
   end
 end