solargraph 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f93d18c2483c24a81693e662698b7d67e86086211608d6f50a0128b95cc817b6
-  data.tar.gz: f0346ff1adf21faebba30306cc2e682cf99d83bcedf66ebfca3029dad4031025
+  metadata.gz: c647321bb57cb5ba859e1762032855324aa967e78a562c0e259508e5c24c22ee
+  data.tar.gz: 057c1a4298f9c4574c0773425cce496216ab60e22165871487d6d77e13733745
 SHA512:
-  metadata.gz: d87a287c2608cbd7af255684a790ab079b85821a2abf3a6051212b36a156bf3662310bf5e9e7d3857ad89338b81628e94eb270dc74db258c6cb2ff2f4f0bc852
-  data.tar.gz: ad9ae29c4d354588e383fb68926175bad72e419a2ef736f7e9f7069c701d3b94bc5ab784768be4dd1823ef1ac65201bea9e971ea554c6918f2f23d9fd1c42b92
+  metadata.gz: ae8cb69f92e2f3ad78959bd8767b78dda5a7d4baa861fa59680be191b7c92944f0df15ff12ccad2ed4a93231afcc55db53bd40cf9b42473387491f4d168f1cef
+  data.tar.gz: 8d02f2a10b1a71579a0b48e9dae4268689cc0ec642c137b1adedf6fc99749ae5a1b04f46b4d9b30448d3316a71b65dfdf79b5066c0af499e2181fcc5a107201f

data/lib/solargraph.rb

@@ -20,7 +20,6 @@ module Solargraph
   autoload :Shell,          'solargraph/shell'
   autoload :Source,         'solargraph/source'
   autoload :ApiMap,         'solargraph/api_map'
-  autoload :NodeMethods,    'solargraph/node_methods'
   autoload :YardMap,        'solargraph/yard_map'
   autoload :Pin,            'solargraph/pin'
   autoload :LiveMap,        'solargraph/live_map'

data/lib/solargraph/api_map.rb

@@ -20,6 +20,14 @@ module Solargraph
     # @return [Solargraph::Workspace]
     attr_reader :workspace
 
+    # @return [ApiMap::Store]
+    attr_reader :store
+
+    # Get a LiveMap associated with the current workspace.
+    #
+    # @return [Solargraph::LiveMap]
+    attr_reader :live_map
+
     # @param workspace [Solargraph::Workspace]
     def initialize workspace = Solargraph::Workspace.new(nil)
       @workspace = workspace
@@ -28,7 +36,7 @@ module Solargraph
       @yard_stale = true
       # process_maps
       @sources = workspace.sources
-      yard_map
+      refresh_store_and_maps
     end
 
     # Create an ApiMap with a workspace in the specified directory.
@@ -38,11 +46,6 @@ module Solargraph
       self.new(Solargraph::Workspace.new(directory))
     end
 
-    # @return [ApiMap::Store]
-    def store
-      @store ||= ApiMap::Store.new(@sources)
-    end
-
     def pins
       store.pins
     end
@@ -68,19 +71,12 @@ module Solargraph
     # @return [Solargraph::YardMap]
     def yard_map
       # refresh
-      if @yard_map.nil? || @yard_map.required.to_set != required.to_set
+      if @yard_map.required.to_set != required.to_set
         @yard_map = Solargraph::YardMap.new(required: required, workspace: workspace)
       end
       @yard_map
     end
 
-    # Get a LiveMap associated with the current workspace.
-    #
-    # @return [Solargraph::LiveMap]
-    def live_map
-      @live_map ||= Solargraph::LiveMap.new(self)
-    end
-
     # Declare a virtual source that will be included in the map regardless of
     # whether it's in the workspace.
     #
@@ -231,7 +227,7 @@ module Solargraph
     # @param namespace [String] A fully qualified namespace
     # @return [Array<Solargraph::Pin::ClassVariable>]
     def get_class_variable_pins(namespace)
-      prefer_non_nil_variables(@cvar_pins[namespace] || [])
+      prefer_non_nil_variables(store.get_class_variables(namespace))
     end
 
     # @return [Array<Solargraph::Pin::Base>]
@@ -262,6 +258,11 @@ module Solargraph
       else
         result.concat inner_get_methods(fqns, scope, visibility, deep, skip)
       end
+      live = live_map.get_methods(fqns, '', scope.to_s, visibility.include?(:private))
+      unless live.empty?
+        exist = result.map(&:name)
+        result.concat live.reject{|p| exist.include?(p.name)}
+      end
       result
     end
 
@@ -295,7 +296,7 @@ module Solargraph
             if fragment.base.empty?
               result.concat get_methods(pin.path)
             else
-              type = probe.infer_signature_type(fragment.base, pin, fragment.locals)
+              type = probe.infer_signature_type("#{pin.path}.new.#{fragment.base}", pin, fragment.locals)
               unless type.nil?
                 namespace, scope = extract_namespace_and_scope(type)
                 result.concat get_methods(namespace, scope: scope)
@@ -321,7 +322,11 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def define fragment
       return [] if fragment.string? or fragment.comment?
-      probe.infer_signature_pins fragment.whole_signature, fragment.named_path, fragment.locals
+      if fragment.base_literal?
+        probe.infer_signature_pins fragment.whole_signature, Pin::ProxyMethod.new(fragment.base_literal), fragment.locals
+      else
+        probe.infer_signature_pins fragment.whole_signature, fragment.named_path, fragment.locals
+      end
     end
 
     # Infer a return type from a fragment. This method will attempt to resolve
@@ -345,9 +350,13 @@ module Solargraph
     def signify fragment
       return [] unless fragment.argument?
       return [] if fragment.recipient.whole_signature.nil? or fragment.recipient.whole_signature.empty?
-      probe.infer_signature_pins(
-        fragment.recipient.whole_signature, fragment.named_path, fragment.locals
-      ).select{ |pin| pin.kind == Pin::METHOD }
+      result = []
+      if fragment.recipient.base_literal?
+        result.concat probe.infer_signature_pins(fragment.recipient.whole_signature, Pin::ProxyMethod.new(fragment.recipient.base_literal), fragment.locals)
+      else
+        result.concat probe.infer_signature_pins(fragment.recipient.whole_signature, fragment.named_path, fragment.locals)
+      end
+      result.select{ |pin| pin.kind == Pin::METHOD }
     end
 
     # Get an array of all suggestions that match the specified path.
@@ -359,6 +368,10 @@ module Solargraph
       result = []
       result.concat store.get_path_pins(path)
       result.concat yard_map.objects(path)
+      if result.empty?
+        lp = live_map.get_path_pin(path)
+        result.push lp unless lp.nil?
+      end
       result
     end
 
@@ -426,6 +439,12 @@ module Solargraph
 
     private
 
+    def refresh_store_and_maps
+      @store = ApiMap::Store.new(@sources)
+      @live_map = Solargraph::LiveMap.new(self)
+      @yard_map = Solargraph::YardMap.new(required: required, workspace: workspace)
+    end
+
     def process_virtual
       unless @virtual_source.nil?
         map_source @virtual_source
@@ -451,9 +470,7 @@ module Solargraph
       return [] if skip.include?(reqstr)
       skip.push reqstr
       result = []
-      if scope == :instance
-        result.concat store.get_attrs(fqns)
-      end
+      result.concat store.get_attrs(fqns, scope)
       result.concat store.get_methods(fqns, scope: scope, visibility: visibility)
       if deep
         sc = store.get_superclass(fqns)

data/lib/solargraph/api_map/completion.rb

@@ -1,5 +1,8 @@
 module Solargraph
   class ApiMap
+    # The result of a completion request containing the pins that describe
+    # completion options and the range to be replaced.
+    #
     class Completion
       # @return [Array<Solargraph::Pin::Base>]
       attr_reader :pins

data/lib/solargraph/api_map/probe.rb

@@ -1,16 +1,6 @@
 module Solargraph
   class ApiMap
     class Probe
-      class VirtualPin
-        attr_reader :return_type
-        def initialize return_type
-          @return_type = return_type
-        end
-        def namespace
-          @namespace ||= TypeMethods.extract_namespace(@return_type)
-        end
-      end
-
       include TypeMethods
 
       # @return [Solargraph::ApiMap]
@@ -29,8 +19,8 @@ module Solargraph
         return infer_word_pins(base, context_pin, locals) if rest.nil?
         pins = infer_word_pins(base, context_pin, locals).map do |pin|
           next pin unless pin.return_type.nil?
-          type = resolve_pin_type(pin)
-          VirtualPin.new(type)
+          type = resolve_pin_type(pin, locals - [pin])
+          Pin::ProxyMethod.new(type)
         end
         return [] if pins.empty?
         rest = rest.split('.')
@@ -58,7 +48,7 @@ module Solargraph
       def infer_signature_type signature, context_pin, locals
         pins = infer_signature_pins(signature, context_pin, locals)
         pins.each do |pin|
-          type = resolve_pin_type(pin)
+          type = resolve_pin_type(pin, locals - [pin])
           return qualify(type, pin.named_context) unless type.nil?
         end
         nil
@@ -75,9 +65,16 @@ module Solargraph
         namespace, scope = extract_namespace_and_scope_from_pin(context_pin)
         return api_map.pins.select{|pin| word_matches_context?(word, namespace, scope, pin)} if variable_name?(word)
         result = []
-        result.concat api_map.get_path_suggestions(word)
+        cparts = namespace.split('::')
+        until cparts.empty?
+          break unless result.empty?
+          cur = cparts.join('::')
+          result.concat api_map.get_path_suggestions("#{cur}::#{word}")
+          cparts.pop
+        end
+        result.concat api_map.get_path_suggestions(word) if result.empty?
         result.concat api_map.get_methods(namespace, scope: scope, visibility: [:public, :private, :protected]).select{|pin| pin.name == word} unless word.include?('::')
-        result.concat api_map.get_constants('', namespace).select{|pin| pin.name == word}
+        result.concat api_map.get_constants('', namespace).select{|pin| pin.name == word} if result.empty?
         result
       end
 
@@ -151,11 +148,11 @@ module Solargraph
         pin
       end
 
-      def resolve_pin_type pin
+      def resolve_pin_type pin, locals
         pin.return_type
         return pin.return_type unless pin.return_type.nil?
         return resolve_block_parameter(pin) if pin.kind == Pin::BLOCK_PARAMETER
-        return resolve_variable(pin) if pin.variable?
+        return resolve_variable(pin, locals) if pin.variable?
         nil
       end
 
@@ -184,10 +181,10 @@ module Solargraph
         nil
       end
 
-      def resolve_variable(pin)
+      def resolve_variable(pin, locals)
         return nil if pin.nil_assignment?
         # @todo Do we need the locals here?
-        return infer_signature_type(pin.signature, pin.context, [])
+        return infer_signature_type(pin.signature, pin.context, locals)
       end
 
       def get_subtypes type

data/lib/solargraph/api_map/store.rb

@@ -43,8 +43,8 @@ module Solargraph
         }
       end
 
-      def get_attrs fqns
-        namespace_pins(fqns).select{ |pin| pin.kind == Pin::ATTRIBUTE }
+      def get_attrs fqns, scope
+        namespace_pins(fqns).select{ |pin| pin.kind == Pin::ATTRIBUTE and pin.scope == scope }
       end
 
       def get_superclass fqns
@@ -80,6 +80,10 @@ module Solargraph
         namespace_pins(fqns).select{|pin| pin.kind == Pin::INSTANCE_VARIABLE and pin.scope == scope}
       end
 
+      def get_class_variables(fqns)
+        namespace_pins(fqns).select{|pin| pin.kind == Pin::CLASS_VARIABLE}
+      end
+
       def get_symbols
         symbols.uniq(&:name)
       end

data/lib/solargraph/diagnostics/rubocop.rb

@@ -15,6 +15,8 @@ module Solargraph
         @command = command
       end
 
+      # @param source [Solargraph::Source]
+      # @param api_map [Solargraph::ApiMap]
       # @return [Array<Hash>]
       def diagnose source, api_map
         begin
@@ -22,6 +24,10 @@ module Solargraph
           filename = source.filename
           raise DiagnosticsError, 'No command specified' if command.nil? or command.empty?
           cmd = "#{Shellwords.escape(command)} -f j -s #{Shellwords.escape(filename)}"
+          unless api_map.workspace.nil? or api_map.workspace.directory.nil?
+            rc = File.join(api_map.workspace.directory, '.rubocop.yml')
+            cmd += " -c #{Shellwords.escape(rc)}" if File.file?(rc)
+          end
           o, e, s = Open3.capture3(cmd, stdin_data: text)
           STDERR.puts e unless e.empty?
           raise DiagnosticsError, "Command '#{command}' is not available (gem exception)" if e.include?('Gem::Exception')

data/lib/solargraph/language_server/host.rb

@@ -323,6 +323,14 @@ module Solargraph
         result
       end
 
+      def references_from filename, line, column
+        result = nil
+        @change_semaphore.synchronize do
+          result = library.references_from(filename, line, column)
+        end
+        result
+      end
+
       def query_symbols query
         result = nil
         @change_semaphore.synchronize { result = library.query_symbols(query) }
@@ -446,7 +454,7 @@ module Solargraph
         Thread.new do
           diagnoser = Diagnostics::Rubocop.new
           until stopped?
-            sleep 1
+            sleep 0.1
             if !options['diagnostics']
               @change_semaphore.synchronize { @diagnostics_queue.clear }
               next

data/lib/solargraph/language_server/message.rb

@@ -56,6 +56,8 @@ module Solargraph
       register 'textDocument/formatting',          TextDocument::Formatting
       register 'textDocument/onTypeFormatting',    TextDocument::OnTypeFormatting
       register 'textDocument/documentSymbol',      TextDocument::DocumentSymbol
+      register 'textDocument/references',          TextDocument::References
+      register 'textDocument/rename',              TextDocument::Rename
       register 'workspace/didChangeWatchedFiles',  Workspace::DidChangeWatchedFiles
       register 'workspace/didChangeConfiguration', Workspace::DidChangeConfiguration
       register 'workspace/symbol',                 Workspace::WorkspaceSymbol
@@ -64,6 +66,7 @@ module Solargraph
       register '$/solargraph/search',              Extended::Search
       register '$/solargraph/checkGemVersion',     Extended::CheckGemVersion
       register '$/solargraph/documentGems',        Extended::DocumentGems
+      register '$/solargraph/downloadCore',        Extended::DownloadCore
       register 'shutdown',                         Shutdown
       register 'exit',                             ExitNotification
     end

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

@@ -11,6 +11,7 @@ module Solargraph
         autoload :Search, 'solargraph/language_server/message/extended/search'
         autoload :CheckGemVersion, 'solargraph/language_server/message/extended/check_gem_version'
         autoload :DocumentGems, 'solargraph/language_server/message/extended/document_gems'
+        autoload :DownloadCore, 'solargraph/language_server/message/extended/download_core'
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Solargraph
         class CheckGemVersion < Base
           def process
             o, s = Open3.capture2("gem search solargraph")
-            match = o.match(/solargraph \([0-9\.]*?\)/)
+            match = o.match(/solargraph \(([\d]*\.[\d]*\.[\d]*)\)/)
             # @todo Error if no match or status code != 0
             available = Gem::Version.new(match[1])
             current = Gem::Version.new(Solargraph::VERSION)

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

@@ -0,0 +1,25 @@
+require 'open3'
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module Extended
+        # Update core Ruby documentation.
+        #
+        class DownloadCore < Base
+          def process
+            cmd = "solargraph download-core"
+            o, s = Open3.capture2(cmd)
+            if s != 0
+              host.show_message "An error occurred while downloading documentation.", LanguageServer::MessageTypes::ERROR
+            else
+              ver = o.match(/[\d]*\.[\d]*\.[\d]*/)[0]
+              host.show_message "Downloaded documentation for Ruby #{ver}.", LanguageServer::MessageTypes::INFO
+              # @todo YardMap should be refreshed
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,12 +11,14 @@ module Solargraph
               definitionProvider: true,
               documentSymbolProvider: true,
               workspaceSymbolProvider: true,
+              renameProvider: true,
               workspace: {
                 workspaceFolders: {
                   supported: true,
                   changeNotifications: true
                 }
-              }
+              },
+              referencesProvider: true
             }
           }
           result[:capabilities].merge! static_completion unless dynamic_completion?

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

@@ -2,19 +2,21 @@ 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 :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 :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'
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Solargraph::LanguageServer::Message::TextDocument
       line = params['position']['line']
       col = params['position']['character']
       suggestions = host.definitions_at(filename, line, col)
-      locations = suggestions.map do |pin|
+      locations = suggestions.reject{|pin| pin.location.nil?}.map do |pin|
         unless pin.location.nil?
           {
             uri: file_to_uri(pin.location.filename),