solargraph 0.42.2 → 0.43.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4cd4acd35a7ce8242976cdd2b23d583bbd01392e3d79a16e3b4e181443e4858
-  data.tar.gz: 4cb4f369d97681a43d24a8fc3de14a454721c4334426655e23fffafceeb242c7
+  metadata.gz: 48b532bf77bb72b9d2d111605cc86e97a21c372319a041ef5c4dfbd03a2b98d1
+  data.tar.gz: da953eea90b1215a794783723898277abe33a4b74e585eeb710f231b824321b7
 SHA512:
-  metadata.gz: 5918eb0b9797ed3bed1fe97a702761889b4fb5b8280de655820d8a4319eefd651f4958e420b32468aac2ab197f657b8cb1386029654dcbd9b3a30bbdd2ca521b
-  data.tar.gz: 649a461beb8b23b69ae40bb347389602e20b42d0a689752d805beb2c08000a863c24d9e45b39d00ee544d37802be0762d9933a6d4e27b2617249d1443ca582f4
+  metadata.gz: c3f55a7eb1f0b08247d70f7a2c28422b6444e5102a96c7c9da88b5b9b5f558732f97dc186e6dc53650bd5af20747066dbf53272a15527f000607fca17583e6da
+  data.tar.gz: 7224059b6b2c757049bf27c4140c54063b035b13eeaf93f30c521393c5e8c863b72843c28edbfb9cbe2980fe28f79006195926f9c8bf79b204dd08a9895ec1e8

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 0.43.1
+- Complete nested namespaces in open gates
+- SourceMap::Mapper reports filename for encoding errors (#474)
+- Handle request on a specific thread, and cancel completion when there has newer completion request (#459)
+- Fix namespace links generated by views/_method.erb (#472)
+- Source handles long squiggly heredocs (#460)
+
+## 0.43.0 - July 25, 2021
+- Correct arity checks when restarg precedes arg (#418)
+- Improve the performance of catalog by 4 times (#457)
+- Type checker validates duck type variables and params (#453)
+- Kernel#raise exception type checker
+- Pin::Base#inspect includes path
+- Fix arity with combined restargs and kwrestargs (#396)
+
+## 0.42.4 - July 11, 2021
+- Yardoc cache handling
+- Fix required_paths when gemspec is used (#451)
+- fix: yard stdout may break language client (#454)
+
+## 0.42.3 - June 14, 2021
+- Require 'pathname' for Library
+
 ## 0.42.2 - June 14, 2021
 - Improve download-core command output
 - Ignore missing requests to client responses

data/README.md

@@ -34,7 +34,8 @@ Plug-ins and extensions are available for the following editors:
     * GitHub: https://github.com/autozimu/LanguageClient-neovim
 
 * **Emacs**
-    * GitHub: https://github.com/guskovd/emacs-solargraph
+    * GitHub: `eglot.el`, https://github.com/joaotavora/eglot
+    * GitHub: `lsp-mode.el`, https://github.com/emacs-lsp/lsp-mode
 
 * **Eclipse**
     * Plugin: https://marketplace.eclipse.org/content/ruby-solargraph

data/SPONSORS.md

@@ -13,4 +13,3 @@ The following people and organizations provide funding or other resources. [Beco
 - Emily Strickland
 - Tom de Grunt
 - Akira Yamada
-- Jared White

data/lib/solargraph/api_map/store.rb

@@ -5,10 +5,10 @@ require 'set'
 module Solargraph
   class ApiMap
     class Store
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       attr_reader :pins
 
-      # @param pins [Array<Solargraph::Pin::Base>]
+      # @param pins [Enumerable<Solargraph::Pin::Base>]
       def initialize pins = []
         @pins = pins
         index
@@ -16,7 +16,7 @@ module Solargraph
 
       # @param fqns [String]
       # @param visibility [Array<Symbol>]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_constants fqns, visibility = [:public]
         namespace_children(fqns).select { |pin|
           !pin.name.empty? && (pin.is_a?(Pin::Namespace) || pin.is_a?(Pin::Constant)) && visibility.include?(pin.visibility)
@@ -26,7 +26,7 @@ module Solargraph
       # @param fqns [String]
       # @param scope [Symbol]
       # @param visibility [Array<Symbol>]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_methods fqns, scope: :instance, visibility: [:public]
         namespace_children(fqns).select do |pin|
           pin.is_a?(Pin::Method) && pin.scope == scope && visibility.include?(pin.visibility)
@@ -61,14 +61,14 @@ module Solargraph
       end
 
       # @param path [String]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_path_pins path
         path_pin_hash[path] || []
       end
 
       # @param fqns [String]
       # @param scope [Symbol] :class or :instance
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_instance_variables(fqns, scope = :instance)
         all_instance_variables.select { |pin|
           pin.binder.namespace == fqns && pin.binder.scope == scope
@@ -76,12 +76,12 @@ module Solargraph
       end
 
       # @param fqns [String]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_class_variables(fqns)
         namespace_children(fqns).select{|pin| pin.is_a?(Pin::ClassVariable)}
       end
 
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_symbols
         symbols.uniq(&:name)
       end
@@ -97,12 +97,12 @@ module Solargraph
         @namespaces ||= Set.new
       end
 
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def namespace_pins
         pins_by_class(Solargraph::Pin::Namespace)
       end
 
-      # @return [Array<Solargraph::Pin::Method>]
+      # @return [Enumerable<Solargraph::Pin::Method>]
       def method_pins
         pins_by_class(Solargraph::Pin::Method)
       end
@@ -131,7 +131,7 @@ module Solargraph
         end
       end
 
-      # @return [Array<Pin::Block>]
+      # @return [Enumerable<Pin::Block>]
       def block_pins
         pins_by_class(Pin::Block)
       end
@@ -142,9 +142,9 @@ module Solargraph
       end
 
       # @param klass [Class]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def pins_by_class klass
-        @pin_select_cache[klass] ||= @pin_class_hash.select { |key, _| key <= klass }.values.flatten
+        @pin_select_cache[klass] ||= @pin_class_hash.each_with_object(Set.new) { |(key, o), n| n.merge(o) if key <= klass }
       end
 
       private
@@ -171,7 +171,7 @@ module Solargraph
         end
       end
 
-      # @return [Array<Solargraph::Pin::Symbol>]
+      # @return [Enumerable<Solargraph::Pin::Symbol>]
       def symbols
         pins_by_class(Pin::Symbol)
       end
@@ -193,7 +193,7 @@ module Solargraph
       end
 
       # @param name [String]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def namespace_children name
         namespace_map[name] || []
       end
@@ -216,8 +216,8 @@ module Solargraph
         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)
+        @namespace_map = set.classify(&:namespace)
+        @path_pin_hash = set.classify(&:path)
         @namespaces = @path_pin_hash.keys.compact.to_set
         pins_by_class(Pin::Reference::Include).each do |pin|
           include_references[pin.namespace] ||= []

data/lib/solargraph/api_map.rb

@@ -138,7 +138,7 @@ module Solargraph
 
     # An array of pins based on Ruby keywords (`if`, `end`, etc.).
     #
-    # @return [Array<Solargraph::Pin::Keyword>]
+    # @return [Enumerable<Solargraph::Pin::Keyword>]
     def keyword_pins
       store.pins_by_class(Pin::Keyword)
     end

data/lib/solargraph/complex_type/type_methods.rb

@@ -72,9 +72,12 @@ module Solargraph
 
       # @return [String]
       def namespace
-        @namespace ||= 'Object' if duck_type?
-        @namespace ||= 'NilClass' if nil_type?
-        @namespace ||= (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
+        # if priority higher than ||=, old implements cause unnecessary check
+        @namespace ||= lambda do
+          return 'Object' if duck_type?
+          return 'NilClass' if nil_type?
+          return (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
+        end.call
       end
 
       # @return [Symbol] :class or :instance

data/lib/solargraph/complex_type.rb

@@ -51,6 +51,10 @@ module Solargraph
     def select &block
       @items.select &block
     end
+    def namespace
+      # cache this attr for high frequency call
+      @namespace ||= method_missing(:namespace).to_s
+    end
 
     def method_missing name, *args, &block
       return if @items.first.nil?

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

@@ -41,7 +41,8 @@ module Solargraph
           result = explicit_library_for(uri) ||
             implicit_library_for(uri) ||
             generic_library_for(uri)
-          result.attach sources.find(uri) if sources.include?(uri)
+          # previous library for already call attach. avoid call twice
+          # result.attach sources.find(uri) if sources.include?(uri)
           result
         end
 
@@ -82,7 +83,6 @@ module Solargraph
           libraries.each do |lib|
             if filename.start_with?(lib.workspace.directory)
               lib.attach sources.find(uri)
-              lib.catalog
               return lib
             end
           end
@@ -98,7 +98,6 @@ module Solargraph
         # @return [Library]
         def generic_library_for uri
           generic_library.attach sources.find(uri)
-          generic_library.catalog
           generic_library
         end
 

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    class Host
+      # A serial worker Thread to handle message.
+      #
+      # this make check pending message possible, and maybe cancelled to speedup process
+      class MessageWorker
+        # @param host [Host]
+        def initialize(host)
+          @host = host
+          @mutex = Mutex.new
+          @resource = ConditionVariable.new
+          @stopped = true
+        end
+
+        # pending handle messages
+        def messages
+          @messages ||= []
+        end
+
+        def stopped?
+          @stopped
+        end
+        def stop
+          @stopped = true
+        end
+
+        # @param message the message should be handle. will pass back to Host#receive
+        def queue(message)
+          @mutex.synchronize {
+            messages.push(message)
+            @resource.signal
+          }
+        end
+
+        def start
+          return unless @stopped
+          @stopped = false
+          Thread.new do
+            tick until stopped?
+          end
+        end
+        def tick
+          message = @mutex.synchronize {
+            @resource.wait(@mutex) if messages.empty?
+            messages.shift
+          }
+          message = @host.receive(message)
+          message && message.send_response
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/host.rb

@@ -12,10 +12,12 @@ module Solargraph
     # safety for multi-threaded transports.
     #
     class Host
-      autoload :Diagnoser, 'solargraph/language_server/host/diagnoser'
-      autoload :Cataloger, 'solargraph/language_server/host/cataloger'
-      autoload :Sources,   'solargraph/language_server/host/sources'
-      autoload :Dispatch,  'solargraph/language_server/host/dispatch'
+      autoload :Diagnoser,     'solargraph/language_server/host/diagnoser'
+      autoload :Cataloger,     'solargraph/language_server/host/cataloger'
+      autoload :Sources,       'solargraph/language_server/host/sources'
+      autoload :Dispatch,      'solargraph/language_server/host/dispatch'
+      autoload :MessageWorker, 'solargraph/language_server/host/message_worker'
+
 
       include UriHelpers
       include Logging
@@ -45,6 +47,7 @@ module Solargraph
         diagnoser.start
         cataloger.start
         sources.start
+        message_worker.start
       end
 
       # Update the configuration options with the provided hash.
@@ -89,8 +92,13 @@ module Solargraph
         @cancel_semaphore.synchronize { @cancel.delete id }
       end
 
+      # called by adapter, to handle the request
+      def process request
+        message_worker.queue(request)
+      end
+
       # Start processing a request from the client. After the message is
-      # processed, the transport is responsible for sending the response.
+      # processed, caller is responsible for sending the response.
       #
       # @param request [Hash] The contents of the message.
       # @return [Solargraph::LanguageServer::Message::Base] The message handler.
@@ -451,6 +459,7 @@ module Solargraph
       def stop
         return if @stopped
         @stopped = true
+        message_worker.stop
         cataloger.stop
         diagnoser.stop
         sources.stop
@@ -513,6 +522,11 @@ module Solargraph
         library.completions_at uri_to_file(uri), line, column
       end
 
+      # @return [Bool] if has pending completion request
+      def has_pending_completions?
+        message_worker.messages.reverse_each.any? { |req| req['method'] == 'textDocument/completion' }
+      end
+
       # @param uri [String]
       # @param line [Integer]
       # @param column [Integer]
@@ -646,6 +660,11 @@ module Solargraph
 
       private
 
+      # @return [MessageWorker]
+      def message_worker
+        @message_worker ||= MessageWorker.new(self)
+      end
+
       # @return [Diagnoser]
       def diagnoser
         @diagnoser ||= Diagnoser.new(self)

data/lib/solargraph/language_server/message/base.rb

@@ -62,10 +62,14 @@ module Solargraph
         def send_response
           return if id.nil?
           if host.cancel?(id)
+            # https://microsoft.github.io/language-server-protocol/specifications/specification-current/#cancelRequest
+            # cancel should send response RequestCancelled
             Solargraph::Logging.logger.info "Cancelled response to #{method}"
-            return
+            set_result nil
+            set_error ErrorCodes::REQUEST_CANCELLED, "cancelled by client"
+          else
+            Solargraph::Logging.logger.info "Sending response to #{method}"
           end
-          Solargraph::Logging.logger.info "Sending response to #{method}"
           response = {
             jsonrpc: "2.0",
             id: id,

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

@@ -6,6 +6,8 @@ module Solargraph
       module TextDocument
         class Completion < Base
           def process
+            return set_error(ErrorCodes::REQUEST_CANCELLED, "cancelled by so many request") if host.has_pending_completions?
+
             line = params['position']['line']
             col = params['position']['character']
             begin

data/lib/solargraph/language_server/transport/adapter.rb

@@ -41,8 +41,7 @@ module Solargraph
         # @param request [String]
         # @return [void]
         def process request
-          message = @host.receive(request)
-          message && message.send_response
+          @host.process(request)
         end
 
         def shutdown

data/lib/solargraph/library.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module Solargraph
   # A Library handles coordination between a Workspace and an ApiMap.
   #
@@ -54,7 +56,7 @@ module Solargraph
         end
         @current = source
         maybe_map @current
-        api_map.catalog bench unless synchronized?
+        catalog_inlock
       end
     end
 
@@ -349,7 +351,7 @@ module Solargraph
         else
           args = line.split(':').map(&:strip)
           name = args.shift
-            reporter = Diagnostics.reporter(name)
+          reporter = Diagnostics.reporter(name)
           raise DiagnosticsError, "Diagnostics reporter #{name} does not exist" if reporter.nil?
           repargs[reporter] ||= []
           repargs[reporter].concat args
@@ -366,12 +368,16 @@ module Solargraph
     # @return [void]
     def catalog
       mutex.synchronize do
-        break if synchronized?
+        catalog_inlock
+      end
+    end
+
+    private def catalog_inlock
+        return if synchronized?
         logger.info "Cataloging #{workspace.directory.empty? ? 'generic workspace' : workspace.directory}"
         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
     end
 
     def bench

data/lib/solargraph/parser/comment_ripper.rb

@@ -2,7 +2,7 @@ require 'ripper'
 
 module Solargraph
   module Parser
-    class CommentRipper < Ripper::SexpBuilder
+    class CommentRipper < Ripper::SexpBuilderPP
       def initialize src, filename = '(ripper)', lineno = 0
         super
         @buffer = src

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

@@ -103,6 +103,31 @@ module Solargraph
           en = Position.new(node.loc.last_line, node.loc.last_column)
           Range.new(st, en)
         end
+
+        def string_ranges node
+          return [] unless is_ast_node?(node)
+          result = []
+          if node.type == :str
+            result.push Range.from_node(node)
+          elsif node.type == :dstr
+            here = Range.from_node(node)
+            there = Range.from_node(node.children[1])
+            result.push Range.new(here.start, there.start)
+          end
+          node.children.each do |child|
+            result.concat string_ranges(child)
+          end
+          if node.type == :dstr && node.children.last.nil?
+            # result.push Range.new(result.last.ending, result.last.ending)
+            last = node.children[-2]
+            unless last.nil?
+              rng = Range.from_node(last)
+              pos = Position.new(rng.ending.line, rng.ending.column - 1)
+              result.push Range.new(pos, pos)
+            end
+          end
+          result
+        end  
       end
     end
   end

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

@@ -102,13 +102,26 @@ module Solargraph
             result.concat generate_links(n.children[0])
           elsif n.type == :block_pass
             result.push Chain::BlockVariable.new("&#{n.children[0].children[0].to_s}")
+          elsif n.type == :hash
+            result.push Chain::Hash.new('::Hash', hash_is_splatted?(n))
           else
             lit = infer_literal_node_type(n)
-            result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
+            # if lit == '::Hash'
+            #   result.push Chain::Hash.new(lit, hash_is_splatted?(n))
+            # else
+              result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
+            # end
           end
           result
         end
 
+        def hash_is_splatted? node
+          return false unless Parser.is_ast_node?(node) && node.type == :hash
+          return false unless Parser.is_ast_node?(node.children.last) && node.children.last.type == :kwsplat
+          return false if Parser.is_ast_node?(node.children.last.children[0]) && node.children.last.children[0].type == :hash
+          true
+        end
+
         def block_passed? node
           node.children.last.is_a?(::Parser::AST::Node) && node.children.last.type == :block_pass
         end

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

@@ -97,8 +97,10 @@ module Solargraph
         end
 
         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)
+          return {} unless Parser.is_ast_node?(node)
+          return convert_hash(node.children[0]) if node.type == :kwsplat
+          return convert_hash(node.children[0]) if Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat
+          return {} unless node.type == :hash
           result = {}
           node.children.each do |pair|
             result[pair.children[0].children[0]] = Solargraph::Parser.chain(pair.children[1])
@@ -124,9 +126,14 @@ module Solargraph
         end
 
         def splatted_call? node
+          return false unless Parser.is_ast_node?(node)
           Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat && node.children[0].children[0].type != :hash
         end
 
+        def any_splatted_call?(nodes)
+          nodes.any? { |n| splatted_call?(n) }
+        end
+
         # @todo Temporarily here for testing. Move to Solargraph::Parser.
         def call_nodes_from node
           return [] unless node.is_a?(::Parser::AST::Node)

data/lib/solargraph/parser/node_processor/base.rb

@@ -4,9 +4,6 @@ module Solargraph
   module Parser
     module NodeProcessor
       class Base
-        # @todo The base node processor should not include legacy node methods
-        # include Legacy::NodeMethods
-
         # @return [Parser::AST::Node]
         attr_reader :node
 

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

@@ -97,13 +97,31 @@ module Solargraph
             result.concat generate_links(n.children[0])
           elsif n.type == :BLOCK_PASS
             result.push Chain::BlockVariable.new("&#{n.children[1].children[0].to_s}")
+          elsif n.type == :HASH
+            result.push Chain::Hash.new('::Hash', hash_is_splatted?(n))
           else
             lit = infer_literal_node_type(n)
-            result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
+            if lit
+              if lit == '::Hash'
+                result.push Chain::Hash.new(lit, hash_is_splatted?(n))
+              else
+                result.push Chain::Literal.new(lit)
+              end
+            else
+              result.push Chain::Link.new
+            end
+            # result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
           end
           result
         end
 
+        def hash_is_splatted? node
+          return false unless Parser.is_ast_node?(node.children[0]) && node.children[0].type == :LIST
+          list = node.children[0].children
+          eol = list.rindex(&:nil?)
+          eol && Parser.is_ast_node?(list[eol + 1])
+        end
+
         def block_passed? node
           node.children.last.is_a?(RubyVM::AbstractSyntaxTree::Node) && node.children.last.type == :BLOCK_PASS
         end
@@ -114,6 +132,9 @@ module Solargraph
             node.children[0..-2].map { |c| NodeChainer.chain(c) }
           elsif node.type == :SPLAT
             [NodeChainer.chain(node)]
+          elsif node.type == :ARGSPUSH
+            result = node_to_argchains(node.children[0])
+            result.push NodeChainer.chain(node.children[1]) if Parser.is_ast_node?(node.children[1])
           elsif node.type == :ARGSCAT
             result = node.children[0].children[0..-2].map { |c| NodeChainer.chain(c) }
             result.push NodeChainer.chain(node.children[1])

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

@@ -117,9 +117,14 @@ module Solargraph
         end
 
         def splatted_call? node
+          return false unless Parser.is_ast_node?(node)
           splatted_node?(node) && node.children[0].children[1].type != :HASH
         end
 
+        def any_splatted_call?(nodes)
+          nodes.any? { |n| splatted_call?(n) }
+        end
+
         def node? node
           node.is_a?(RubyVM::AbstractSyntaxTree::Node)
         end

data/lib/solargraph/pin/base.rb

@@ -218,7 +218,7 @@ module Solargraph
       end
 
       def inspect
-        "#<#{self.class} at #{self.location.inspect}>"
+        "#<#{self.class} `#{self.path}` at #{self.location.inspect}>"
       end
 
       protected

data/lib/solargraph/pin/namespace.rb

@@ -22,12 +22,18 @@ module Solargraph
           @closure = Solargraph::Pin::ROOT_PIN
         end
         @open_gates = gates
-        if @open_gates.one? && @open_gates.first.empty? && @name.include?('::')
+        if @name.include?('::')
           # In this case, a chained namespace was opened (e.g., Foo::Bar)
           # but Foo does not exist.
           parts = @name.split('::')
           @name = parts.pop
-          @closure = Pin::Namespace.new(name: parts.join('::'), gates: [parts.join('::')])
+          closure_name = if [Solargraph::Pin::ROOT_PIN, nil].include?(closure)
+            ''
+          else
+            closure.full_context.namespace + '::'
+          end
+          closure_name += parts.join('::')
+          @closure = Pin::Namespace.new(name: closure_name, gates: [parts.join('::')])
           @context = nil
         end
       end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class Hash < Literal
+        # @param type [String]
+        # @param splatted [Boolean]
+        def initialize type, splatted = false
+          super(type)
+          @splatted = splatted
+        end
+
+        def word
+          @word ||= "<#{@type}>"
+        end
+
+        def resolve api_map, name_pin, locals
+          [Pin::ProxyType.anonymous(@complex_type)]
+        end
+
+        def splatted?
+          @splatted
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source/chain.rb

@@ -21,6 +21,7 @@ module Solargraph
       autoload :Or,               'solargraph/source/chain/or'
       autoload :BlockVariable,    'solargraph/source/chain/block_variable'
       autoload :ZSuper,           'solargraph/source/chain/z_super'
+      autoload :Hash,             'solargraph/source/chain/hash'
 
       @@inference_stack = []
       @@inference_depth = 0
@@ -61,10 +62,6 @@ module Solargraph
         working_pin = name_pin
         links[0..-2].each do |link|
           pins = link.resolve(api_map, working_pin, locals)
-          # Locals are only used when resolving the first link
-          # @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.rb

@@ -6,19 +6,15 @@ module Solargraph
   # A Ruby file that has been parsed into an AST.
   #
   class Source
-    # autoload :FlawedBuilder, 'solargraph/source/flawed_builder'
     autoload :Updater,       'solargraph/source/updater'
     autoload :Change,        'solargraph/source/change'
     autoload :Mapper,        'solargraph/source/mapper'
-    # autoload :NodeMethods,   'solargraph/source/node_methods'
     autoload :EncodingFixes, 'solargraph/source/encoding_fixes'
     autoload :Cursor,        'solargraph/source/cursor'
     autoload :Chain,         'solargraph/source/chain'
     autoload :SourceChainer, 'solargraph/source/source_chainer'
-    # autoload :NodeChainer,   'solargraph/source/node_chainer'
 
     include EncodingFixes
-    # include NodeMethods
 
     # @return [String]
     attr_reader :filename
@@ -50,17 +46,9 @@ module Solargraph
         @node, @comments = Solargraph::Parser.parse_with_comments(@code, filename)
         @parsed = true
       rescue Parser::SyntaxError, EncodingError => e
-        # @todo 100% whitespace results in a nil node, so there's no reason to parse it.
-        #   We still need to determine whether the resulting node should be nil or a dummy
-        #   node with a location that encompasses the range.
-        # @node, @comments = Source.parse_with_comments(@code.gsub(/[^\s]/, ' '), filename)
         @node = nil
         @comments = {}
         @parsed = false
-      # rescue Exception => e
-      #   Solargraph.logger.warn "[#{e.class}] #{e.message}"
-      #   Solargraph.logger.warn e.backtrace.join("\n")
-      #   raise "Error parsing #{filename || '(source)'}: [#{e.class}] #{e.message}"
       ensure
         @code.freeze
       end

data/lib/solargraph/source_map/clip.rb

@@ -213,7 +213,7 @@ module Solargraph
             result.concat api_map.get_methods(block.binder.namespace, scope: block.binder.scope, visibility: [:public, :private, :protected])
             result.concat api_map.get_methods('Kernel')
             # result.concat ApiMap.keywords
-            result.concat api_map.keyword_pins
+            result.concat api_map.keyword_pins.to_a
             result.concat yielded_self_pins
           end
         end

data/lib/solargraph/source_map/mapper.rb

@@ -204,6 +204,8 @@ module Solargraph
           com_pos = Position.new(line + 1 - comments.lines.length, 0)
           process_comment(src_pos, com_pos, comments)
         end
+      rescue StandardError => e
+        raise e.class, "Error processing comment directives in #{@filename}: #{e.message}"
       end
     end
   end

data/lib/solargraph/type_checker.rb

@@ -148,6 +148,7 @@ module Solargraph
       all_variables.each do |pin|
         if pin.return_type.defined?
           declared = pin.typify(api_map)
+          next if declared.duck_type?
           if declared.defined?
             if rules.validate_tags?
               inferred = pin.probe(api_map)
@@ -416,7 +417,7 @@ module Solargraph
       end
       settled_kwargs = 0
       unless unchecked.empty?
-        if Parser.is_ast_node?(unchecked.last.node) && splatted_call?(unchecked.last.node)
+        if any_splatted_call?(unchecked.map(&:node))
           settled_kwargs = pin.parameters.count(&:keyword?)
         else
           kwargs = convert_hash(unchecked.last.node)
@@ -431,6 +432,7 @@ module Solargraph
                   kwargs.delete param.name.to_sym
                   settled_kwargs += 1
                 elsif param.decl == :kwarg
+                  return [] if arguments.last.links.last.is_a?(Solargraph::Source::Chain::Hash) && arguments.last.links.last.splatted?
                   return [Problem.new(location, "Missing keyword argument #{param.name} to #{pin.path}")]
                 end
               end
@@ -450,12 +452,17 @@ module Solargraph
         if unchecked.length == req + opt + 1 && unchecked.last.links.last.is_a?(Source::Chain::BlockVariable)
           return []
         end
-        if req + add_params + 1 == unchecked.length && splatted_call?(unchecked.last.node) && (pin.parameters.map(&:decl) & [:kwarg, :kwoptarg, :kwrestarg]).any?
+        if req + add_params + 1 == unchecked.length && any_splatted_call?(unchecked.map(&:node)) && (pin.parameters.map(&:decl) & [:kwarg, :kwoptarg, :kwrestarg]).any?
           return []
         end
+        return [] if arguments.length - req == pin.parameters.select { |p| [:optarg, :kwoptarg].include?(p.decl) }.length
         return [Problem.new(location, "Too many arguments to #{pin.path}")]
-      elsif unchecked.length < req - settled_kwargs && (arguments.empty? || !arguments.last.splat?)
-        return [Problem.new(location, "Not enough arguments to #{pin.path}")]
+      elsif unchecked.length < req - settled_kwargs && (arguments.empty? || (!arguments.last.splat? && !arguments.last.links.last.is_a?(Solargraph::Source::Chain::Hash)))
+        # HACK: Kernel#raise signature is incorrect in Ruby 2.7 core docs.
+        # See https://github.com/castwide/solargraph/issues/418
+        unless arguments.empty? && pin.path == 'Kernel#raise'
+          return [Problem.new(location, "Not enough arguments to #{pin.path}")]
+        end
       end
       []
     end

data/lib/solargraph/version.rb

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

data/lib/solargraph/views/_method.erb

@@ -2,7 +2,7 @@
     Namespace:
 </h2>
 <p>
-    <a href="command:solargraph._openDocument?<%= CGI.escape "\"solargraph:/document?query=#{object.namespace}\"" %>"><%= object.namespace %></a>
+    <a href="solargraph:/document?query=<%= CGI.escape object.namespace.path %>"><%= object.namespace %></a>
 </p>
 <h2>
     Overview:

data/lib/solargraph/workspace.rb

@@ -183,7 +183,7 @@ module Solargraph
           end
         end
       end
-      result.concat config.require_paths
+      result.concat(config.require_paths.map { |p| File.join(directory, p) })
       result.push File.join(directory, 'lib') if result.empty?
       result
     end

data/lib/solargraph/yard_map.rb

@@ -288,9 +288,6 @@ module Solargraph
     # @return [Array<Pin::Base>]
     def process_yardoc y, spec = nil
       return [] if y.nil?
-      size = Dir.glob(File.join(y, '**', '*'))
-        .map{ |f| File.size(f) }
-        .inject(:+)
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
         if File.file?(ser)
@@ -299,19 +296,24 @@ module Solargraph
           dump = file.read
           file.close
           begin
-            return Marshal.load(dump)
+            result = Marshal.load(dump)
+            return result unless result.nil? || result.empty?
+            Solargraph.logger.warn "Empty cache for #{spec.name} #{spec.version}. Reloading"
           rescue StandardError => e
             Solargraph.logger.warn "Error loading pin cache: [#{e.class}] #{e.message}"
             File.unlink ser
           end
         end
       end
+      size = Dir.glob(File.join(y, '**', '*'))
+        .map{ |f| File.size(f) }
+        .inject(:+)
       if !size.nil? && size > 20_000_000
         Solargraph::Logging.logger.warn "Yardoc at #{y} is too large to process (#{size} bytes)"
         return []
       end
+      Solargraph.logger.info "Loading #{spec.name} #{spec.version} from #{y}"
       load_yardoc y
-      Solargraph.logger.info "Loading #{spec.name} #{spec.version} from yardoc"
       result = Mapper.new(YARD::Registry.all, spec).map
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
@@ -435,5 +437,3 @@ module Solargraph
 end
 
 Solargraph::YardMap::CoreDocs.require_minimum
-# Change YARD log IO to avoid sending unexpected messages to STDOUT
-YARD::Logger.instance.io = File.new(File::NULL, 'w')

data/lib/solargraph.rb

@@ -57,6 +57,7 @@ module Solargraph
   # A helper method that runs Bundler.with_unbundled_env or falls back to
   # Bundler.with_clean_env for earlier versions of Bundler.
   #
+  # @return [void]
   def self.with_clean_env &block
     meth = if Bundler.respond_to?(:with_unbundled_env)
       :with_unbundled_env

data/lib/yard-solargraph.rb

@@ -2,6 +2,9 @@
 
 require 'yard'
 
+# Change YARD log IO to avoid sending unexpected messages to STDOUT
+YARD::Logger.instance.io = File.new(File::NULL, 'w')
+
 module Solargraph
   # A placeholder for the @!domain directive. It doesn't need to do anything
   # for yardocs. It's only used for Solargraph API maps.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.42.2
+  version: 0.43.1
 platform: ruby
 authors:
 - Fred Snyder
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -350,6 +350,7 @@ files:
 - lib/solargraph/language_server/host/cataloger.rb
 - lib/solargraph/language_server/host/diagnoser.rb
 - lib/solargraph/language_server/host/dispatch.rb
+- lib/solargraph/language_server/host/message_worker.rb
 - lib/solargraph/language_server/host/sources.rb
 - lib/solargraph/language_server/message.rb
 - lib/solargraph/language_server/message/base.rb
@@ -502,6 +503,7 @@ files:
 - lib/solargraph/source/chain/class_variable.rb
 - lib/solargraph/source/chain/constant.rb
 - lib/solargraph/source/chain/global_variable.rb
+- lib/solargraph/source/chain/hash.rb
 - lib/solargraph/source/chain/head.rb
 - lib/solargraph/source/chain/instance_variable.rb
 - lib/solargraph/source/chain/link.rb
@@ -553,7 +555,7 @@ homepage: http://solargraph.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -568,8 +570,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A Ruby language server
 test_files: []