solargraph 0.38.2 → 0.38.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389f64ff08e6e1eda0eb13d13e7ff3a8c41650436b02d693995b15dbc3d955c7
-  data.tar.gz: eaffccfef362bbb580ea5c57a3bc99d0fb576ec422b11963e8b7490ea035a578
+  metadata.gz: b938f9be15a1bf0d05152f83b00bb4b04018b37b3da1ab921963f57d7a837484
+  data.tar.gz: 8dc52f3e77661d53fd107610e33441f94cab71c4529e47559cbcb055bf04fddd
 SHA512:
-  metadata.gz: 0d9779fe5645a9ad1d6375795875219405cc637de5fcd28c51c11ead54838ce4a5a22f49993d91d0649a6153b045eacb97f079f44ffaa888a33513c8de639573
-  data.tar.gz: 53dfdef740ad7d4a5fc5c80798f7cca2116b7ae5960878357e1a0516f4cc4783f3ed521a2ba86959d044e1588b2492b3f3751d7812454b37c8d6597e51bc266b
+  metadata.gz: b5d48c9e67760aca62df62495ce1ad372327f556462498e7aaf9149eabc047be796a8c59dd5ea2874aa88827fcc204059f18f74f32ed4ed4912e49c7986ae783
+  data.tar.gz: 27fa823a0b024ee78aafbfc69d6ea555351155bf6a963abcd9f94a1d15e79ca630f5b32cb0acfe97192e5ef0e0d8d730d34f4bcd9091cb91c699f8684930554e

data/Gemfile

@@ -5,3 +5,5 @@ gemspec name: 'solargraph'
 # Local gemfile for development tools, etc.
 local_gemfile = File.expand_path(".Gemfile", __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile
+
+gem 'readapt', '~> 1.0'

data/lib/solargraph.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-# require 'yard'
 require 'solargraph/version'
-# require 'yard-solargraph'
 
 # The top-level namespace for the Solargraph code mapping, documentation,
 # static analysis, and language server libraries.
@@ -27,6 +25,7 @@ module Solargraph
   autoload :Pin,              'solargraph/pin'
   autoload :ServerMethods,    'solargraph/server_methods'
   autoload :CoreFills,        'solargraph/core_fills'
+  autoload :StdlibFills,      'solargraph/stdlib_fills'
   autoload :LanguageServer,   'solargraph/language_server'
   autoload :Workspace,        'solargraph/workspace'
   autoload :Page,             'solargraph/page'

data/lib/solargraph/api_map.rb

@@ -93,34 +93,35 @@ module Solargraph
       return self if merged
       implicit.clear
       pins = []
-      reqs = []
+      reqs = Set.new
       # @param map [SourceMap]
       new_map_hash.values.each do |map|
         implicit.merge map.environ
         pins.concat map.pins
-        reqs.concat map.requires.map(&:name)
+        reqs.merge map.requires.map(&:name)
       end
-      reqs.concat bundle.workspace.config.required
+      reqs.merge bundle.workspace.config.required
       local_path_hash.clear
       unless bundle.workspace.require_paths.empty?
+        file_keys = new_map_hash.keys
+        workspace_path = Pathname.new(bundle.workspace.directory)
         reqs.delete_if do |r|
-          result = false
-          bundle.workspace.require_paths.each do |l|
-            pn = Pathname.new(bundle.workspace.directory).join(l, "#{r}.rb")
-            if new_map_hash.keys.include?(pn.to_s)
-              local_path_hash[r] = pn.to_s
-              result = true
-              break
+          bundle.workspace.require_paths.any? do |base|
+            pn = workspace_path.join(base, "#{r}.rb").to_s
+            if file_keys.include? pn
+              local_path_hash[r] = pn
+              true
+            else
+              false
             end
           end
-          result
         end
       end
-      reqs.concat implicit.requires
+      reqs.merge implicit.requires
       pins.concat implicit.overrides
       br = reqs.include?('bundler/require') ? require_from_bundle(bundle.workspace.directory) : {}
-      reqs.concat br.keys
-      yard_map.change(reqs, br)
+      reqs.merge br.keys
+      yard_map.change(reqs.to_a, br)
       new_store = Store.new(pins + yard_map.pins)
       @mutex.synchronize {
         @cache.clear
@@ -567,27 +568,30 @@ module Solargraph
       result = []
       result.concat store.get_methods(fqns, scope: scope, visibility: visibility).sort{ |a, b| a.name <=> b.name }
       if deep
-        sc = store.get_superclass(fqns)
-        unless sc.nil?
-          fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
-          result.concat inner_get_methods(fqsc, scope, visibility, true, skip, true) unless fqsc.nil?
-        end
         if scope == :instance
           store.get_includes(fqns).reverse.each do |im|
             fqim = qualify(im, fqns)
             result.concat inner_get_methods(fqim, scope, visibility, deep, skip, true) unless fqim.nil?
           end
-          result.concat inner_get_methods('Object', :instance, [:public], deep, skip, no_core)
-          result.concat inner_get_methods('BasicObject', :instance, [:public], deep, skip, no_core)
+          sc = store.get_superclass(fqns)
+          unless sc.nil?
+            fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
+            result.concat inner_get_methods(fqsc, scope, visibility, true, skip, no_core) unless fqsc.nil?
+          end
         else
           store.get_extends(fqns).reverse.each do |em|
             fqem = qualify(em, fqns)
             result.concat inner_get_methods(fqem, :instance, visibility, deep, skip, true) unless fqem.nil?
           end
+          sc = store.get_superclass(fqns)
+          unless sc.nil?
+            fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
+            result.concat inner_get_methods(fqsc, scope, visibility, true, skip, true) unless fqsc.nil?
+          end
           unless no_core || fqns.empty?
             type = get_namespace_type(fqns)
             result.concat inner_get_methods('Class', :instance, visibility, deep, skip, no_core) if type == :class
-            result.concat inner_get_methods('Module', :instance,visibility, deep, skip, no_core)
+            result.concat inner_get_methods('Module', :instance, visibility, deep, skip, no_core)
           end
         end
         store.domains(fqns).each do |d|
@@ -610,7 +614,10 @@ module Solargraph
       store.get_includes(fqns).each do |is|
         result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
       end
-      result.concat inner_get_constants(store.get_superclass(fqns), [:public], skip)
+      sc = store.get_superclass(fqns)
+      unless %w[Object BasicObject].include?(sc)
+        result.concat inner_get_constants(store.get_superclass(fqns), [:public], skip)
+      end
       result
     end
 

data/lib/solargraph/api_map/store.rb

@@ -37,6 +37,8 @@ module Solargraph
       # @return [String]
       def get_superclass fqns
         return superclass_references[fqns].first if superclass_references.key?(fqns)
+        return 'Object' if fqns != 'BasicObject' && namespace_exists?(fqns)
+        return 'Object' if fqns == 'Boolean'
         nil
       end
 

data/lib/solargraph/core_fills.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 module Solargraph
+  # Overrides for the Ruby core.
+  #
+  # The YardMap uses this module to add type information to core methods.
+  #
   module CoreFills
     Override = Pin::Reference::Override
 
@@ -13,8 +17,8 @@ module Solargraph
     ].freeze
 
     methods_with_yieldparam_subtypes = %w[
-      Array#each Array#map Array#any? Array#all? Array#index Array#keep_if
-      Array#delete_if
+      Array#each Array#map Array#map! Array#any? Array#all? Array#index
+      Array#keep_if Array#delete_if
       Enumerable#each_entry Enumerable#map Enumerable#any? Enumerable#all?
       Enumerable#select Enumerable#reject
       Set#each
@@ -74,7 +78,11 @@ module Solargraph
 
       Override.method_return('Enumerable#select', 'self'),
 
+      Override.method_return('File.absolute_path', 'String'),
+      Override.method_return('File.basename', 'String'),
       Override.method_return('File.dirname', 'String'),
+      Override.method_return('File.extname', 'String'),
+      Override.method_return('File.join', 'String'),
 
       Override.from_comment('Hash#[]', %(
 @return_value_parameter

data/lib/solargraph/pin/base_method.rb

@@ -66,9 +66,9 @@ module Solargraph
 
       # @return [ComplexType]
       def generate_complex_type
-        tag = docstring.tag(:return)
-        return ComplexType::UNDEFINED if tag.nil? or tag.types.nil? or tag.types.empty?
-        ComplexType.try_parse *tag.types
+        tags = docstring.tags(:return).map(&:types).flatten.reject(&:nil?)
+        return ComplexType::UNDEFINED if tags.empty?
+        ComplexType.try_parse *tags
       end
 
       # @param api_map [ApiMap]

data/lib/solargraph/pin/common.rb

@@ -3,6 +3,7 @@
 module Solargraph
   module Pin
     module Common
+      # @return [Location]
       attr_reader :location
 
       # @return [Pin::Base, nil]
@@ -13,6 +14,7 @@ module Solargraph
         @name ||= ''
       end
 
+      # @return [ComplexType]
       def return_type
         @return_type ||= ComplexType::UNDEFINED
       end
@@ -24,6 +26,7 @@ module Solargraph
       end
       alias full_context context
 
+      # @return [String]
       def namespace
         context.namespace.to_s
       end
@@ -33,10 +36,12 @@ module Solargraph
         @binder || context
       end
 
+      # @return [String]
       def comments
         @comments ||= ''
       end
 
+      # @return [String]
       def path
         @path ||= name.empty? ? context.namespace : "#{context.namespace}::#{name}"
       end
@@ -47,7 +52,15 @@ module Solargraph
       def find_context
         here = closure
         until here.nil?
-          return here.return_type if here.is_a?(Pin::Namespace)
+          if here.is_a?(Pin::Namespace)
+            return here.return_type
+          elsif here.is_a?(Pin::BaseMethod)
+            if here.scope == :instance
+              return ComplexType.try_parse(here.context.namespace)
+            else
+              return here.closure.return_type
+            end
+          end
           here = here.closure
         end
         ComplexType::ROOT

data/lib/solargraph/pin/localized.rb

@@ -11,9 +11,10 @@ module Solargraph
       # @return [Boolean]
       def visible_from?(other, position)
         position = Position.normalize(position)
-        other.filename == filename and
+        other.filename == filename &&
+          match_tags(other.full_context.tag, full_context.tag) &&
           (other == closure ||
-            (closure.location.range.contain?(closure.location.range.start) && closure.location.range.contain?(other.location.range.ending))
+            (closure.location.range.contain?(other.location.range.start) && closure.location.range.contain?(other.location.range.ending))
           ) &&
           presence.contain?(position)
       end
@@ -23,6 +24,20 @@ module Solargraph
         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

data/lib/solargraph/pin/method.rb

@@ -81,18 +81,14 @@ module Solargraph
             has_nil = true
             next
           end
-          literal = infer_literal_node_type(n)
-          if literal
-            result.push ComplexType.try_parse(literal)
-          else
-            next if n.loc.nil? || n.loc.expression.nil?
-            clip = api_map.clip_at(
-              location.filename,
-              [n.loc.expression.last_line, n.loc.expression.last_column]
-            )
-            type = clip.infer
-            result.push type unless type.undefined?
-          end
+          next if n.loc.nil? || n.loc.expression.nil?
+          clip = api_map.clip_at(
+            location.filename,
+            [n.loc.expression.last_line, n.loc.expression.last_column]
+          )
+          chain = Solargraph::Source::NodeChainer.chain(n, location.filename)
+          type = chain.infer(api_map, self, clip.locals)
+          result.push type unless type.undefined?
         end
         result.push ComplexType::NIL if has_nil
         return ComplexType::UNDEFINED if result.empty?

data/lib/solargraph/pin/yard_pin/namespace.rb

@@ -6,10 +6,10 @@ module Solargraph
       class Namespace < Pin::Namespace
         include YardMixin
 
-        def initialize code_object, spec
+        def initialize code_object, spec, closure = nil
           @code_object = code_object
           @spec = spec
-          closure = Solargraph::Pin::Namespace.new(
+          closure ||= Solargraph::Pin::Namespace.new(
             name: code_object.namespace.to_s,
             closure: Pin::ROOT_PIN,
             gates: [code_object.namespace.to_s]

data/lib/solargraph/source/chain.rb

@@ -34,8 +34,14 @@ module Solargraph
 
       # @param links [Array<Chain::Link>]
       def initialize links
-        @links = links
+        @links = links.clone
         @links.push UNDEFINED_CALL if @links.empty?
+        head = true
+        @links.map! do |link|
+          result = (head ? link.clone_head : link.clone_body)
+          head = false
+          result
+        end
       end
 
       # @return [Chain]
@@ -54,7 +60,9 @@ module Solargraph
         links[0..-2].each do |link|
           pins = link.resolve(api_map, working_pin, locals)
           # Locals are only used when resolving the first link
-          locals = []
+          # @todo There's a problem here. Call links need to resolve arguments
+          #   that might refer to local variables.
+          # locals = []
           type = infer_first_defined(pins, working_pin, api_map)
           return [] if type.undefined?
           working_pin = Pin::ProxyType.anonymous(type)

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

@@ -14,26 +14,25 @@ module Solargraph
         # @param arguments [Array<Chain>]
         # @param with_block [Boolean] True if the chain is inside a block
         # @param head [Boolean] True if the call is the start of its chain
-        def initialize word, arguments = [], with_block = false, head = false
+        def initialize word, arguments = [], with_block = false
           @word = word
           @arguments = arguments
           @with_block = with_block
-          @head = head
         end
 
         def with_block?
           @with_block
         end
 
-        def head?
-          @head
-        end
-
         # @param api_map [ApiMap]
         # @param name_pin [Pin::Base]
         # @param locals [Array<Pin::Base>]
         def resolve api_map, name_pin, locals
-          found = locals.select{|p| p.name == word}
+          found = if head?
+            locals.select { |p| p.name == word }
+          else
+            []
+          end
           return inferred_pins(found, api_map, name_pin.context, locals) unless found.empty?
           pins = api_map.get_method_stack(name_pin.binder.namespace, word, scope: name_pin.binder.scope)
           pins.concat api_map.get_method_stack('Kernel', word, scope: :instance) if head?

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

@@ -28,9 +28,38 @@ module Solargraph
           []
         end
 
+        def head?
+          @head ||= false
+        end
+
         def == other
           self.class == other.class and word == other.word
         end
+
+        # Make a copy of this link marked as the head of a chain
+        #
+        # @return [self]
+        def clone_head
+          clone.mark_head(true)
+        end
+
+        # Make a copy of this link unmarked as the head of a chain
+        #
+        # @return [self]
+        def clone_body
+          clone.mark_head(false)
+        end
+
+        protected
+
+        # Mark whether this link is the head of a chain
+        #
+        # @param bool [Boolean]
+        # @return [self]
+        def mark_head bool
+          @head = bool
+          self
+        end
       end
     end
   end

data/lib/solargraph/source/node_chainer.rb

@@ -58,13 +58,13 @@ module Solargraph
             n.children[2..-1].each do |c|
               args.push NodeChainer.chain(c)
             end
-            result.push Chain::Call.new(n.children[1].to_s, args, @in_block || block_passed?(n), result.length.zero?)
+            result.push Chain::Call.new(n.children[1].to_s, args, @in_block || block_passed?(n))
           elsif n.children[0].nil?
             args = []
             n.children[2..-1].each do |c|
               args.push NodeChainer.chain(c)
             end
-            result.push Chain::Call.new(n.children[1].to_s, args, @in_block || block_passed?(n), result.length.zero?)
+            result.push Chain::Call.new(n.children[1].to_s, args, @in_block || block_passed?(n))
           else
             raise "No idea what to do with #{n}"
           end

data/lib/solargraph/source/node_methods.rb

@@ -162,7 +162,8 @@ module Solargraph
             elsif node.type == :return
               result.concat reduce_to_value_nodes([node.children[0]])
             elsif node.type == :block
-              result.concat reduce_to_value_nodes([node.children[0]])
+              result.push node
+              # result.concat reduce_to_value_nodes([node.children[0]])
               result.concat get_return_nodes_only(node.children[2])
             else
               result.push node

data/lib/solargraph/stdlib_fills.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Solargraph
+  # Overrides for the Ruby stdlib.
+  #
+  # The YardMap uses this module to add type information to stdlib methods.
+  #
+  module StdlibFills
+    Override = Pin::Reference::Override
+
+    LIBS = {
+      'benchmark' => [
+        Override.method_return('Benchmark.measure', 'Benchmark::Tms')
+      ],
+
+      'pathname' => [
+        Override.method_return('Pathname#join', 'Pathname'),
+        Override.method_return('Pathname#basename', 'Pathname'),
+        Override.method_return('Pathname#dirname', 'Pathname'),
+        Override.method_return('Pathname#cleanpath', 'Pathname'),
+        Override.method_return('Pathname#children', 'Array<Pathname>'),
+        Override.method_return('Pathname#entries', 'Array<Pathname>')
+      ]
+    }
+
+    # @param path [String]
+    # @return [Array<Pin::Reference::Override>]
+    def self.get path
+      LIBS[path] || []
+    end
+  end
+end

data/lib/solargraph/type_checker.rb

@@ -316,9 +316,9 @@ module Solargraph
       return false unless par.duck_type?
       meths = api_map.get_complex_type_methods(arg).map(&:name)
       par.each do |quack|
-        return false unless meths.include?(quack.to_s[1..-1])
+        return true if quack.duck_type? && meths.include?(quack.to_s[1..-1])
       end
-      true
+      false
     end
 
     # @param pin [Pin::Base]

data/lib/solargraph/version.rb

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

data/lib/solargraph/yard_map.rb

@@ -23,8 +23,10 @@ module Solargraph
       next if ns.nil? || ns.file.nil?
       path = ns.file.sub(/^(ext|lib)\//, '').sub(/\.(rb|c)$/, '')
       next if path.start_with?('-')
-      @@stdlib_paths[path] ||= []
-      @@stdlib_paths[path].push ns
+      base = path.split('/').first
+      @@stdlib_paths[base] ||= {}
+      @@stdlib_paths[base][path] ||= []
+      @@stdlib_paths[base][path].push ns
     end
 
     # @return [Array<String>]
@@ -167,6 +169,7 @@ module Solargraph
       unresolved_requires.clear
       stdnames = {}
       done = []
+      from_std = []
       required.each do |r|
         next if r.nil? || r.empty? || done.include?(r)
         done.push r
@@ -188,11 +191,19 @@ module Solargraph
             yardocs.unshift yd
             result.concat process_yardoc yd, spec
             result.concat add_gem_dependencies(spec) if with_dependencies?
+            stdlib_fill r, result
           end
         rescue Gem::LoadError => e
+          base = r.split('/').first
           stdtmp = []
-          @@stdlib_paths.each_pair do |path, objects|
-            stdtmp.concat objects if path == r || path.start_with?("#{r}/")
+          if @@stdlib_paths[base]
+            @@stdlib_paths[base].each_pair do |path, objects|
+              next if from_std.include?(path)
+              if path == r || path.start_with?("#{r}/")
+                from_std.push path
+                stdtmp.concat objects
+              end
+            end
           end
           if stdtmp.empty?
             unresolved_requires.push r
@@ -227,6 +238,7 @@ module Solargraph
             result.concat Mapper.new(all).map
           end
           result.delete_if(&:nil?)
+          stdlib_fill r, result
           cache.set_path_pins(r, result) unless result.empty?
           pins.concat result
         end
@@ -301,6 +313,22 @@ module Solargraph
       end
       spec
     end
+
+    # @param path [String]
+    # @param pins [Array<Pin::Base>]
+    # @return [void]
+    def stdlib_fill path, pins
+      StdlibFills.get(path).each do |ovr|
+        pin = pins.select { |p| p.path == ovr.name }.first
+        next if pin.nil?
+        (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
+          pin.docstring.delete_tags tag.to_sym
+        end
+        ovr.tags.each do |tag|
+          pin.docstring.add_tag(tag)
+        end
+      end
+    end
   end
 end
 

data/lib/solargraph/yard_map/mapper.rb

@@ -3,8 +3,6 @@
 module Solargraph
   class YardMap
     class Mapper
-      @@object_file_cache = {}
-
       # @param code_objects [Array<YARD::CodeObjects::Base>]
       # @param spec [Gem::Specification]
       def initialize code_objects, spec = nil
@@ -27,7 +25,7 @@ module Solargraph
       def generate_pins code_object
         result = []
         if code_object.is_a?(YARD::CodeObjects::NamespaceObject)
-          nspin = Solargraph::Pin::YardPin::Namespace.new(code_object, @spec)
+          nspin = Solargraph::Pin::YardPin::Namespace.new(code_object, @spec, @namespace_pins[code_object.namespace.to_s])
           @namespace_pins[code_object.path] = nspin
           result.push nspin
           if code_object.is_a?(YARD::CodeObjects::ClassObject) and !code_object.superclass.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.38.2
+  version: 0.38.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -468,6 +468,7 @@ files:
 - lib/solargraph/source_map/node_processor/send_node.rb
 - lib/solargraph/source_map/node_processor/sym_node.rb
 - lib/solargraph/source_map/region.rb
+- lib/solargraph/stdlib_fills.rb
 - lib/solargraph/type_checker.rb
 - lib/solargraph/type_checker/param_def.rb
 - lib/solargraph/type_checker/problem.rb