solargraph 0.43.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a1a9d76094688ff7ebe1af3dec4452c379819408ffc458eddcd75f5b66d2eb
-  data.tar.gz: 9b03143ba896ccd2d3bd0a44c9a1e90f06e3ed757a47a08e6b8aaf2a9f56e62e
+  metadata.gz: '0827e2be47eea923c2f61688ce4e97efa11d3d801f094ffb8a6cdb73a7fb52b3'
+  data.tar.gz: dcbad1eaa64acab63ccc511a93c0e1370fc469815e2e67735fc79c2f4dc08038
 SHA512:
-  metadata.gz: a6d4e99416af96a8a11ca569d096f4ba1491155f3fde1efc734e59c73d1794007d0b7b1e936c1dfb248472df1fa679c7701866176de99119e8f6a0b8eef721d4
-  data.tar.gz: edd612d341e6c9bb421e4bbb8db04badc855e924eca469c47943c374813025810151aca1abdd0da13100597803799a50c7355a362b8a0ae65187c0760464e840
+  metadata.gz: fa050d901186e2385685d2aab7934f611517d68b549f4cb064ab7c3524f99e890488675a06483c2b1f2e2cafc0417a3367972a1ea8b6c6614a3465e867313b03
+  data.tar.gz: 4b12d6b0f65f53afd0ccbbdfc84a9fe8159f2f3a4bb3c625a84f1a9ee80be53f8c8b1d1ecfbae9bcf01ceff691388af5d0cef7271bb5470730fc4aa7a2471df9

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.44.0 - September 27, 2021
+- Allow opening parenthesis, space, and comma when using Diff::LCS (#465)
+- Support textDocument/documentHighlight
+- Library#references_from performs shallow matches
+
+## 0.43.3 - September 25, 2021
+- Avoid Dir.chdir in Bundler processes (#481)
+- Check stdlib for gems with empty yardocs
+- Library#maybe_map checks for source in workspace
+
+## 0.43.2 - September 23, 2021
+- Synchronize server requests (#461)
+
+## 0.43.1 - September 20, 2021
+- 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)

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/lib/solargraph/documentor.rb

@@ -59,18 +59,16 @@ module Solargraph
     # @return [Hash]
     def self.specs_from_bundle directory
       Solargraph.with_clean_env do
-        Dir.chdir directory do
-          cmd = [
-            'bundle', 'exec', 'ruby', '-e',
-            "require 'bundler'; require 'json'; puts Bundler.definition.specs_for([:default]).map { |spec| [spec.name, spec.version] }.to_h.to_json"
-          ]
-          o, e, s = Open3.capture3(*cmd)
-          if s.success?
-            o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
-          else
-            Solargraph.logger.warn e
-            raise BundleNotFoundError, "Failed to load gems from bundle at #{directory}"
-          end
+        cmd = [
+          'ruby', '-e',
+          "require 'bundler'; require 'json'; Dir.chdir('#{directory}') { puts Bundler.definition.specs_for([:default]).map { |spec| [spec.name, spec.version] }.to_h.to_json }"
+        ]
+        o, e, s = Open3.capture3(*cmd)
+        if s.success?
+          o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
+        else
+          Solargraph.logger.warn e
+          raise BundleNotFoundError, "Failed to load gems from bundle at #{directory}"
         end
       end
     end

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

@@ -0,0 +1,59 @@
+# 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 [Hash] The message should be handle. will pass back to Host#receive
+        # @return [void]
+        def queue(message)
+          @mutex.synchronize do
+            messages.push(message)
+            @resource.signal
+          end
+        end
+
+        def start
+          return unless @stopped
+          @stopped = false
+          Thread.new do
+            tick until stopped?
+          end
+        end
+
+        def tick
+          message = @mutex.synchronize do
+            @resource.wait(@mutex) if messages.empty?
+            messages.shift
+          end
+          handler = @host.receive(message)
+          handler && handler.send_response
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/host.rb

@@ -12,10 +12,11 @@ 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
@@ -27,7 +28,7 @@ module Solargraph
       def initialize
         @cancel_semaphore = Mutex.new
         @buffer_semaphore = Mutex.new
-        @register_semaphore = Mutex.new
+        @request_mutex = Mutex.new
         @cancel = []
         @buffer = String.new
         @stopped = true
@@ -45,6 +46,7 @@ module Solargraph
         diagnoser.start
         cataloger.start
         sources.start
+        message_worker.start
       end
 
       # Update the configuration options with the provided hash.
@@ -89,8 +91,15 @@ module Solargraph
         @cancel_semaphore.synchronize { @cancel.delete id }
       end
 
+      # Called by adapter, to handle the request
+      # @param request [Hash]
+      # @return [void]
+      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.
@@ -355,19 +364,21 @@ module Solargraph
       # @yieldparam [Hash] The result sent by the client
       # @return [void]
       def send_request method, params, &block
-        message = {
-          jsonrpc: "2.0",
-          method: method,
-          params: params,
-          id: @next_request_id
-        }
-        json = message.to_json
-        requests[@next_request_id] = Request.new(@next_request_id, &block)
-        envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
-        queue envelope
-        @next_request_id += 1
-        logger.info "Server sent #{method}"
-        logger.debug params
+        @request_mutex.synchronize do
+          message = {
+            jsonrpc: "2.0",
+            method: method,
+            params: params,
+            id: @next_request_id
+          }
+          json = message.to_json
+          requests[@next_request_id] = Request.new(@next_request_id, &block)
+          envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
+          queue envelope
+          @next_request_id += 1
+          logger.info "Server sent #{method}"
+          logger.debug params
+        end
       end
 
       # Register the methods as capabilities with the client.
@@ -378,20 +389,16 @@ module Solargraph
       # @return [void]
       def register_capabilities methods
         logger.debug "Registering capabilities: #{methods}"
-        registrations = methods.select{|m| can_register?(m) and !registered?(m)}.map { |m|
+        registrations = methods.select { |m| can_register?(m) and !registered?(m) }.map do |m|
           @registered_capabilities.add m
           {
             id: m,
             method: m,
             registerOptions: dynamic_capability_options[m]
           }
-        }
-        return if registrations.empty?
-        @register_semaphore.synchronize do
-          send_request 'client/registerCapability', {
-            registrations: registrations
-          }
         end
+        return if registrations.empty?
+        send_request 'client/registerCapability', { registrations: registrations }
       end
 
       # Unregister the methods with the client.
@@ -410,11 +417,7 @@ module Solargraph
           }
         }
         return if unregisterations.empty?
-        @register_semaphore.synchronize do
-          send_request 'client/unregisterCapability', {
-            unregisterations: unregisterations
-          }
-        end
+        send_request 'client/unregisterCapability', { unregisterations: unregisterations }
       end
 
       # Flag a method as available for dynamic registration.
@@ -422,9 +425,7 @@ module Solargraph
       # @param method [String] The method name, e.g., 'textDocument/completion'
       # @return [void]
       def allow_registration method
-        @register_semaphore.synchronize do
-          @dynamic_capabilities.add method
-        end
+        @dynamic_capabilities.add method
       end
 
       # True if the specified LSP method can be dynamically registered.
@@ -451,6 +452,7 @@ module Solargraph
       def stop
         return if @stopped
         @stopped = true
+        message_worker.stop
         cataloger.stop
         diagnoser.stop
         sources.stop
@@ -513,6 +515,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]
@@ -535,10 +542,11 @@ module Solargraph
       # @param line [Integer]
       # @param column [Integer]
       # @param strip [Boolean] Strip special characters from variable names
+      # @param only [Boolean] If true, search current file only
       # @return [Array<Solargraph::Range>]
-      def references_from uri, line, column, strip: true
+      def references_from uri, line, column, strip: true, only: false
         library = library_for(uri)
-        library.references_from(uri_to_file(uri), line, column, strip: strip)
+        library.references_from(uri_to_file(uri), line, column, strip: strip, only: only)
       end
 
       # @param query [String]
@@ -624,6 +632,7 @@ module Solargraph
           'diagnostics' => false,
           'formatting' => false,
           'folding' => true,
+          'highlights' => true,
           'logLevel' => 'warn'
         }
       end
@@ -646,6 +655,11 @@ module Solargraph
 
       private
 
+      # @return [MessageWorker]
+      def message_worker
+        @message_worker ||= MessageWorker.new(self)
+      end
+
       # @return [Diagnoser]
       def diagnoser
         @diagnoser ||= Diagnoser.new(self)
@@ -703,7 +717,7 @@ module Solargraph
         return change if diffs.length.zero? || diffs.length > 1 || diffs.first.length > 1
         # @type [Diff::LCS::Change]
         diff = diffs.first.first
-        return change unless diff.adding? && ['.', ':'].include?(diff.element)
+        return change unless diff.adding? && ['.', ':', '(', ',', ' '].include?(diff.element)
         position = Solargraph::Position.from_offset(source.code, diff.position)
         {
           'range' => {
@@ -771,6 +785,9 @@ module Solargraph
           },
           'textDocument/codeAction' => {
             codeActionProvider: true
+          },
+          'textDocument/documentHighlight' => {
+            documentHighlightProvider: true
           }
         }
       end

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

@@ -36,6 +36,7 @@ module Solargraph
           result[:capabilities].merge! static_references unless dynamic_registration_for?('textDocument', 'references')
           result[:capabilities].merge! static_workspace_symbols unless dynamic_registration_for?('workspace', 'symbol')
           result[:capabilities].merge! static_folding_range unless dynamic_registration_for?('textDocument', 'foldingRange')
+          result[:capabilities].merge! static_highlights unless dynamic_registration_for?('textDocument', 'documentHighlight')
           # @todo Temporarily disabled
           # result[:capabilities].merge! static_code_action unless dynamic_registration_for?('textDocument', 'codeAction')
           set_result result
@@ -138,6 +139,12 @@ module Solargraph
           }
         end
 
+        def static_highlights
+          {
+            documentHighlightProvider: true
+          }
+        end
+
         # @param section [String]
         # @param capability [String]
         # @return [Boolean]

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

@@ -17,6 +17,7 @@ module Solargraph
             textDocument/rename
             textDocument/prepareRename
             textDocument/foldingRange
+            textDocument/documentHighlight
             workspace/symbol
           ]
         end

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/message/text_document/document_highlight.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::TextDocument
+  class DocumentHighlight < Base
+    def process
+      locs = host.references_from(params['textDocument']['uri'], params['position']['line'], params['position']['character'], strip: true, only: true)
+      result = locs.map do |loc|
+        {
+          range: loc.range.to_hash,
+          kind: 1
+        }
+      end
+      set_result result
+    end
+  end
+end

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

@@ -4,24 +4,24 @@ module Solargraph
   module LanguageServer
     module Message
       module TextDocument
-        autoload :Base,             'solargraph/language_server/message/text_document/base'
-        autoload :Completion,       'solargraph/language_server/message/text_document/completion'
-        autoload :DidOpen,          'solargraph/language_server/message/text_document/did_open'
-        autoload :DidChange,        'solargraph/language_server/message/text_document/did_change'
-        autoload :DidClose,         'solargraph/language_server/message/text_document/did_close'
-        autoload :DidSave,          'solargraph/language_server/message/text_document/did_save'
-        autoload :Hover,            'solargraph/language_server/message/text_document/hover'
-        autoload :SignatureHelp,    'solargraph/language_server/message/text_document/signature_help'
-        autoload :DiagnosticsQueue, 'solargraph/language_server/message/text_document/diagnostics_queue'
-        autoload :OnTypeFormatting, 'solargraph/language_server/message/text_document/on_type_formatting'
-        autoload :Definition,       'solargraph/language_server/message/text_document/definition'
-        autoload :DocumentSymbol,   'solargraph/language_server/message/text_document/document_symbol'
-        autoload :Formatting,       'solargraph/language_server/message/text_document/formatting'
-        autoload :References,       'solargraph/language_server/message/text_document/references'
-        autoload :Rename,           'solargraph/language_server/message/text_document/rename'
-        autoload :PrepareRename,    'solargraph/language_server/message/text_document/prepare_rename'
-        autoload :FoldingRange,     'solargraph/language_server/message/text_document/folding_range'
-        autoload :CodeAction,       'solargraph/language_server/message/text_document/code_action'
+        autoload :Base,              'solargraph/language_server/message/text_document/base'
+        autoload :Completion,        'solargraph/language_server/message/text_document/completion'
+        autoload :DidOpen,           'solargraph/language_server/message/text_document/did_open'
+        autoload :DidChange,         'solargraph/language_server/message/text_document/did_change'
+        autoload :DidClose,          'solargraph/language_server/message/text_document/did_close'
+        autoload :DidSave,           'solargraph/language_server/message/text_document/did_save'
+        autoload :Hover,             'solargraph/language_server/message/text_document/hover'
+        autoload :SignatureHelp,     'solargraph/language_server/message/text_document/signature_help'
+        autoload :DiagnosticsQueue,  'solargraph/language_server/message/text_document/diagnostics_queue'
+        autoload :OnTypeFormatting,  'solargraph/language_server/message/text_document/on_type_formatting'
+        autoload :Definition,        'solargraph/language_server/message/text_document/definition'
+        autoload :DocumentSymbol,    'solargraph/language_server/message/text_document/document_symbol'
+        autoload :Formatting,        'solargraph/language_server/message/text_document/formatting'
+        autoload :References,        'solargraph/language_server/message/text_document/references'
+        autoload :Rename,            'solargraph/language_server/message/text_document/rename'
+        autoload :PrepareRename,     'solargraph/language_server/message/text_document/prepare_rename'
+        autoload :FoldingRange,      'solargraph/language_server/message/text_document/folding_range'
+        autoload :DocumentHighlight, 'solargraph/language_server/message/text_document/document_highlight'
       end
     end
   end

data/lib/solargraph/language_server/message/workspace/did_change_configuration.rb

@@ -22,6 +22,7 @@ module Solargraph::LanguageServer::Message::Workspace
       (host.options['definitions'] ? y : n).push('textDocument/definition')
       (host.options['references'] ? y : n).push('textDocument/references')
       (host.options['folding'] ? y : n).push('textDocument/folding')
+      (host.options['highlights'] ? y : n).push('textDocument/documentHighlight')
       host.register_capabilities y
       host.unregister_capabilities n
     end

data/lib/solargraph/language_server/message.rb

@@ -73,7 +73,8 @@ module Solargraph
       register 'textDocument/rename',                 TextDocument::Rename
       register 'textDocument/prepareRename',          TextDocument::PrepareRename
       register 'textDocument/foldingRange',           TextDocument::FoldingRange
-      register 'textDocument/codeAction',             TextDocument::CodeAction
+      # register 'textDocument/codeAction',             TextDocument::CodeAction
+      register 'textDocument/documentHighlight',      TextDocument::DocumentHighlight
       register 'workspace/didChangeWatchedFiles',     Workspace::DidChangeWatchedFiles
       register 'workspace/didChangeConfiguration',    Workspace::DidChangeConfiguration
       register 'workspace/didChangeWorkspaceFolders', Workspace::DidChangeWorkspaceFolders

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

@@ -216,33 +216,35 @@ module Solargraph
     # @param line [Integer]
     # @param column [Integer]
     # @param strip [Boolean] Strip special characters from variable names
+    # @param only [Boolean] Search for references in the current file only
     # @return [Array<Solargraph::Range>]
     # @todo Take a Location instead of filename/line/column
-    def references_from filename, line, column, strip: false
+    def references_from filename, line, column, strip: false, only: false
       cursor = api_map.cursor_at(filename, Position.new(line, column))
       clip = api_map.clip(cursor)
-      pins = clip.define
-      return [] if pins.empty?
+      pin = clip.define.first
+      return [] unless pin
       result = []
-      pins.uniq.each do |pin|
-        (workspace.sources + (@current ? [@current] : [])).uniq(&:filename).each do |source|
-          found = source.references(pin.name)
-          found.select! do |loc|
-            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 }
-          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)
-            found.map! do |loc|
-              Solargraph::Location.new(loc.filename, Solargraph::Range.from_to(loc.range.start.line, loc.range.start.column + match[0].length, loc.range.ending.line, loc.range.ending.column))
-            end
+      files = if only
+        [api_map.source_map(filename)]
+      else
+        (workspace.sources + (@current ? [@current] : []))
+      end
+      files.uniq(&:filename).each do |source|
+        found = source.references(pin.name)
+        found.select! do |loc|
+          referenced = definitions_at(loc.filename, loc.range.ending.line, loc.range.ending.character).first
+          referenced && referenced.path == pin.path
+        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)
+          found.map! do |loc|
+            Solargraph::Location.new(loc.filename, Solargraph::Range.from_to(loc.range.start.line, loc.range.start.column + match[0].length, loc.range.ending.line, loc.range.ending.column))
           end
-          result.concat(found.sort do |a, b|
-            a.range.start.line <=> b.range.start.line
-          end)
         end
+        result.concat(found.sort do |a, b|
+          a.range.start.line <=> b.range.start.line
+        end)
       end
       result.uniq
     end
@@ -518,6 +520,7 @@ module Solargraph
 
     def maybe_map source
       return unless source
+      return unless @current == source || workspace.has_file?(source.filename)
       if source_map_hash.key?(source.filename)
         return if source_map_hash[source.filename].code == source.code && 
           source_map_hash[source.filename].source.synchronized? &&

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_methods.rb

@@ -178,6 +178,7 @@ module Solargraph
 
         # @param cursor [Solargraph::Source::Cursor]
         def find_recipient_node cursor
+          return repaired_find_recipient_node(cursor) if cursor.source.repaired? && cursor.source.code[cursor.offset - 1] == '('
           source = cursor.source
           position = cursor.position
           offset = cursor.offset
@@ -210,6 +211,12 @@ module Solargraph
           nil
         end
 
+        def repaired_find_recipient_node cursor
+          cursor = cursor.source.cursor_at([cursor.position.line, cursor.position.column - 1])
+          node = cursor.source.tree_at(cursor.position.line, cursor.position.column).first
+          return node if node && node.type == :send
+        end
+
         module DeepInference
           class << self
             CONDITIONAL = [:if, :unless]

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

@@ -141,36 +141,45 @@ module Solargraph
         class << self
           protected
 
+          # @param cursor [Source::Cursor]
+          # @return [RubyVM::AbstractSyntaxTree::Node, nil]
           def synchronized_find_recipient_node cursor
+            cursor = maybe_adjust_cursor(cursor)
             source = cursor.source
             position = cursor.position
             offset = cursor.offset
             tree = source.tree_at(position.line, position.column)
-            tree.shift while tree.first && [:FCALL, :VCALL, :CALL].include?(tree.first.type) && !source.code_for(tree.first).strip.end_with?(')')
+              .select { |n| [:FCALL, :VCALL, :CALL].include?(n.type) }
+            unless source.repaired?
+              tree.shift while tree.first && !source.code_for(tree.first).strip.end_with?(')')
+            end
+            return tree.first if source.repaired? || source.code[0..offset-1] =~ /\(\s*$/
             tree.each do |node|
-              if [:FCALL, :VCALL, :CALL].include?(node.type)
-                args = node.children.find { |c| Parser.is_ast_node?(c) && [:ARRAY, :ZARRAY, :LIST].include?(c.type) }
-                if args
-                  match = source.code[0..offset-1].match(/,[^\)]*\z/)
-                  rng = Solargraph::Range.from_node(args)
-                  if match
-                    rng = Solargraph::Range.new(rng.start, position)
-                  end
-                  return node if rng.contain?(position)
-                elsif source.code[0..offset-1] =~ /\(\s*$/
-                  break  unless source.code_for(node).strip.end_with?(')')
-                  return node
+              args = node.children.find { |c| Parser.is_ast_node?(c) && [:ARRAY, :ZARRAY, :LIST].include?(c.type) }
+              if args
+                match = source.code[0..offset-1].match(/,[^\)]*\z/)
+                rng = Solargraph::Range.from_node(args)
+                if match
+                  rng = Solargraph::Range.new(rng.start, position)
                 end
+                return node if rng.contain?(position)
               end
             end
             nil
           end
 
+          # @param cursor [Source::Cursor]
+          # @return [Source::Cursor]
+          def maybe_adjust_cursor cursor
+            return cursor unless (cursor.source.repaired? && cursor.source.code[cursor.offset - 1] == '(') || [',', ' '].include?(cursor.source.code[cursor.offset - 1])
+            cursor.source.cursor_at([cursor.position.line, cursor.position.column - 1])
+          end
+
           def unsynchronized_find_recipient_node cursor
             source = cursor.source
             position = cursor.position
             offset = cursor.offset
-            if source.code[0..offset-1] =~ /\([A-Zaz0-9_\s]*\z$/ #&& source.code[offset] == ')'
+            if source.code[0..offset-1] =~ /\([A-Zaz0-9_\s]*\z$/
               tree = source.tree_at(position.line, position.column - 1)
               if tree.first && [:FCALL, :VCALL, :CALL].include?(tree.first.type)
                 return tree.first

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_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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.43.0'
+  VERSION = '0.44.0'
 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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'open3'
+require 'rubygems'
+
 module Solargraph
   # A workspace consists of the files in a project's directory and the
   # project's configuration. It provides a Source for each file to be used
@@ -168,19 +171,20 @@ module Solargraph
         # HACK: Evaluating gemspec files violates the goal of not running
         #   workspace code, but this is how Gem::Specification.load does it
         #   anyway.
-        Dir.chdir base do
+        cmd = ['ruby', '-e', "require 'rubygems'; require 'json'; spec = eval(File.read('#{file}'), TOPLEVEL_BINDING, '#{file}'); return unless Gem::Specification === spec; puts({name: spec.name, paths: spec.require_paths}.to_json)"]
+        o, e, s = Open3.capture3(*cmd)
+        if s.success?
           begin
-            # @type [Gem::Specification]
-            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) })
-          rescue RuntimeError, ScriptError, Errno::ENOENT => e
-            # Don't die if we have an error during eval-ing a gem spec.
-            # Concat the default lib directory instead.
+            hash = o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
+            next if hash.empty?
+            @gemnames.push hash['name']
+            result.concat(hash['paths'].map { |path| File.join(base, path) })
+          rescue StandardError => e
             Solargraph.logger.warn "Error reading #{file}: [#{e.class}] #{e.message}"
-            result.push File.join(base, 'lib')
           end
+        else
+          Solargraph.logger.warn "Error reading #{file}"
+          Solargraph.logger.warn e
         end
       end
       result.concat(config.require_paths.map { |p| File.join(directory, p) })

data/lib/solargraph/yard_map.rb

@@ -10,6 +10,8 @@ module Solargraph
   # stdlib, and gems.
   #
   class YardMap
+    class NoYardocError < StandardError; end
+
     autoload :Cache,       'solargraph/yard_map/cache'
     autoload :CoreDocs,    'solargraph/yard_map/core_docs'
     autoload :CoreGen,     'solargraph/yard_map/core_gen'
@@ -224,7 +226,7 @@ module Solargraph
             result.concat process_yardoc yd, spec
             result.concat add_gem_dependencies(spec) if with_dependencies?
           end
-        rescue Gem::LoadError => e
+        rescue Gem::LoadError, NoYardocError => e
           base = r.split('/').first
           next if from_std.include?(base)
           from_std.push base
@@ -299,6 +301,7 @@ module Solargraph
             result = Marshal.load(dump)
             return result unless result.nil? || result.empty?
             Solargraph.logger.warn "Empty cache for #{spec.name} #{spec.version}. Reloading"
+            File.unlink ser
           rescue StandardError => e
             Solargraph.logger.warn "Error loading pin cache: [#{e.class}] #{e.message}"
             File.unlink ser
@@ -315,6 +318,7 @@ module Solargraph
       Solargraph.logger.info "Loading #{spec.name} #{spec.version} from #{y}"
       load_yardoc y
       result = Mapper.new(YARD::Registry.all, spec).map
+      raise NoYardocError, "Yardoc at #{y} is empty" if result.empty?
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
         file = File.open(ser, 'wb')

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-09-27 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
@@ -380,6 +381,7 @@ files:
 - lib/solargraph/language_server/message/text_document/did_close.rb
 - lib/solargraph/language_server/message/text_document/did_open.rb
 - lib/solargraph/language_server/message/text_document/did_save.rb
+- lib/solargraph/language_server/message/text_document/document_highlight.rb
 - lib/solargraph/language_server/message/text_document/document_symbol.rb
 - lib/solargraph/language_server/message/text_document/folding_range.rb
 - lib/solargraph/language_server/message/text_document/formatting.rb