solargraph 0.42.1 → 0.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1099281670bd5cacd480624f66b36d7ce8fb6b69b4486f080d0c0d6436c0f36c
-  data.tar.gz: 4b1e028bc357204b953c31916845a7f12caefc07d733dc90cfb5bc142401f2d4
+  metadata.gz: d4cd4acd35a7ce8242976cdd2b23d583bbd01392e3d79a16e3b4e181443e4858
+  data.tar.gz: 4cb4f369d97681a43d24a8fc3de14a454721c4334426655e23fffafceeb242c7
 SHA512:
-  metadata.gz: 771c40ddff0a11757d1e9c4487802afc9f5b992840383f525643957d92516e735dc7328a8d23ed1ff4f0e55ceb09e3792eb24818758e4b217927bf4ba9708b5a
-  data.tar.gz: 948101863fc7f3f167dee00139f07ccdf5711afd12125aa2a18b708ed4ba6edaffbc7ba0c1a7a7dd09ad51460a0827546841cf2dbcd223198247fd86d8b0841b
+  metadata.gz: 5918eb0b9797ed3bed1fe97a702761889b4fb5b8280de655820d8a4319eefd651f4958e420b32468aac2ab197f657b8cb1386029654dcbd9b3a30bbdd2ca521b
+  data.tar.gz: 649a461beb8b23b69ae40bb347389602e20b42d0a689752d805beb2c08000a863c24d9e45b39d00ee544d37802be0762d9933a6d4e27b2617249d1443ca582f4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.42.2 - June 14, 2021
+- Improve download-core command output
+- Ignore missing requests to client responses
+- Add automatically required gems to YardMap
+- Use closures to identify local variables
+
 ## 0.42.1 - June 11, 2021
 - YardMap#change sets new directory (#445)
 

data/lib/solargraph/api_map/bundler_methods.rb

@@ -9,7 +9,7 @@ module Solargraph
       # @param directory [String]
       # @return [Hash]
       def require_from_bundle directory
-        @require_from_bundle ||= begin
+        begin
           Solargraph.logger.info "Loading gems for bundler/require"
           Documentor.specs_from_bundle(directory)
         rescue BundleNotFoundError => e
@@ -17,11 +17,6 @@ module Solargraph
           {}
         end
       end
-
-      # @return [void]
-      def reset_require_from_bundle
-        @require_from_bundle = nil
-      end
     end
   end
 end

data/lib/solargraph/bench.rb

@@ -3,7 +3,7 @@
 require 'set'
 
 module Solargraph
-  # A container of source maps and gem specs to be cataloged in an ApiMap.
+  # A container of source maps and workspace data to be cataloged in an ApiMap.
   #
   class Bench
     # @return [Set<SourceMap>]

data/lib/solargraph/language_server/host.rb

@@ -31,7 +31,7 @@ module Solargraph
         @cancel = []
         @buffer = String.new
         @stopped = true
-        @next_request_id = 0
+        @next_request_id = 1
         @dynamic_capabilities = Set.new
         @registered_capabilities = Set.new
       end
@@ -113,6 +113,7 @@ module Solargraph
             requests.delete request['id']
           else
             logger.warn "Discarding client response to unrecognized message #{request['id']}"
+            nil
           end
         else
           logger.warn "Invalid message received."

data/lib/solargraph/language_server/transport/adapter.rb

@@ -42,9 +42,7 @@ module Solargraph
         # @return [void]
         def process request
           message = @host.receive(request)
-          message.send_response
-          # tmp = @host.flush
-          # write tmp unless tmp.empty?
+          message && message.send_response
         end
 
         def shutdown

data/lib/solargraph/library.rb

@@ -46,7 +46,7 @@ module Solargraph
     # @return [void]
     def attach source
       mutex.synchronize do
-        if @current && @current.filename != source.filename && source_map_hash.key?(@current.filename) && !workspace.has_file?(@current.filename)
+        if @current && (!source || @current.filename != source.filename) && source_map_hash.key?(@current.filename) && !workspace.has_file?(@current.filename)
           source_map_hash.delete @current.filename
           source_map_external_require_hash.delete @current.filename
           @external_requires = nil
@@ -511,6 +511,7 @@ module Solargraph
     end
 
     def maybe_map source
+      return unless source
       if source_map_hash.key?(source.filename)
         return if source_map_hash[source.filename].code == source.code && 
           source_map_hash[source.filename].source.synchronized? &&

data/lib/solargraph/pin/local_variable.rb

@@ -3,7 +3,8 @@
 module Solargraph
   module Pin
     class LocalVariable < BaseVariable
-      include Localized
+      # @return [Range]
+      attr_reader :presence
 
       def initialize assignment: nil, presence: nil, **splat
         super(**splat)
@@ -16,6 +17,51 @@ module Solargraph
         @presence = pin.presence
         true
       end
+
+      # @param other [Pin::Base] The caller's block
+      # @param position [Position, Array(Integer, Integer)] The caller's position
+      # @return [Boolean]
+      def visible_from?(other, position)
+        position = Position.normalize(position)
+        other.filename == filename &&
+          match_tags(other.full_context.tag, full_context.tag) &&
+          (other == closure ||
+            (closure.location.range.contain?(other.location.range.start) && closure.location.range.contain?(other.location.range.ending))
+          ) &&
+          presence.contain?(position)
+      end
+
+      # @param other_loc [Location]
+      def visible_at?(other_closure, other_loc)
+        return true if location.filename == other_loc.filename &&
+          presence.include?(other_loc.range.start) &&
+          match_named_closure(other_closure, closure)
+      end
+
+      private
+
+      # @param tag1 [String]
+      # @param tag2 [String]
+      # @return [Boolean]
+      def match_tags tag1, tag2
+        # @todo This is an unfortunate hack made necessary by a discrepancy in
+        #   how tags indicate the root namespace. The long-term solution is to
+        #   standardize it, whether it's `Class<>`, an empty string, or
+        #   something else.
+        tag1 == tag2 ||
+          (['', 'Class<>'].include?(tag1) && ['', 'Class<>'].include?(tag2))
+      end
+
+      def match_named_closure needle, haystack
+        return true if needle == haystack
+        cursor = haystack
+        until cursor.nil?
+          return true if needle.path == cursor.path
+          return false if cursor.path && !cursor.path.empty?
+          cursor = cursor.closure
+        end
+        false
+      end
     end
   end
 end

data/lib/solargraph/shell.rb

@@ -76,12 +76,12 @@ module Solargraph
       ver = version || Solargraph::YardMap::CoreDocs.best_download
       if RUBY_VERSION != ver
         puts "Documentation for #{RUBY_VERSION} is not available. Reverting to closest match..."
-      else
-        puts "Downloading docs for #{ver}..."
       end
+      puts "Downloading docs for #{ver}..."
       Solargraph::YardMap::CoreDocs.download ver
       # Clear cached documentation if it exists
       FileUtils.rm_rf Dir.glob(File.join(Solargraph::YardMap::CoreDocs.cache_dir, ver, '*.ser'))
+      puts "Download complete."
     rescue ArgumentError => e
       STDERR.puts "ERROR: #{e.message}"
       STDERR.puts "Run `solargraph available-cores` for a list."

data/lib/solargraph/source/chain/call.rb

@@ -77,6 +77,7 @@ module Solargraph
               end
               if match
                 type = extra_return_type(ol, context)
+                break if type
                 type = ComplexType.try_parse(*ol.tag(:return).types).self_to(context.to_s).qualify(api_map, context.namespace) if ol.has_tag?(:return) && ol.tag(:return).types && !ol.tag(:return).types.empty? && (type.nil? || type.undefined?)
                 type ||= ComplexType::UNDEFINED
               end
@@ -170,8 +171,8 @@ module Solargraph
         # @param context [ComplexType]
         # @return [ComplexType]
         def extra_return_type docstring, context
-          if docstring.has_tag?(:return_single_parameter) && context.subtypes.one?
-            return context.subtypes.first
+          if docstring.has_tag?(:return_single_parameter) #&& context.subtypes.one?
+            return context.subtypes.first || ComplexType::UNDEFINED
           elsif docstring.has_tag?(:return_value_parameter) && context.value_types.one?
             return context.value_types.first
           end

data/lib/solargraph/source_map.rb

@@ -131,7 +131,8 @@ module Solargraph
     # @return [Array<Pin::LocalVariable>]
     def locals_at(location)
       return [] if location.filename != filename
-      locals.select { |pin| pin.visible_at?(location) }
+      closure = locate_named_path_pin(location.range.start.line, location.range.start.character)
+      locals.select { |pin| pin.visible_at?(closure, location) }
     end
 
     class << self

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.42.1'
+  VERSION = '0.42.2'
 end

data/lib/solargraph/yard_map.rb

@@ -156,12 +156,12 @@ module Solargraph
       @base_required ||= Set.new
     end
 
-    private
-
     def directory
       @directory ||= ''
     end
 
+    private
+
     # @return [YardMap::Cache]
     def cache
       @cache ||= YardMap::Cache.new
@@ -190,11 +190,8 @@ module Solargraph
 
     # @return [void]
     def process_requires
-      @gemset = if required.include?('bundler/require')
-        require_from_bundle(directory)
-      else
-        {}
-      end
+      @gemset = process_gemsets
+      required.merge @gemset.keys if required.include?('bundler/require')
       pins.replace core_pins
       unresolved_requires.clear
       stdlib_pins.clear
@@ -254,6 +251,11 @@ module Solargraph
       pins.concat environ.pins
     end
 
+    def process_gemsets
+      return {} if directory.empty? || !File.file?(File.join(directory, 'Gemfile'))
+      require_from_bundle(directory)
+    end
+
     # @param spec [Gem::Specification]
     # @return [void]
     def add_gem_dependencies spec

data/lib/solargraph/yard_map/core_fills.rb

@@ -82,6 +82,18 @@ module Solargraph
         Override.method_return('Class#allocate', 'self'),
         Override.method_return('Class.allocate', 'Class<Object>'),
 
+        Override.from_comment('Enumerable#detect', %(
+@overload detect(&block)
+  @return_single_parameter
+@overload detect()
+  @return [Enumerator]
+        )),
+        Override.from_comment('Enumerable#find', %(
+@overload find(&block)
+  @return_single_parameter
+@overload find()
+  @return [Enumerator]
+        )),
         Override.method_return('Enumerable#select', 'self'),
 
         Override.method_return('File.absolute_path', 'String'),
@@ -111,7 +123,12 @@ module Solargraph
 @param y [Numeric]
 @return [Numeric]
         )),
-        Override.method_return('Integer#times', 'Enumerator', delete: [:overload]),
+        Override.from_comment('Integer#times', %(
+@overload times(&block)
+  @return [Integer]
+@overload times()
+  @return [Enumerator]
+        )),
 
         Override.method_return('Kernel#puts', 'nil'),
 

data/solargraph.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_runtime_dependency 'backport', '~> 1.1'
+  s.add_runtime_dependency 'backport', '~> 1.2'
   s.add_runtime_dependency 'benchmark'
   s.add_runtime_dependency 'bundler', '>= 1.17.2'
   s.add_runtime_dependency 'diff-lcs', '~> 1.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.42.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -477,7 +477,6 @@ files:
 - lib/solargraph/pin/keyword.rb
 - lib/solargraph/pin/keyword_param.rb
 - lib/solargraph/pin/local_variable.rb
-- lib/solargraph/pin/localized.rb
 - lib/solargraph/pin/method.rb
 - lib/solargraph/pin/method_alias.rb
 - lib/solargraph/pin/namespace.rb

data/lib/solargraph/pin/localized.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    module Localized
-      # @return [Range]
-      attr_reader :presence
-
-      # @param other [Pin::Base] The caller's block
-      # @param position [Position, Array(Integer, Integer)] The caller's position
-      # @return [Boolean]
-      def visible_from?(other, position)
-        position = Position.normalize(position)
-        other.filename == filename &&
-          match_tags(other.full_context.tag, full_context.tag) &&
-          (other == closure ||
-            (closure.location.range.contain?(other.location.range.start) && closure.location.range.contain?(other.location.range.ending))
-          ) &&
-          presence.contain?(position)
-      end
-
-      # @param other_loc [Location]
-      def visible_at?(other_loc)
-        return false if location.filename != other_loc.filename
-        presence.include?(other_loc.range.start)
-      end
-
-      private
-
-      # @param tag1 [String]
-      # @param tag2 [String]
-      # @return [Boolean]
-      def match_tags tag1, tag2
-        # @todo This is an unfortunate hack made necessary by a discrepancy in
-        #   how tags indicate the root namespace. The long-term solution is to
-        #   standardize it, whether it's `Class<>`, an empty string, or
-        #   something else.
-        tag1 == tag2 ||
-          (['', 'Class<>'].include?(tag1) && ['', 'Class<>'].include?(tag2))
-      end
-    end
-  end
-end