solargraph 0.39.14 → 0.40.1

data/lib/solargraph/{bundle.rb → bench.rb}

@@ -4,18 +4,22 @@ module Solargraph
   # An aggregation of a workspace and additional sources to be cataloged in an
   # ApiMap.
   #
-  class Bundle
+  class Bench
     # @return [Workspace]
     attr_reader :workspace
 
     # @return [Array<Source>]
     attr_reader :opened
 
+    # @return [Array<Pin::Base>]
+    attr_reader :pins
+
     # @param workspace [Workspace]
     # @param opened [Array<Source>]
-    def initialize workspace: Workspace.new, opened: []
+    def initialize workspace: Workspace.new, opened: [], pins: []
       @workspace = workspace
       @opened = opened
+      @pins = pins
     end
 
     # @return [Array<Source>]

data/lib/solargraph/compat.rb

@@ -7,3 +7,17 @@ unless Hash.method_defined?(:transform_values)
     end
   end
 end
+
+unless Array.method_defined?(:sum)
+  class Array
+    def sum &block
+      inject(0) do |s, x|
+        if block
+          s + block.call(x)
+        else
+          s + x
+        end
+      end
+    end
+  end
+end

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/convention.rb

@@ -20,13 +20,22 @@ module Solargraph
       @@conventions.add convention.new
     end
 
-    # @param source [Source]
+    # @param source_map [SourceMap]
     # @return [Environ]
-    def self.for(source)
+    def self.for_local(source_map)
       result = Environ.new
-      return result if source.filename.nil? || source.filename.empty?
       @@conventions.each do |conv|
-        result.merge conv.environ if conv.match?(source)
+        result.merge conv.local(source_map)
+      end
+      result
+    end
+
+    # @param yard_map [YardMap]
+    # @return [Environ]
+    def self.for_global(yard_map)
+      result = Environ.new
+      @@conventions.each do |conv|
+        result.merge conv.global(yard_map)
       end
       result
     end

data/lib/solargraph/convention/base.rb

@@ -2,22 +2,30 @@
 
 module Solargraph
   module Convention
+    # The base class for Conventions.
+    #
+    # A Convention provides Environs that customize ApiMaps with additional
+    # pins and other information. Subclasses should implement the `local` and
+    # `global` methods as necessary.
+    #
     class Base
       EMPTY_ENVIRON = Environ.new
 
-      # True if the source qualifies for this convention.
-      # Subclasses should override this method.
+      # The Environ for a source map.
+      # Subclasses can override this method.
       #
-      # @param source [Source]
-      def match? source
-        false
+      # @param source_map [SourceMap]
+      # @return [Environ]
+      def local source_map
+        EMPTY_ENVIRON
       end
 
-      # The Environ for this convention.
-      # Subclasses should override this method.
+      # The Environ for a YARD map.
+      # Subclasses can override this method.
       #
+      # @param yard_map [YardMap]
       # @return [Environ]
-      def environ
+      def global yard_map
         EMPTY_ENVIRON
       end
     end

data/lib/solargraph/convention/gemfile.rb

@@ -3,11 +3,8 @@
 module Solargraph
   module Convention
     class Gemfile < Base
-      def match? source
-        File.basename(source.filename) == 'Gemfile'
-      end
-
-      def environ
+      def local source_map
+        return EMPTY_ENVIRON unless File.basename(source_map.filename) == 'Gemfile'
         @environ ||= Environ.new(
           requires: ['bundler'],
           domains: ['Bundler::Dsl']

data/lib/solargraph/convention/gemspec.rb

@@ -3,14 +3,11 @@
 module Solargraph
   module Convention
     class Gemspec < Base
-      def match? source
-        File.basename(source.filename).end_with?('.gemspec')
-      end
-
-      def environ
+      def local source_map
+        return EMPTY_ENVIRON unless File.basename(source_map.filename).end_with?('.gemspec')
         @environ ||= Environ.new(
           requires: ['rubygems'],
-          overrides: [
+          pins: [
             Solargraph::Pin::Reference::Override.from_comment(
               'Gem::Specification.new',
               %(

data/lib/solargraph/convention/rspec.rb

@@ -3,18 +3,15 @@
 module Solargraph
   module Convention
     class Rspec < Base
-      def match? source
-        File.basename(source.filename) =~ /_spec\.rb$/
-      end
-
-      def environ
+      def local source_map
+        return EMPTY_ENVIRON unless File.basename(source_map.filename) =~ /_spec\.rb$/
         @environ ||= Environ.new(
           requires: ['rspec'],
           domains: ['RSpec::Matchers', 'RSpec::ExpectationGroups'],
           # This override is necessary due to an erroneous @return tag in
           # rspec's YARD documentation.
           # @todo The return types have been fixed (https://github.com/rspec/rspec-expectations/pull/1121)
-          overrides: [
+          pins: [
             Solargraph::Pin::Reference::Override.method_return('RSpec::Matchers#expect', 'RSpec::Expectations::ExpectationTarget')
           ]
         )

data/lib/solargraph/documentor.rb

@@ -55,6 +55,8 @@ module Solargraph
       false
     end
 
+    # @param directory [String]
+    # @return [Hash]
     def self.specs_from_bundle directory
       Solargraph.with_clean_env do
         Dir.chdir directory do

data/lib/solargraph/environ.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 module Solargraph
+  # A collection of additional data, such as map pins and required paths, that
+  # can be added to an ApiMap.
+  #
+  # Conventions are used to add Environs.
+  #
   class Environ
     # @return [Array<String>]
     attr_reader :requires
@@ -9,22 +14,22 @@ module Solargraph
     attr_reader :domains
 
     # @return [Array<Pin::Reference::Override>]
-    attr_reader :overrides
+    attr_reader :pins
 
     # @param requires [Array<String>]
     # @param domains [Array<String>]
-    # @param overrides [Array<Pin::Reference::Override>]
-    def initialize requires: [], domains: [], overrides: []
+    # @param pins [Array<Pin::Base>]
+    def initialize requires: [], domains: [], pins: []
       @requires = requires
       @domains = domains
-      @overrides = overrides
+      @pins = pins
     end
 
     # @return [self]
     def clear
       domains.clear
       requires.clear
-      overrides.clear
+      pins.clear
       self
     end
 
@@ -33,7 +38,7 @@ module Solargraph
     def merge other
       domains.concat other.domains
       requires.concat other.requires
-      overrides.concat other.overrides
+      pins.concat other.pins
       self
     end
   end

data/lib/solargraph/language_server/message/extended/check_gem_version.rb

@@ -34,7 +34,12 @@ module Solargraph
                                           LanguageServer::MessageTypes::INFO,
                                           ['Update now'] do |result|
                                             next unless result == 'Update now'
-                                            o, s = Open3.capture2("gem update solargraph")
+                                            cmd = if host.options['useBundler']
+                                              'bundle update solargraph'
+                                            else
+                                              'gem update solargraph'
+                                            end
+                                            o, s = Open3.capture2(cmd)
                                             if s == 0
                                               host.show_message 'Successfully updated the Solargraph gem.', LanguageServer::MessageTypes::INFO
                                               host.send_notification '$/solargraph/restart', {}

data/lib/solargraph/language_server/message/text_document/definition.rb

@@ -13,7 +13,7 @@ module Solargraph::LanguageServer::Message::TextDocument
     def code_location
       suggestions = host.definitions_at(params['textDocument']['uri'], @line, @column)
       return nil if suggestions.empty?
-      suggestions.reject{|pin| pin.location.nil?}.map do |pin|
+      suggestions.reject { |pin| pin.location.nil? || pin.location.filename.nil? }.map do |pin|
         {
           uri: file_to_uri(pin.location.filename),
           range: pin.location.range.to_hash

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -2,6 +2,7 @@
 
 require 'rubocop'
 require 'securerandom'
+require 'tmpdir'
 
 module Solargraph
   module LanguageServer
@@ -12,25 +13,22 @@ module Solargraph
 
           def process
             filename = uri_to_file(params['textDocument']['uri'])
-            # Make the temp file in the original file's directory so RuboCop
-            # detects the correct configuration
-            # the .rb extension is needed for ruby file without extension, else rubocop won't format
-            tempfile = File.join(File.dirname(filename), "_tmp_#{SecureRandom.hex(8)}_#{File.basename(filename)}.rb")
-            rubocop_file = Diagnostics::RubocopHelpers.find_rubocop_file(filename)
-            original = host.read_text(params['textDocument']['uri'])
-            File.write tempfile, original
-            begin
-              args = ['-a', '-f', 'fi', tempfile]
-              args.unshift('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
-              options, paths = RuboCop::Options.new.parse(args)
-              store = RuboCop::ConfigStore.new
-              redirect_stdout { RuboCop::Runner.new(options, store).run(paths) }
-              result = File.read(tempfile)
-              format original, result
-            rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
-              set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
-            ensure
-              File.unlink tempfile
+            Dir.mktmpdir do |tempdir|
+              tempfile = File.join(tempdir, File.basename(filename))
+              rubocop_file = Diagnostics::RubocopHelpers.find_rubocop_file(filename)
+              original = host.read_text(params['textDocument']['uri'])
+              File.write tempfile, original
+              begin
+                args = ['-a', '-f', 'fi', tempfile]
+                args.unshift('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
+                options, paths = RuboCop::Options.new.parse(args)
+                store = RuboCop::ConfigStore.new
+                redirect_stdout { RuboCop::Runner.new(options, store).run(paths) }
+                result = File.read(tempfile)
+                format original, result
+              rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
+                set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
+              end
             end
           end
 

data/lib/solargraph/library.rb

@@ -20,7 +20,7 @@ module Solargraph
     def initialize workspace = Solargraph::Workspace.new, name = nil
       @workspace = workspace
       @name = name
-      api_map.catalog bundle
+      api_map.catalog bench
       @synchronized = true
       @catalog_mutex = Mutex.new
     end
@@ -174,10 +174,10 @@ module Solargraph
       if cursor.comment?
         source = read(filename)
         offset = Solargraph::Position.to_offset(source.code, Solargraph::Position.new(line, column))
-        lft = source.code[0..offset-1].match(/[\[<, ]([a-z0-9_:]*)\z/i)
+        lft = source.code[0..offset-1].match(/\[[a-z0-9_:<, ]*?([a-z0-9_:]*)\z/i)
         rgt = source.code[offset..-1].match(/^([a-z0-9_]*)(:[a-z0-9_:]*)?[\]>, ]/i)
         if lft && rgt
-          tag = lft[1] + rgt[1]
+          tag = (lft[1] + rgt[1]).sub(/:+$/, '')
           clip = api_map.clip(cursor)
           clip.translate tag
         else
@@ -209,7 +209,6 @@ module Solargraph
     # @return [Array<Solargraph::Range>]
     # @todo Take a Location instead of filename/line/column
     def references_from filename, line, column, strip: false
-      # checkout filename
       cursor = api_map.cursor_at(filename, Position.new(line, column))
       clip = api_map.clip(cursor)
       pins = clip.define
@@ -222,7 +221,7 @@ module Solargraph
             referenced = definitions_at(loc.filename, loc.range.ending.line, loc.range.ending.character)
             # HACK: The additional location comparison is necessary because
             # Clip#define can return proxies for parameter pins
-            referenced.any?{|r| r == pin || r.location == pin.location}
+            referenced.any? { |r| r == pin || r.location == pin.location }
           end
           # HACK: for language clients that exclude special characters from the start of variable names
           if strip && match = cursor.word.match(/^[^a-z0-9_]+/i)
@@ -290,7 +289,6 @@ module Solargraph
     # @param filename [String]
     # @return [Array<Solargraph::Pin::Base>]
     def document_symbols filename
-      # checkout filename
       api_map.document_symbols(filename)
     end
 
@@ -351,7 +349,7 @@ module Solargraph
       @catalog_mutex.synchronize do
         break if synchronized?
         logger.info "Cataloging #{workspace.directory.empty? ? 'generic workspace' : workspace.directory}"
-        api_map.catalog bundle
+        api_map.catalog bench
         @synchronized = true
         logger.info "Catalog complete (#{api_map.source_maps.length} files, #{api_map.pins.length} pins)" if logger.info?
       end
@@ -403,9 +401,9 @@ module Solargraph
       @api_map ||= Solargraph::ApiMap.new
     end
 
-    # @return [Bundle]
-    def bundle
-      Bundle.new(
+    # @return [Bench]
+    def bench
+      Bench.new(
         workspace: workspace,
         opened: @current ? [@current] : []
       )

data/lib/solargraph/parser/legacy/node_chainer.rb

@@ -14,7 +14,7 @@ module Solargraph
         def initialize node, filename = nil, in_block = false
           @node = node
           @filename = filename
-          @in_block = in_block
+          @in_block = in_block ? 1 : 0
         end
 
         # @return [Source::Chain]
@@ -51,9 +51,9 @@ module Solargraph
           return generate_links(n.children[0]) if n.type == :splat
           result = []
           if n.type == :block
-            @in_block = true
+            @in_block += 1
             result.concat generate_links(n.children[0])
-            @in_block = false
+            @in_block -= 1
           elsif n.type == :send
             if n.children[0].is_a?(::Parser::AST::Node)
               result.concat generate_links(n.children[0])
@@ -61,23 +61,23 @@ 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.push Chain::Call.new(n.children[1].to_s, args, @in_block > 0 || 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.push Chain::Call.new(n.children[1].to_s, args, @in_block > 0 || block_passed?(n))
             else
               raise "No idea what to do with #{n}"
             end
           elsif n.type == :self
             result.push Chain::Head.new('self')
           elsif n.type == :zsuper
-            result.push Chain::ZSuper.new('super', @in_block || block_passed?(n))
+            result.push Chain::ZSuper.new('super', @in_block > 0 || block_passed?(n))
           elsif n.type == :super
             args = n.children.map { |c| NodeChainer.chain(c) }
-            result.push Chain::Call.new('super', args, @in_block || block_passed?(n))
+            result.push Chain::Call.new('super', args, @in_block > 0 || block_passed?(n))
           elsif n.type == :const
             const = unpack_name(n)
             result.push Chain::Constant.new(const)

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

@@ -98,6 +98,7 @@ module Solargraph
 
         def convert_hash node
           return {} unless Parser.is_ast_node?(node) && node.type == :hash
+          return convert_hash(node.children[0].children[0]) if splatted_hash?(node)
           result = {}
           node.children.each do |pair|
             result[pair.children[0].children[0]] = Solargraph::Parser.chain(pair.children[1])
@@ -118,6 +119,10 @@ module Solargraph
           result
         end
 
+        def splatted_hash? node
+          Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat
+        end
+
         # @todo Temporarily here for testing. Move to Solargraph::Parser.
         def call_nodes_from node
           return [] unless node.is_a?(::Parser::AST::Node)