solargraph 0.39.5 → 0.39.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d82e12b3dbc74f908e6fd15757e8856c7c3af088ccbfbc6724f390884f878d
-  data.tar.gz: df04fa34d85b0633d05ab8fd216873264a4cdaa148089ffa3af909ec68a227a7
+  metadata.gz: 9d4f1258688f603e08ed6d5ed023579fbdd3e1829ae3d4e96fa093b08bf7377c
+  data.tar.gz: 817c20ca0469e682338f40e10edd3c3b21d23e5a4969c519d590ec1c995ae08b
 SHA512:
-  metadata.gz: d1972e824e94ad830815eb780629ef985a5be4b21247f426b603e209cecc60d6c5c02219c63cdc2c6c9ab184013d72e1798c29ef90b5a91d77a92f8dd35e1295
-  data.tar.gz: 7f5564c3de416999a40e381d853746e759898da6fa09eb6d967735478a24635f1af3cee6695894b7213c8b6746e73d8e3d57d3adc141ab505040e0eb4c8134cd
+  metadata.gz: 2b553ee5d770a0f3ab3fb4c4c5b386ab5dde03ba74cdffe0eb718e0d64cccd8c9e4bbfcf4b35540b2323a1c0553de4d335ca839a269887f6a6615093e5957971
+  data.tar.gz: 4d2b2bae341dc7102f130f04cec657766a02803ecd2f4f74a23246cdac1ef5d2f6c1d53127b4034780b949b2be3ecc3fc1969662c31329c00e4fdd7e5bb43d6a

data/lib/solargraph.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+Encoding.default_external = 'UTF-8'
+
+require 'solargraph/compat'
 require 'solargraph/version'
 
 # The top-level namespace for the Solargraph code mapping, documentation,

data/lib/solargraph/api_map.rb

@@ -26,7 +26,6 @@ module Solargraph
     def initialize pins: []
       @source_map_hash = {}
       @cache = Cache.new
-      @mutex = Mutex.new
       @method_alias_stack = []
       index pins
     end
@@ -34,13 +33,11 @@ module Solargraph
     # @param pins [Array<Pin::Base>]
     # @return [self]
     def index pins
-      @mutex.synchronize {
-        @source_map_hash.clear
-        @cache.clear
-        @store = Store.new(pins + YardMap.new.pins)
-        @unresolved_requires = []
-        workspace_filenames.clear
-      }
+      @source_map_hash.clear
+      @cache.clear
+      @store = Store.new(pins + YardMap.new.pins)
+      @unresolved_requires = []
+      workspace_filenames.clear
       self
     end
 
@@ -123,14 +120,14 @@ module Solargraph
       reqs.merge br.keys
       yard_map.change(reqs.to_a, br, bundle.workspace.gemnames)
       new_store = Store.new(pins + yard_map.pins)
-      @mutex.synchronize {
-        @cache.clear
-        @source_map_hash = new_map_hash
-        @store = new_store
-        @unresolved_requires = yard_map.unresolved_requires
-        workspace_filenames.clear
-        workspace_filenames.concat bundle.workspace.filenames
-      }
+      @cache.clear
+      @source_map_hash = new_map_hash
+      @store = new_store
+      @unresolved_requires = yard_map.unresolved_requires
+      workspace_filenames.clear
+      workspace_filenames.concat bundle.workspace.filenames
+      @rebindable_method_names = nil
+      store.block_pins.each { |blk| blk.rebind(self) }
       self
     end
 
@@ -179,6 +176,16 @@ module Solargraph
       store.pins
     end
 
+    def rebindable_method_names
+      @rebindable_method_names ||= begin
+        result = yard_map.rebindable_method_names
+        source_maps.each do |map|
+          result.merge map.rebindable_method_names
+        end
+        result
+      end
+    end
+
     # An array of pins based on Ruby keywords (`if`, `end`, etc.).
     #
     # @return [Array<Solargraph::Pin::Keyword>]
@@ -280,8 +287,7 @@ module Solargraph
 
     # @return [Array<Solargraph::Pin::GlobalVariable>]
     def get_global_variable_pins
-      # @todo Slow version
-      pins.select{ |p| p.is_a?(Pin::GlobalVariable) }
+      store.pins_by_class(Pin::GlobalVariable)
     end
 
     # Get an array of methods available in a particular context.
@@ -535,17 +541,17 @@ module Solargraph
     #
     # @return [Hash{String => SourceMap}]
     def source_map_hash
-      @mutex.synchronize { @source_map_hash }
+      @source_map_hash
     end
 
     # @return [ApiMap::Store]
     def store
-      @mutex.synchronize { @store }
+      @store
     end
 
     # @return [Solargraph::ApiMap::Cache]
     def cache
-      @mutex.synchronize { @cache }
+      @cache
     end
 
     # @param fqns [String] A fully qualified namespace

data/lib/solargraph/api_map/cache.rb

@@ -10,6 +10,7 @@ module Solargraph
         @receiver_definitions = {}
       end
 
+      # @return [Array<Pin::BaseMethod>]
       def get_methods fqns, scope, visibility, deep
         @methods[[fqns, scope, visibility.sort, deep]]
       end
@@ -18,6 +19,7 @@ module Solargraph
         @methods[[fqns, scope, visibility.sort, deep]] = value
       end
 
+      # @return [Array<Pin::Base>]
       def get_constants namespace, context
         @constants[[namespace, context]]
       end
@@ -26,6 +28,7 @@ module Solargraph
         @constants[[namespace, context]] = value
       end
 
+      # @return [String]
       def get_qualified_namespace name, context
         @qualified_namespaces[[name, context]]
       end
@@ -38,6 +41,7 @@ module Solargraph
         @receiver_definitions.key? path
       end
 
+      # @return [Pin::BaseMethod]
       def get_receiver_definition path
         @receiver_definitions[path]
       end

data/lib/solargraph/api_map/store.rb

@@ -99,12 +99,12 @@ module Solargraph
 
       # @return [Array<Solargraph::Pin::Base>]
       def namespace_pins
-        @namespace_pins ||= []
+        pins_by_class(Solargraph::Pin::Namespace)
       end
 
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Array<Solargraph::Pin::BaseMethod>]
       def method_pins
-        @method_pins ||= []
+        pins_by_class(Solargraph::Pin::BaseMethod)
       end
 
       # @param fqns [String]
@@ -133,7 +133,7 @@ module Solargraph
 
       # @return [Array<Pin::Block>]
       def block_pins
-        @block_pins ||= []
+        pins_by_class(Pin::Block)
       end
 
       def inspect
@@ -141,6 +141,12 @@ module Solargraph
         to_s
       end
 
+      # @param klass [Class]
+      # @return [Array<Solargraph::Pin::Base>]
+      def pins_by_class klass
+        @pin_select_cache[klass] ||= @pin_class_hash.select { |key, _| key <= klass }.values.flatten
+      end
+
       private
 
       # @param fqns [String]
@@ -167,7 +173,7 @@ module Solargraph
 
       # @return [Array<Solargraph::Pin::Symbol>]
       def symbols
-        @symbols ||= []
+        pins_by_class(Pin::Symbol)
       end
 
       def superclass_references
@@ -198,7 +204,7 @@ module Solargraph
       end
 
       def all_instance_variables
-        @all_instance_variables ||= []
+        pins_by_class(Pin::InstanceVariable)
       end
 
       def path_pin_hash
@@ -207,48 +213,29 @@ module Solargraph
 
       # @return [void]
       def index
-        namespace_map.clear
-        namespaces.clear
-        namespace_pins.clear
-        method_pins.clear
-        symbols.clear
-        block_pins.clear
-        all_instance_variables.clear
-        path_pin_hash.clear
-        namespace_map[''] = []
-        override_pins = []
-        pins.each do |pin|
-          namespace_map[pin.namespace] ||= []
-          namespace_map[pin.namespace].push pin
-          namespaces.add pin.path if pin.is_a?(Pin::Namespace) && !pin.path.empty?
-          namespace_pins.push pin if pin.is_a?(Pin::Namespace)
-          method_pins.push pin if pin.is_a?(Pin::BaseMethod)
-          symbols.push pin if pin.is_a?(Pin::Symbol)
-          if pin.is_a?(Pin::Reference::Include)
-            include_references[pin.namespace] ||= []
-            include_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Reference::Prepend)
-            prepend_references[pin.namespace] ||= []
-            prepend_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Reference::Extend)
-            extend_references[pin.namespace] ||= []
-            extend_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Reference::Superclass)
-            superclass_references[pin.namespace] ||= []
-            superclass_references[pin.namespace].push pin.name
-          elsif pin.is_a?(Pin::Block)
-            block_pins.push pin
-          elsif pin.is_a?(Pin::InstanceVariable)
-            all_instance_variables.push pin
-          elsif pin.is_a?(Pin::Reference::Override)
-            override_pins.push pin
-          end
-          if pin.path
-            path_pin_hash[pin.path] ||= []
-            path_pin_hash[pin.path].push pin
-          end
+        set = pins.to_set
+        @pin_class_hash = set.classify(&:class).transform_values(&:to_a)
+        @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
+        pins_by_class(Pin::Reference::Include).each do |pin|
+          include_references[pin.namespace] ||= []
+          include_references[pin.namespace].push pin.name
+        end
+        pins_by_class(Pin::Reference::Prepend).each do |pin|
+          prepend_references[pin.namespace] ||= []
+          prepend_references[pin.namespace].push pin.name
+        end
+        pins_by_class(Pin::Reference::Extend).each do |pin|
+          extend_references[pin.namespace] ||= []
+          extend_references[pin.namespace].push pin.name
+        end
+        pins_by_class(Pin::Reference::Superclass).each do |pin|
+          superclass_references[pin.namespace] ||= []
+          superclass_references[pin.namespace].push pin.name
         end
-        override_pins.each do |ovr|
+        pins_by_class(Pin::Reference::Override).each do |ovr|
           pin = get_path_pins(ovr.name).first
           next if pin.nil?
           (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
@@ -261,6 +248,7 @@ module Solargraph
         # @todo This is probably not the best place for these overrides
         superclass_references['Integer'] = ['Numeric']
         superclass_references['Float'] = ['Numeric']
+        superclass_references['File'] = ['IO']
       end
     end
   end

data/lib/solargraph/compat.rb

@@ -0,0 +1,9 @@
+unless Hash.method_defined?(:transform_values)
+  class Hash
+    def transform_values &block
+      each_pair do |k, v|
+        self[k] = block.call(v)
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/host.rb

@@ -99,7 +99,7 @@ module Solargraph
           message = Message.select(request['method']).new(self, request)
           begin
             message.process
-          rescue Exception => e
+          rescue StandardError => e
             logger.warn "Error processing request: [#{e.class}] #{e.message}"
             logger.warn e.backtrace.join("\n")
             message.set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}"

data/lib/solargraph/language_server/uri_helpers.rb

@@ -34,6 +34,7 @@ module Solargraph
            .gsub('%3A', ':')
            .gsub('%5C', '\\')
            .gsub('%2F', '/')
+           .gsub('+', '%20')
       end
 
       # Decode text from a URI path component in LSP.

data/lib/solargraph/library.rb

@@ -339,7 +339,7 @@ module Solargraph
         logger.info "Cataloging #{workspace.directory.empty? ? 'generic workspace' : workspace.directory}"
         api_map.catalog bundle
         @synchronized = true
-        logger.info "Catalog complete (#{api_map.pins.length} pins)"
+        logger.info "Catalog complete (#{api_map.source_maps.length} files, #{api_map.pins.length} pins)" if logger.info?
       end
     end
 

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

@@ -36,6 +36,8 @@ module Solargraph
                 process_prepend
               elsif node.children[1] == :require
                 process_require
+              elsif node.children[1] == :autoload
+                process_autoload
               elsif node.children[1] == :private_constant
                 process_private_constant
               elsif node.children[1] == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
@@ -138,6 +140,14 @@ module Solargraph
             end
           end
 
+          # @return [void]
+          def process_autoload
+            if node.children[3].is_a?(AST::Node) && node.children[3].type == :str
+              path = node.children[3].children[0].to_s
+              pins.push Pin::Reference::Require.new(get_node_location(node), path)
+            end
+          end
+
           # @return [void]
           def process_module_function
             if node.children[2].nil?

data/lib/solargraph/parser/rubyvm/node_methods.rb

@@ -95,6 +95,7 @@ module Solargraph
           index = 0
           until index > node.children[0].children.length - 2
             k = node.children[0].children[index]
+            return {} unless node?(k)
             v = node.children[0].children[index + 1]
             result[k.children[0]] = Solargraph::Parser.chain(v)
             index += 2

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

@@ -16,7 +16,12 @@ module Solargraph
               presence: region.closure.location.range,
               decl: require_keyword?(node) ? :kwarg : :kwoptarg
             )
-            region.closure.parameters.push locals.last
+            idx = region.closure.parameters.find_index { |par| [:kwrestarg, :blockarg].include?(par.decl) }
+            if idx
+              region.closure.parameters.insert idx, locals.last
+            else
+              region.closure.parameters.push locals.last
+            end
             node.children[1] && NodeProcessor.process(node.children[1], region, pins, locals)
           end
 

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

@@ -16,7 +16,12 @@ module Solargraph
               presence: region.closure.location.range,
               decl: :optarg
             )
-            region.closure.parameters.push locals.last
+            idx = region.closure.parameters.find_index { |par| par.decl != :arg }
+            if idx
+              region.closure.parameters.insert idx, locals.last
+            else
+              region.closure.parameters.push locals.last
+            end
             node.children[1] && NodeProcessor.process(node.children[1], region, pins, locals)
           end
         end

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

@@ -28,6 +28,8 @@ module Solargraph
               process_module_function
             elsif node.children[0] == :require
               process_require
+            elsif node.children[0] == :autoload
+              process_autoload
             elsif node.children[0] == :alias_method
               process_alias_method
             elsif node.children[0] == :private_class_method
@@ -143,6 +145,15 @@ module Solargraph
             end
           end
 
+          # @return [void]
+          def process_autoload
+            return unless Parser.is_ast_node?(node.children[1]) && Parser.is_ast_node?(node.children[1].children[1])
+            arg = node.children[1].children[1]
+            if arg.type == :STR
+              pins.push Pin::Reference::Require.new(get_node_location(arg), arg.children[0])
+            end
+          end
+
           # @return [void]
           def process_module_function
             if node.type == :VCALL

data/lib/solargraph/pin/base.rb

@@ -23,7 +23,7 @@ module Solargraph
 
       # @param location [Solargraph::Location]
       # @param kind [Integer]
-      # @param closure [String]
+      # @param closure [Solargraph::Pin::Closure]
       # @param name [String]
       # @param comments [String]
       def initialize location: nil, closure: nil, name: '', comments: ''
@@ -38,7 +38,7 @@ module Solargraph
         @comments ||= ''
       end
 
-      # @return [String]
+      # @return [String, nil]
       def filename
         return nil if location.nil?
         location.filename

data/lib/solargraph/pin/block.rb

@@ -14,17 +14,14 @@ module Solargraph
         @parameters = args
       end
 
-      def rebind context
-        @rebound = true
-        @binder = context unless context.undefined?
-      end
-
-      def rebound?
-        @rebound ||= false
+      # @param api_map [ApiMap]
+      # @return [void]
+      def rebind api_map
+        @binder ||= binder_or_nil(api_map)
       end
 
       def binder
-        @binder || context
+        @binder || closure.binder
       end
 
       # @return [Array<String>]
@@ -37,11 +34,28 @@ module Solargraph
         @parameter_names ||= parameters.map(&:name)
       end
 
-      def nearly? other
-        return false unless super
-        # @todo Trying to not to block merges too much
-        # receiver == other.receiver and parameters == other.parameters
-        true
+      private
+
+      # @param api_map [ApiMap]
+      # @return [ComplexType, nil]
+      def binder_or_nil api_map
+        return nil unless receiver
+        word = receiver.children.find { |c| c.is_a?(::Symbol) }.to_s
+        return nil unless api_map.rebindable_method_names.include?(word)
+        chain = Parser.chain(receiver, location.filename)
+        locals = api_map.source_map(location.filename).locals_at(location)
+        if ['instance_eval', 'instance_exec', 'class_eval', 'class_exec', 'module_eval', 'module_exec'].include?(chain.links.last.word)
+          return chain.base.infer(api_map, self, locals)
+        else
+          receiver_pin = chain.define(api_map, self, locals).first
+          if receiver_pin && receiver_pin.docstring
+            ys = receiver_pin.docstring.tag(:yieldself)
+            if ys && ys.types && !ys.types.empty?
+              return ComplexType.try_parse(*ys.types).qualify(api_map, receiver_pin.context.namespace)
+            end
+          end
+        end
+        nil
       end
     end
   end

data/lib/solargraph/pin/method.rb

@@ -5,7 +5,7 @@ module Solargraph
     class Method < BaseMethod
       include Solargraph::Parser::NodeMethods
 
-      # @return [Array<String>]
+      # @return [Array<Pin::Parameter>]
       attr_reader :parameters
 
       # @param args [Array<String>]

data/lib/solargraph/pin/parameter.rb

@@ -41,7 +41,7 @@ module Solargraph
           "*#{name}"
         when :kwrestarg
           "**#{name}"
-        when :block
+        when :block, :blockarg
           "&#{name}"
         else
           name

data/lib/solargraph/shell.rb

@@ -175,7 +175,7 @@ module Solargraph
             puts pin_description(pin) if options[:verbose]
             pin.typify api_map
             pin.probe api_map
-          rescue Exception => e
+          rescue StandardError => e
             STDERR.puts "Error testing #{pin_description(pin)} #{pin.location ? "at #{pin.location.filename}:#{pin.location.range.start.line + 1}" : ''}"
             STDERR.puts "[#{e.class}]: #{e.message}"
             STDERR.puts e.backtrace.join("\n")

data/lib/solargraph/source/chain.rb

@@ -57,7 +57,6 @@ module Solargraph
       # @param locals [Array<Pin::Base>]
       # @return [Array<Pin::Base>]
       def define api_map, name_pin, locals
-        rebind_block name_pin, api_map, locals
         return [] if undefined?
         working_pin = name_pin
         links[0..-2].each do |link|
@@ -79,7 +78,6 @@ module Solargraph
       # @param locals [Array<Pin::Base>]
       # @return [ComplexType]
       def infer api_map, name_pin, locals
-        rebind_block name_pin, api_map, locals
         pins = define(api_map, name_pin, locals)
         infer_first_defined(pins, links.last.last_context, api_map)
       end
@@ -138,35 +136,6 @@ module Solargraph
         return type if context.nil? || context.return_type.undefined?
         type.self_to(context.return_type.namespace)
       end
-
-      def skippable_block_receivers api_map
-        @@skippable_block_receivers ||= (
-          api_map.get_methods('Array', deep: false).map(&:name) +
-          api_map.get_methods('Enumerable', deep: false).map(&:name) +
-          api_map.get_methods('Hash', deep: false).map(&:name) +
-          ['new']
-        ).to_set
-      end
-
-      def rebind_block pin, api_map, locals
-        return unless pin.is_a?(Pin::Block) && pin.receiver && !pin.rebound?
-        # This first rebind just sets the block pin's rebound state
-        pin.rebind ComplexType::UNDEFINED
-        chain = Parser.chain(pin.receiver, pin.location.filename)
-        return if skippable_block_receivers(api_map).include?(chain.links.last.word)
-        if ['instance_eval', 'instance_exec', 'class_eval', 'class_exec', 'module_eval', 'module_exec'].include?(chain.links.last.word)
-          type = chain.base.infer(api_map, pin, locals)
-          pin.rebind type
-        else
-          receiver_pin = chain.define(api_map, pin, locals).first
-          return if receiver_pin.nil? || receiver_pin.docstring.nil?
-          ys = receiver_pin.docstring.tag(:yieldself)
-          unless ys.nil? || ys.types.nil? || ys.types.empty?
-            ysct = ComplexType.try_parse(*ys.types).qualify(api_map, receiver_pin.context.namespace)
-            pin.rebind ysct
-          end
-        end
-      end
     end
   end
 end

data/lib/solargraph/source/source_chainer.rb

@@ -17,7 +17,6 @@ module Solargraph
         # @param position [Position]
         # @return [Source::Chain]
         def chain source, position
-          # raise "Not a source" unless source.is_a?(Source)
           new(source, position).chain
         end
       end
@@ -32,6 +31,8 @@ module Solargraph
 
       # @return [Source::Chain]
       def chain
+        # Special handling for files that end with an integer and a period
+        return Chain.new([Chain::Literal.new('Integer'), Chain::UNDEFINED_CALL]) if phrase =~ /^[0-9]+\.$/
         return Chain.new([Chain::Literal.new('Symbol')]) if phrase.start_with?(':') && !phrase.start_with?('::')
         begin
           return Chain.new([]) if phrase.end_with?('..')

data/lib/solargraph/source_map.rb

@@ -3,6 +3,7 @@
 require 'jaro_winkler'
 require 'yard'
 require 'yard-solargraph'
+require 'set'
 
 module Solargraph
   # An index of pins and other ApiMap-related data for a Source.
@@ -30,6 +31,19 @@ module Solargraph
       @pins = pins
       @locals = locals
       environ.merge Convention.for(source)
+      @pin_class_hash = pins.to_set.classify(&:class).transform_values(&:to_a)
+      @pin_select_cache = {}
+    end
+
+    def pins_by_class klass
+      @pin_select_cache[klass] ||= @pin_class_hash.select { |key, _| key <= klass }.values.flatten
+    end
+
+    def rebindable_method_names
+      @rebindable_method_names ||= pins_by_class(Pin::Method)
+        .select { |pin| pin.comments && pin.comments.include?('@yieldself') }
+        .map(&:name)
+        .to_set
     end
 
     # @return [String]
@@ -44,7 +58,7 @@ module Solargraph
 
     # @return [Array<Pin::Reference::Require>]
     def requires
-      @requires ||= pins.select{ |p| p.is_a?(Pin::Reference::Require) }
+      pins_by_class(Pin::Reference::Require)
     end
 
     # @return [Environ]
@@ -62,6 +76,7 @@ module Solargraph
     # @param query [String]
     # @return [Array<Pin::Base>]
     def query_symbols query
+      return document_symbols if query && query.empty?
       document_symbols.select{ |pin| fuzzy_string_match(pin.path, query) || fuzzy_string_match(pin.name, query) }
     end
 

data/lib/solargraph/source_map/mapper.rb

@@ -82,6 +82,8 @@ module Solargraph
       # @param comment [String]
       # @return [Integer]
       def find_directive_line_number comment, tag, start
+        # Avoid overruning the index
+        return start unless start < comment.lines.length
         num = comment.lines[start..-1].find_index do |line|
           # Legacy method directives might be `@method` instead of `@!method`
           # @todo Legacy syntax should probably emit a warning
@@ -93,6 +95,7 @@ module Solargraph
       # @param source_position [Position]
       # @param comment_position [Position]
       # @param directive [YARD::Tags::Directive]
+      # @return [void]
       def process_directive source_position, comment_position, directive
         docstring = Solargraph::Source.parse_docstring(directive.tag.text).to_docstring
         location = Location.new(@filename, Range.new(comment_position, comment_position))
@@ -102,10 +105,10 @@ module Solargraph
           if namespace.location.range.start.line < comment_position.line
             namespace = closure_at(comment_position)
           end
-          region = Parser::Region.new(source: @source, closure: namespace)
           begin
-            src_node = Parser.parse("def #{directive.tag.name};end", @filename, location.range.start.line)
-            gen_pin = Parser.process_node(src_node, region).first.last
+            src = Solargraph::Source.load_string("def #{directive.tag.name};end", @source.filename)
+            region = Parser::Region.new(source: src, closure: namespace)
+            gen_pin = Parser.process_node(src.node, region).first.last
             return if gen_pin.nil?
             # Move the location to the end of the line so it gets recognized
             # as originating from a comment
@@ -146,12 +149,23 @@ module Solargraph
             )
           end
         when 'parse'
-          ns = closure_at(source_position)
-          region = Parser::Region.new(source: @source, closure: ns)
           begin
-            node = Parser.parse(directive.tag.text, @filename, comment_position.line)
+            ns = closure_at(source_position)
+            src = Solargraph::Source.load_string(directive.tag.text, @source.filename)
+            region = Parser::Region.new(source: src, closure: ns)
             # @todo These pins may need to be marked not explicit
-            Parser.process_node(node, region, @pins)
+            index = @pins.length
+            loff = if @code.lines[comment_position.line].strip.end_with?('@!parse')
+              comment_position.line + 1
+            else
+              comment_position.line
+            end
+            Parser.process_node(src.node, region, @pins)
+            @pins[index..-1].each do |p|
+              # @todo Smelly instance variable access
+              p.location.range.start.instance_variable_set(:@line, p.location.range.start.line + loff)
+              p.location.range.ending.instance_variable_set(:@line, p.location.range.ending.line + loff)
+            end
           rescue Parser::SyntaxError => e
             # @todo Handle parser errors in !parse directives
           end

data/lib/solargraph/stdlib_fills.rb

@@ -20,6 +20,14 @@ module Solargraph
         Override.method_return('Pathname#cleanpath', 'Pathname'),
         Override.method_return('Pathname#children', 'Array<Pathname>'),
         Override.method_return('Pathname#entries', 'Array<Pathname>')
+      ],
+
+      'set' => [
+        Override.method_return('Enumerable#to_set', 'Set'),
+        Override.method_return('Set#add', 'self'),
+        Override.method_return('Set#add?', 'self, nil'),
+        Override.method_return('Set#classify', 'Hash'),
+        Override.from_comment('Set#each', '@yieldparam_single_parameter')
       ]
     }
 

data/lib/solargraph/type_checker.rb

@@ -74,7 +74,7 @@ module Solargraph
     def method_tag_problems
       result = []
       # @param pin [Pin::BaseMethod]
-      source_map.pins.select { |pin| pin.is_a?(Pin::BaseMethod) }.each do |pin|
+      source_map.pins_by_class(Pin::BaseMethod).each do |pin|
         result.concat method_return_type_problems_for(pin)
         result.concat method_param_type_problems_for(pin)
       end
@@ -184,8 +184,7 @@ module Solargraph
 
     # @return [Array<Pin::BaseVariable>]
     def all_variables
-      source_map.pins.select { |pin| pin.is_a?(Pin::BaseVariable) } +
-        source_map.locals.select { |pin| pin.is_a?(Pin::LocalVariable) }
+      source_map.pins_by_class(Pin::BaseVariable) + source_map.locals.select { |pin| pin.is_a?(Pin::LocalVariable) }
     end
 
     def const_problems

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -170,7 +170,7 @@ module Solargraph
         Dir.chdir base do
           begin
             # @type [Gem::Specification]
-            spec = eval(File.read(file), nil, file)
+            spec = eval(File.read(file), TOPLEVEL_BINDING, file)
             next unless Gem::Specification === spec
             @gemnames.push spec.name
             result.concat(spec.require_paths.map { |path| File.join(base, path) })

data/lib/solargraph/yard_map.rb

@@ -3,6 +3,7 @@
 require 'yard'
 require 'yard-solargraph'
 require 'rubygems/package'
+require 'set'
 
 module Solargraph
   # The YardMap provides access to YARD documentation for the Ruby core, the
@@ -56,6 +57,7 @@ module Solargraph
       @source_gems = []
       process_requires
       yardocs.uniq!
+      @pin_select_cache = {}
     end
 
     # @return [Array<Solargraph::Pin::Base>]
@@ -80,10 +82,22 @@ module Solargraph
         @gemset = new_gemset
         @source_gems = source_gems
         process_requires
+        @rebindable_method_names = nil
+        @pin_class_hash = nil
+        @pin_select_cache = {}
         true
       end
     end
 
+    # @return [Set<String>]
+    def rebindable_method_names
+      @rebindable_method_names ||= pins_by_class(Pin::Method)
+        .select { |pin| pin.comments && pin.comments.include?('@yieldself') }
+        .map(&:name)
+        .concat(['instance_eval', 'instance_exec', 'class_eval', 'class_exec', 'module_eval', 'module_exec'])
+        .to_set
+    end
+
     # @return [Array<String>]
     def yardocs
       @yardocs ||= []
@@ -102,7 +116,7 @@ module Solargraph
       else
         YARD::Registry.load! y
       end
-    rescue Exception => e
+    rescue StandardError => e
       Solargraph::Logging.logger.warn "Error loading yardoc '#{y}' #{e.class} #{e.message}"
       yardocs.delete y
       nil
@@ -144,6 +158,14 @@ module Solargraph
       @cache ||= YardMap::Cache.new
     end
 
+    def pin_class_hash
+      @pin_class_hash ||= pins.to_set.classify(&:class).transform_values(&:to_a)
+    end
+
+    def pins_by_class klass
+      @pin_select_cache[klass] ||= pin_class_hash.select { |key, _| key <= klass }.values.flatten
+    end
+
     # @param ns [YARD::CodeObjects::NamespaceObject]
     # @return [Array<YARD::CodeObjects::Base>]
     def recurse_namespace_object ns

data/lib/solargraph/yard_map/rdoc_to_yard.rb

@@ -15,23 +15,23 @@ module Solargraph
       # @return [void]
       def self.run spec, cache_dir: nil
         Dir.mktmpdir do |tmpdir|
-          rdir = File.join(tmpdir, 'rdoc')
-          Dir.chdir spec.full_gem_path do
+          rdir = File.join(tmpdir, 'sg_tmp_rdoc')
+          FileUtils.cp_r Dir.glob(File.join(spec.full_gem_path, '*')), tmpdir
+          Dir.chdir tmpdir do
             pins = []
             pins.push Solargraph::Pin::ROOT_PIN
             name_hash = {}
 
-            argv = ['-q', '-N', '-r', '-o', rdir]
+            argv = ['-q', '-r', '-N', '-o', rdir]
             spec.load_paths.each do |path|
               argv.concat ['-i', path]
             end
             rdoc = RDoc::RDoc.new
             rdoc.document argv
-
-            store = RDoc::Store.new(rdir)
-            store.load_all
+            # @type [RDoc::Store]
+            store = rdoc.store
+            store.path = rdir
             store.cache[:modules].each do |mod|
-              # store.load_class(mod)
               # @type [RDoc::NormalClass]
               mod = store.find_class_or_module(mod)
               closure = pins.select { |pin| pin.path == mod.full_name.split('::')[0..-2].join('::') }.first || pins.first
@@ -51,7 +51,7 @@ module Solargraph
                   closure: namepin
                 )
               end
-              # @param inc [RDoc::Extend]
+              # @param ext [RDoc::Extend]
               mod.extends.each do |ext|
                 pins.push Solargraph::Pin::Reference::Extend.new(
                   location: locate(ext),
@@ -105,7 +105,11 @@ module Solargraph
         mod.full_name.split('::')[0..-2].join('::')
       end
 
+      # @param cmnt [RDoc::Comment]
+      # @return [String]
       def self.commentary cmnt
+        return cmnt if cmnt.is_a?(String)
+        return cmnt.text if cmnt.is_a?(RDoc::Comment)
         result = []
         cmnt.parts.each do |part|
           result.push RDoc::Markup::ToHtml.new({}).to_html(part.text) if part.respond_to?(:text)
@@ -126,9 +130,9 @@ module Solargraph
 
       def self.find_file obj
         if obj.respond_to?(:in_files) && !obj.in_files.empty?
-          [obj.in_files.first.to_s.sub(/^file /, ''), obj.in_files.first.line]
+          [obj.in_files.first.to_s.sub(/^file /, ''), obj.line]
         else
-          [obj.file_name, obj.line]
+          [obj.file, obj.line]
         end
       end
     end

data/solargraph.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'maruku', '~> 0.7', '>= 0.7.3'
   s.add_runtime_dependency 'nokogiri', '~> 1.9', '>= 1.9.1'
   s.add_runtime_dependency 'parser', '~> 2.3'
-  s.add_runtime_dependency 'reverse_markdown', '~> 1.0', '>= 1.0.5'
+  s.add_runtime_dependency 'reverse_markdown', '>= 1.0.5', '< 3'
   s.add_runtime_dependency 'rubocop', '~> 0.52'
   s.add_runtime_dependency 'thor', '~> 1.0'
   s.add_runtime_dependency 'tilt', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.39.5
+  version: 0.39.10
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -138,22 +138,22 @@ dependencies:
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +317,7 @@ files:
 - lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/api_map/store.rb
 - lib/solargraph/bundle.rb
+- lib/solargraph/compat.rb
 - lib/solargraph/complex_type.rb
 - lib/solargraph/complex_type/type_methods.rb
 - lib/solargraph/complex_type/unique_type.rb