solargraph 0.31.1 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a170a254c51b9119d68f9542bb621eee41831b814e94d5f987eb2c7d78f412ba
-  data.tar.gz: 9beff1ee445b21b89dbbcee0d2a68bed60911940a8587a58c6c361aa0ca7ffad
+  metadata.gz: ad024bb9d47484f46c548f061033e61bae31c8108f8c22a1910d6ec9daebc172
+  data.tar.gz: 18235c0ac8d50fcf1cbce67e8545d9f92e5c7363c9b7a9b22ce6894afbc0b4ee
 SHA512:
-  metadata.gz: 79d0c51c0b65bf9f10f816b3821aa463d4f767a6ef926a948574e7c33b6f24eb8be5eda8a93bb41ad8d8e56bd73800b57fcc1e79cf85cf05efcf5279bff34319
-  data.tar.gz: a6ddfcd658534c8f6c01d1b5f9ab25d13c9bc0abb2f437e783e6a89a280048d8886b8b105afc37f428ac25ecf403f9ad9e1a26dff5a7903c1eac28d04f10f953
+  metadata.gz: d3479bfd3f3ac8e55ac40f9edbd304e7ade94618c316327cdca6bc3f06dcded61e6cec6d8f4388052e436aa96abe95c46db3572bd09bf9296ea3821a4f0192fc
+  data.tar.gz: 3c49842db66464930b789325e10dac77b9fa35131a44b587a32ac8d3293b99ce89a498d716693663dd2c511be254dffe8316168bd824a301b5b4fd0bea7d5bf5

data/lib/solargraph/api_map.rb

@@ -429,10 +429,10 @@ module Solargraph
     end
 
     # @param location [Solargraph::Location]
-    # @return [Solargraph::Pin::Base]
-    def locate_pin location
-      return nil if location.nil? || !source_map_hash.has_key?(location.filename)
-      source_map_hash[location.filename].locate_pin(location)
+    # @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)
     end
 
     # @raise [FileNotFoundError] if the cursor's file is not in the ApiMap
@@ -587,6 +587,11 @@ module Solargraph
           while roots.length > 0
             fqns = roots.join('::') + '::' + name
             return fqns if store.namespace_exists?(fqns)
+            incs = store.get_includes(roots.join('::'))
+            incs.each do |inc|
+              foundinc = inner_qualify(name, inc, skip)
+              return foundinc unless foundinc.nil?
+            end
             roots.pop
           end
           return name if store.namespace_exists?(name)

data/lib/solargraph/complex_type/type_methods.rb

@@ -85,19 +85,24 @@ module Solargraph
         tag == other.tag
       end
 
+      def rooted?
+        @rooted
+      end
+
       # Generate a ComplexType that fully qualifies this type's namespaces.
       #
       # @param api_map [ApiMap] The ApiMap that performs qualification
       # @param context [String] The namespace from which to resolve names
       # @return [ComplexType] The generated ComplexType
       def qualify api_map, context = ''
-        return ComplexType.parse(tag) if duck_type? or void? or undefined?
-        fqns = api_map.qualify(name, context)
-        # return ComplexType::UNDEFINED if fqns.nil?
+        return ComplexType.new([self]) if duck_type? || void? || undefined?
+        recon = (rooted? ? '' : context)
+        fqns = api_map.qualify(name, recon)
         if fqns.nil?
           return ComplexType.parse('Boolean') if tag == 'Boolean'
           return ComplexType::UNDEFINED
         end
+        fqns = "::#{fqns}" # Ensure the resulting complex type is rooted
         ltypes = key_types.map do |t|
           t.qualify api_map, context
         end

data/lib/solargraph/complex_type/unique_type.rb

@@ -14,9 +14,15 @@ module Solargraph
       # @param name [String] The name of the type
       # @param substring [String] The substring of the type
       def initialize name, substring = ''
-        @name = name
+        if name.start_with?('::')
+          @name = name[2..-1]
+          @rooted = true
+        else
+          @name = name
+          @rooted = false
+        end
         @substring = substring
-        @tag = name + substring
+        @tag = @name + substring
         @key_types = []
         @subtypes = []
         return unless parameters?

data/lib/solargraph/language_server/host.rb

@@ -423,42 +423,32 @@ module Solargraph
         @stopped
       end
 
-      # Locate a pin based on the location of a completion item, or nil if the
-      # library does not have a source at that location.
-      #
-      # @param params [Hash] A hash representation of a completion item
-      # @return [Pin::Base, nil]
-      def locate_pin params
-        return nil unless params['data'] && params['data']['uri'] && params['data']['location']
-        library = library_for(params['data']['uri'])
-        location = Location.new(
-          params['data']['location']['filename'],
-          Range.from_to(
-            params['data']['location']['range']['start']['line'],
-            params['data']['location']['range']['start']['character'],
-            params['data']['location']['range']['end']['line'],
-            params['data']['location']['range']['end']['character']
-          )
-        )
-        library.locate_pin(location)
-      end
-
       # Locate multiple pins that match a completion item. The first match is
-      # based on the corresponding location in a library source if available
-      # (see #locate_pin). Subsequent matches are based on path.
+      # based on the corresponding location in a library source if available.
+      # Subsequent matches are based on path.
       #
       # @param params [Hash] A hash representation of a completion item
       # @return [Array<Pin::Base>]
       def locate_pins params
         return [] unless params['data'] && params['data']['uri']
-        exact = locate_pin(params)
         library = library_for(params['data']['uri'])
         result = []
-        unless params['data']['path'].nil?
-          result.concat library.path_pins(params['data']['path']).reject{|pin| pin == exact}
+        if params['data']['location']
+          location = Location.new(
+            params['data']['location']['filename'],
+            Range.from_to(
+              params['data']['location']['range']['start']['line'],
+              params['data']['location']['range']['start']['character'],
+              params['data']['location']['range']['end']['line'],
+              params['data']['location']['range']['end']['character']
+            )
+          )
+          result.concat library.locate_pins(location).select{ |pin| pin.name == params['label'] }
         end
-        result.unshift exact unless exact.nil?
-        result
+        if params['data']['path']
+          result.concat library.path_pins(params['data']['path'])
+        end
+        result.uniq
       end
 
       # @param uri [String]

data/lib/solargraph/language_server/host/dispatch.rb

@@ -26,8 +26,10 @@ module Solargraph
         def update_libraries src
           # @todo This module should not call cataloger and diagnoser
           libraries.each do |lib|
-            lib.merge src
-            cataloger.ping(lib) if lib.contain?(src.filename) || lib.open?(src.filename)
+            if lib.contain?(src.filename) || lib.open?(src.filename)
+              lib.merge src
+              cataloger.ping(lib)
+            end
           end
           diagnoser.schedule file_to_uri(src.filename) if src.synchronized?
         end

data/lib/solargraph/library.rb

@@ -229,8 +229,8 @@ module Solargraph
     #
     # @param location [Location]
     # @return [Solargraph::Pin::Base]
-    def locate_pin location
-      api_map.locate_pin location
+    def locate_pins location
+      api_map.locate_pins location
     end
 
     # Get an array of pins that match a path.

data/lib/solargraph/pin/base.rb

@@ -192,6 +192,31 @@ module Solargraph
         true
       end
 
+      def proxied?
+        @proxied ||= false
+      end
+
+      # Return a proxy for this pin with the specified return type. Other than
+      # the return type and the #proxied? setting, the proxy should be a clone
+      # of the original.
+      #
+      # @param return_type [ComplexType]
+      # @return [self]
+      def proxy return_type
+        result = dup
+        result.return_complex_type = return_type
+        result.proxied = true
+        result
+      end
+
+      protected
+
+      # @return [Boolean]
+      attr_writer :proxied
+
+      # @return [ComplexType]
+      attr_writer :return_complex_type
+
       private
 
       # @return [void]

data/lib/solargraph/pin/block_parameter.rb

@@ -71,6 +71,7 @@ module Solargraph
         block
       end
 
+      # @param api_map [ApiMap]
       def typify api_map
         # @todo Does anything need to be eliminated because it's more accurately a probe?
         type = super
@@ -87,7 +88,7 @@ module Solargraph
           else
             yps = meth.docstring.tags(:yieldparam)
             unless yps[index].nil? or yps[index].types.nil? or yps[index].types.empty?
-              return ComplexType.parse(yps[index].types[0]).first
+              return ComplexType.parse(yps[index].types.first).qualify(api_map, meth.context.namespace)
             end
           end
         end

data/lib/solargraph/source.rb

@@ -281,6 +281,22 @@ module Solargraph
       @synchronized
     end
 
+    # Get a hash of comments grouped by the line numbers of the associated code.
+    #
+    # @return [Hash{Integer => Array<Parser::Source::Comment>}]
+    def associated_comments
+      @associated_comments ||= begin
+        result = {}
+        Parser::Source::Comment.associate_locations(node, comments).each_pair do |loc, all|
+          block = all #.select{ |l| l.document? || code.lines[l.loc.line].strip.start_with?('#')}
+          next if block.empty?
+          result[loc.line] ||= []
+          result[loc.line].concat block
+        end
+        result
+      end
+    end
+
     private
 
     # @param top [Parser::AST::Node]
@@ -299,22 +315,6 @@ module Solargraph
       end
     end
 
-    # Get a hash of comments grouped by the line numbers of the associated code.
-    #
-    # @return [Hash{Integer => Array<Parser::Source::Comment>}]
-    def associated_comments
-      @associated_comments ||= begin
-        result = {}
-        Parser::Source::Comment.associate_locations(node, comments).each_pair do |loc, all|
-          block = all #.select{ |l| l.document? || code.lines[l.loc.line].strip.start_with?('#')}
-          next if block.empty?
-          result[loc.line] ||= []
-          result[loc.line].concat block
-        end
-        result
-      end
-    end
-
     # Get a string representation of an array of comments.
     #
     # @param comments [Array<Parser::Source::Comment>]

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

@@ -59,7 +59,7 @@ module Solargraph
             type = p.typify(api_map)
             type = p.probe(api_map) if type.undefined?
             next p if p.return_complex_type == type
-            Pin::ProxyType.new(p.location, nil, p.name, type)
+            p.proxy type
           end
           result
         end

data/lib/solargraph/source_map.rb

@@ -84,10 +84,10 @@ module Solargraph
     end
 
     # @param location [Solargraph::Location]
-    # @return [Solargraph::Pin::Base]
-    def locate_pin location
+    # @return [Array<Solargraph::Pin::Base>]
+    def locate_pins location
       # return nil unless location.start_with?("#{filename}:")
-      pins.select { |pin| pin.location == location }.first
+      pins.select { |pin| pin.location == location }
     end
 
     def locate_named_path_pin line, character

data/lib/solargraph/source_map/clip.rb

@@ -54,6 +54,7 @@ module Solargraph
             result.concat api_map.get_methods(context_pin.context.namespace, scope: context_pin.context.scope, visibility: [:public, :private, :protected])
             result.concat api_map.get_methods('Kernel')
             result.concat ApiMap.keywords
+            result.concat yielded_self_pins
           end
         end
         package_completions(result)
@@ -107,6 +108,26 @@ module Solargraph
         @context_pin ||= source_map.locate_named_path_pin(cursor.node_position.line, cursor.node_position.character)
       end
 
+      # @return [Array<Pin::Base>]
+      def yielded_self_pins
+        return [] unless block.is_a?(Pin::Block) && block.receiver
+        chain = Solargraph::Source::NodeChainer.chain(block.receiver, source_map.source.filename)
+        receiver_pin = chain.define(api_map, context_pin, locals).first
+        return [] if receiver_pin.nil?
+        result = []
+        ys = receiver_pin.docstring.tag(:yieldself)
+        unless ys.nil? || ys.types.empty?
+          ysct = ComplexType.parse(*ys.types).qualify(api_map, receiver_pin.context.namespace)
+          result.concat api_map.get_complex_type_methods(ysct, ysct.namespace, true)
+        end
+        ys = receiver_pin.docstring.tag(:yieldpublic)
+        unless ys.nil? || ys.types.empty?
+          ysct = ComplexType.parse(*ys.types).qualify(api_map, receiver_pin.context.namespace)
+          result.concat api_map.get_complex_type_methods(ysct, '', false)
+        end
+        result
+      end
+
       # @param result [Array<Pin::Base>]
       # @return [Completion]
       def package_completions result

data/lib/solargraph/source_map/mapper.rb

@@ -10,6 +10,8 @@ module Solargraph
 
       private_class_method :new
 
+      MACRO_REGEXP = /(@\!method|@\!attribute|@\!domain|@\!macro|@\!parse)/.freeze
+
       # Generate the data.
       #
       # @param source [Source]
@@ -58,7 +60,7 @@ module Solargraph
       end
 
       def process_comment position, comment
-        return unless comment =~ /(@\!method|@\!attribute|@\!domain|@\!macro|@\!parse)/
+        return unless comment =~ MACRO_REGEXP
         cmnt = remove_inline_comment_hashes(comment)
         parse = YARD::Docstring.parser.parse(cmnt)
         parse.directives.each { |d| process_directive(position, d) }
@@ -121,30 +123,13 @@ module Solargraph
         ctxt
       end
 
+      # @return [void]
       def process_comment_directives
-        return unless @code =~ /(@\!method|@\!attribute|@\!domain|@\!macro|@\!parse)/
-        current = []
-        last_line = nil
-        @comments.each do |cmnt|
-          if cmnt.inline?
-            if last_line.nil? || cmnt.loc.expression.line == last_line + 1
-              if cmnt.loc.expression.column.zero? || @code.lines[cmnt.loc.expression.line][0..cmnt.loc.expression.column-1].strip.empty?
-                current.push cmnt
-              else
-                # @todo Connected to a line of code. Handle separately
-              end
-            elsif !current.empty?
-              process_comment Position.new(current.last.loc.expression.line, current.last.loc.expression.column), current.map(&:text).join("\n")
-              current.clear
-              current.push cmnt
-            end
-          else
-            # @todo Handle block comments
-          end
-          last_line = cmnt.loc.expression.line
-        end
-        unless current.empty?
-          process_comment Position.new(current.last.loc.expression.line, current.last.loc.expression.column), current.map(&:text).join("\n")
+        return unless @code =~ MACRO_REGEXP
+        @source.associated_comments.each do |line, comments|
+          pos = Position.new(line, @code.lines[line].chomp.length)
+          txt = comments.map(&:text).join("\n")
+          process_comment(pos, txt)
         end
       end
     end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.31.1'
+  VERSION = '0.31.2'
 end

data/lib/yard-solargraph.rb

@@ -12,5 +12,7 @@ end
 YARD::Tags::Library.define_tag("Type", :type, :with_types_and_name)
 # Define a @yieldself tag for documenting block contexts
 YARD::Tags::Library.define_tag("Yieldself", :yieldself, :with_types)
+# Define a @yieldpublic tag for documenting block domains
+YARD::Tags::Library.define_tag("Yieldpublic", :yieldpublic, :with_types)
 # Define a @!domain directive for documenting DSLs
 YARD::Tags::Library.define_directive("domain", :with_types, Solargraph::DomainDirective)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.31.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport