solargraph 0.39.15 → 0.39.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e70e17b5895de1eea7c7455249afbcf26bb1cb59eb4d47ae93d7e37b53e653d
-  data.tar.gz: ba947a023fcc459c489e84afce5d7af0ccce1d3b0b0ba6a6f4b89c72e6693a8e
+  metadata.gz: 949ea02c957254c5fd37a427a4eacbdc55b185c14e2372b659eb0ec4ca3fd254
+  data.tar.gz: cdd35fd88fc71ed5421d1a4cbd6033791e44a00bc6bd695ea57055004ea09c94
 SHA512:
-  metadata.gz: 1c869730843c3b6f3ad7ea20646c5aed3c22e36b61a8d31e550b13f44de966f8837f9bf35463a9353e755eb6a8352ad2b9c110e5e07a8fd2ad8c6445af1dec83
-  data.tar.gz: 3abeace1fea2e9ae611c43bc222968f73bcfb3822761bea46935168d398774cb66fa87528fa851ef080e84dc2cd9d577cada3f5478ad0af4896d02595c16d04f
+  metadata.gz: 4db457d03f5464a15fedd4b6cd6dc60b591a7574013ef5babb246d33e6469078134511a77f80455dc52e47ac1d8d428b78e02c3bc818fe58b665e32f45331a7c
+  data.tar.gz: 17b166d81771a0a508e954c7c83ce9ceed0830a0d7c4f4d568a57cac1eb8b23524be0a23f4eaa049fd99b90415faea7be664c02b939e5103795cabc15a4a3ca4

data/Rakefile

@@ -11,4 +11,15 @@ end
 desc "Open a Pry session preloaded with this library"
 task :console do
   sh "pry -I lib -r solargraph.rb"
-end
+end
+
+desc "Run the type checker"
+task :typecheck do
+  sh "bundle exec solargraph typecheck --level typed"
+end
+
+desc "Run all tests"
+task :test do
+  Rake::Task["typecheck"].invoke
+  Rake::Task["spec"].invoke
+end

data/lib/solargraph/api_map.rb

@@ -386,9 +386,7 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def get_path_suggestions path
       return [] if path.nil?
-      result = []
-      result.concat store.get_path_pins(path)
-      resolve_method_aliases(result)
+      resolve_method_aliases store.get_path_pins(path)
     end
 
     # Get an array of pins that match the specified path.
@@ -447,7 +445,7 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def locate_pins location
       return [] if location.nil? || !source_map_hash.has_key?(location.filename)
-      source_map_hash[location.filename].locate_pins(location)
+      resolve_method_aliases source_map_hash[location.filename].locate_pins(location)
     end
 
     # @raise [FileNotFoundError] if the cursor's file is not in the ApiMap
@@ -464,7 +462,7 @@ module Solargraph
     # @return [Array<Pin::Symbol>]
     def document_symbols filename
       return [] unless source_map_hash.has_key?(filename) # @todo Raise error?
-      source_map_hash[filename].document_symbols
+      resolve_method_aliases source_map_hash[filename].document_symbols
     end
 
     # @return [Array<SourceMap>]
@@ -659,6 +657,7 @@ module Solargraph
       return nil if name.nil?
       return nil if skip.include?(root)
       skip.add root
+      possibles = []
       if name == ''
         if root == ''
           return ''
@@ -674,16 +673,19 @@ module Solargraph
           incs = store.get_includes(roots.join('::'))
           incs.each do |inc|
             foundinc = inner_qualify(name, inc, skip)
-            return foundinc unless foundinc.nil?
+            possibles.push foundinc unless foundinc.nil?
           end
           roots.pop
         end
-        incs = store.get_includes('')
-        incs.each do |inc|
-          foundinc = inner_qualify(name, inc, skip)
-          return foundinc unless foundinc.nil?
+        if possibles.empty?
+          incs = store.get_includes('')
+          incs.each do |inc|
+            foundinc = inner_qualify(name, inc, skip)
+            possibles.push foundinc unless foundinc.nil?
+          end
         end
         return name if store.namespace_exists?(name)
+        return possibles.last
       end
     end
 
@@ -723,7 +725,7 @@ module Solargraph
       result = []
       pins.each do |pin|
         resolved = resolve_method_alias(pin)
-        next unless visibility.include?(resolved.visibility)
+        next if resolved.respond_to?(:visibility) && !visibility.include?(resolved.visibility)
         result.push resolved
       end
       result
@@ -737,15 +739,16 @@ module Solargraph
       origin = get_method_stack(pin.full_context.namespace, pin.original, scope: pin.scope).first
       @method_alias_stack.pop
       return pin if origin.nil?
-      Pin::Method.new(
+      args = {
         location: pin.location,
         closure: pin.closure,
         name: pin.name,
         comments: origin.comments,
         scope: origin.scope,
-        visibility: origin.visibility,
-        parameters: origin.parameters
-      )
+        visibility: origin.visibility
+      }
+      args[:parameters] = origin.parameters if origin.is_a?(Pin::Method)
+      origin.class.new **args
     end
   end
 end

data/lib/solargraph/api_map/store.rb

@@ -218,7 +218,7 @@ module Solargraph
         @pin_select_cache = {}
         @namespace_map = set.classify(&:namespace).transform_values(&:to_a)
         @path_pin_hash = set.classify(&:path).transform_values(&:to_a)
-        @namespaces = @path_pin_hash.keys.compact
+        @namespaces = @path_pin_hash.keys.compact.to_set
         pins_by_class(Pin::Reference::Include).each do |pin|
           include_references[pin.namespace] ||= []
           include_references[pin.namespace].push pin.name

data/lib/solargraph/complex_type.rb

@@ -12,7 +12,7 @@ module Solargraph
 
     # @param types [Array<UniqueType>]
     def initialize types = [UniqueType::UNDEFINED]
-      @items = types
+      @items = types.uniq(&:to_s)
     end
 
     # @param api_map [ApiMap]
@@ -113,7 +113,7 @@ module Solargraph
       #
       # @param *strings [Array<String>] The type definitions to parse
       # @param partial [Boolean] True if the string is part of a another type
-      # @return [ComplexType]
+      # @return [ComplexType, Array, nil]
       def parse *strings, partial: false
         @cache ||= {}
         unless partial

data/lib/solargraph/core_fills.rb

@@ -53,6 +53,7 @@ module Solargraph
   @return_single_parameter
 @return_single_parameter
       )),
+      Override.method_return('Array#concat', 'Array'),
       Override.from_comment('Array#first', %(
 @overload first(num)
   @param num [Integer]
@@ -65,6 +66,7 @@ module Solargraph
   @return [self]
 @return_single_parameter
       )),
+      Override.method_return('Array#map', 'Array'),
       Override.method_return('Array#uniq', 'self'),
       Override.method_return('Array#zip', 'Array, nil'),
 
@@ -102,6 +104,8 @@ module Solargraph
 @param_tuple
       )),
 
+      Override.method_return('Hash#merge', 'Hash'),
+
       Override.from_comment('Integer#+', %(
 @param y [Numeric]
 @return [Numeric]
@@ -109,10 +113,6 @@ module Solargraph
 
       Override.method_return('Kernel#puts', 'nil'),
 
-      # Override.method_return('Module#attr_reader', 'void'),
-      # Override.method_return('Module#attr_writer', 'void'),
-      # Override.method_return('Module#attr_accessor', 'void'),
-
       Override.from_comment('Numeric#+', %(
 @param y [Numeric]
 @return [Numeric]
@@ -148,6 +148,10 @@ module Solargraph
       Override.method_return('String#lines', 'Array<String>'),
       Override.from_comment('String#each_line', %(
 @yieldparam [String]
+      )),
+      Override.from_comment('String.new', %(
+@overload new(*)
+  @return [self]
       ))
     ].concat(
       methods_with_yieldparam_subtypes.map do |path|

data/lib/solargraph/parser/legacy/node_processors/send_node.rb

@@ -90,7 +90,8 @@ module Solargraph
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :const
               cp = region.closure
               node.children[2..-1].each do |i|
-                pins.push Pin::Reference::Include.new(
+                type = region.scope == :class ? Pin::Reference::Extend : Pin::Reference::Include
+                pins.push type.new(
                   location: get_node_location(i),
                   closure: cp,
                   name: unpack_name(i)

data/lib/solargraph/parser/rubyvm/node_processors/send_node.rb

@@ -91,7 +91,8 @@ module Solargraph
             return unless Parser.is_ast_node?(node.children.last)
             node.children.last.children[0..-2].each do |i|
               next unless [:COLON2, :COLON3, :CONST].include?(i.type)
-              pins.push Pin::Reference::Include.new(
+              type = region.scope == :class ? Pin::Reference::Extend : Pin::Reference::Include
+              pins.push type.new(
                 location: get_node_location(i),
                 closure: region.closure,
                 name: unpack_name(i)

data/lib/solargraph/pin/base_method.rb

@@ -84,6 +84,14 @@ module Solargraph
         @explicit
       end
 
+      def completion_item_kind
+        Solargraph::LanguageServer::CompletionItemKinds::METHOD
+      end
+
+      def symbol_kind
+        Solargraph::LanguageServer::SymbolKinds::METHOD
+      end
+
       private
 
       # @return [ComplexType]

data/lib/solargraph/pin/conversions.rb

@@ -23,16 +23,15 @@ module Solargraph
 
       # @return [Hash]
       def resolve_completion_item
-        if @resolve_completion_item.nil?
+        @resolve_completion_item ||= begin
           extra = {}
           alldoc = ''
           # alldoc += link_documentation unless link_documentation.nil?
           # alldoc += "\n\n" unless alldoc.empty?
           alldoc += documentation unless documentation.nil?
           extra[:documentation] = alldoc unless alldoc.empty?
-          @resolve_completion_item = completion_item.merge(extra)
+          completion_item.merge(extra)
         end
-        @resolve_completion_item
       end
 
       # @return [Hash]

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

@@ -54,11 +54,11 @@ module Solargraph
         # @param a [Array]
         # @return [String]
         def arg_name a
-          a[0].match(/[A-Za-z0-9_]*/)[0]
+          a[0].gsub(/[^a-z0-9_]/i, '')
         end
 
         # @param a [Array]
-        # @return [Symbol]
+        # @return [::Symbol]
         def arg_type a
           if a[0].start_with?('**')
             :kwrestarg
@@ -66,10 +66,10 @@ module Solargraph
             :restarg
           elsif a[0].start_with?('&')
             :blockarg
+          elsif a[0].end_with?(':')
+            a[1] ? :kwoptarg : :kwarg
           elsif a[1]
             :optarg
-          elsif a[0].end_with?(':')
-            a[1] ? :kwarg : :kwoptarg
           else
             :arg
           end

data/lib/solargraph/source/chain.rb

@@ -110,18 +110,21 @@ module Solargraph
       # @param api_map [ApiMap]
       # @return [ComplexType]
       def infer_first_defined pins, context, api_map
-        type = ComplexType::UNDEFINED
+        possibles = []
         pins.each do |pin|
           # Avoid infinite recursion
           next if @@inference_stack.include?(pin.identity)
           @@inference_stack.push pin.identity
           type = pin.typify(api_map)
           @@inference_stack.pop
-          break if type.defined?
+          if type.defined?
+            possibles.push type
+            break if pin.is_a?(Pin::BaseMethod)
+          end
         end
-        if type.undefined?
+        if possibles.empty?
           # Limit method inference recursion
-          return type if @@inference_depth >= 10 && pins.first.is_a?(Pin::BaseMethod)
+          return ComplexType::UNDEFINED if @@inference_depth >= 10 && pins.first.is_a?(Pin::BaseMethod)
           @@inference_depth += 1
           pins.each do |pin|
             # Avoid infinite recursion
@@ -129,10 +132,20 @@ module Solargraph
             @@inference_stack.push pin.identity
             type = pin.probe(api_map)
             @@inference_stack.pop
-            break if type.defined?
+            if type.defined?
+              possibles.push type
+              break if pin.is_a?(Pin::BaseMethod)
+            end
           end
           @@inference_depth -= 1
         end
+        return ComplexType::UNDEFINED if possibles.empty?
+        type = if possibles.length > 1
+          sorted = possibles.map { |t| t.rooted? ? "::#{t}" : t.to_s }.sort { |a, _| a == 'nil' ? 1 : 0 }
+          ComplexType.parse(*sorted)
+        else
+          possibles.first
+        end
         return type if context.nil? || context.return_type.undefined?
         type.self_to(context.return_type.namespace)
       end

data/lib/solargraph/version.rb

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

data/lib/solargraph/yard_map.rb

@@ -158,10 +158,12 @@ module Solargraph
       @cache ||= YardMap::Cache.new
     end
 
+    # @return [Hash]
     def pin_class_hash
       @pin_class_hash ||= pins.to_set.classify(&:class).transform_values(&:to_a)
     end
 
+    # @return [Array<Pin::Base>]
     def pins_by_class klass
       @pin_select_cache[klass] ||= pin_class_hash.select { |key, _| key <= klass }.values.flatten
     end

data/lib/solargraph/yard_map/mapper.rb

@@ -35,10 +35,10 @@ module Solargraph
             # This method of superclass detection is a bit of a hack. If
             # the superclass is a Proxy, it is assumed to be undefined in its
             # yardoc and converted to a fully qualified namespace.
-            if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
-              superclass = "::#{code_object.superclass}"
+            superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
+              "::#{code_object.superclass}"
             else
-              superclass = code_object.superclass.to_s
+              code_object.superclass.to_s
             end
             result.push Solargraph::Pin::Reference::Superclass.new(name: superclass, closure: nspin)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.39.15
+  version: 0.39.16
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport