solargraph 0.30.2 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61453319a056f4779bf21c852bb34b5f797207c19ff9266d422d25c724934bc1
-  data.tar.gz: 405c13271fce7df56c5daae95b95430f5933a66728d3e2f6fff11762d4f392d0
+  metadata.gz: 7e808b8b4e3550a64f5737991858a16cfb43c1d4d839fa0be4c7018d9740783f
+  data.tar.gz: 7a90449ea2b30e07234f89bfb468eaf0e33e28711799b15064a9ae9dbcf83bc3
 SHA512:
-  metadata.gz: 5dcd832eff27b926dd8d244feff2edc37398f0004fa62dd002f07981e325d6f5a88f7c93bc1ad91d1f0ce34954790afc0410ed9581936d5ad57a465f99cc2372
-  data.tar.gz: 246cb5bbb21a7134532512c0321e86633d21adcf4eebd24de3d33427ab3da39663dafba488b8e0a304abd252c874408513ced6370cdc8e88cde18187f1242b79
+  metadata.gz: d87b8b907a0c33376f138381ad1b70c8c49be1ce504aec7e098bcac84030f53c9c469ea87b3b0e2fdaebe04bc51cf0b338ac3074fa1064be47f87e60c82499c4
+  data.tar.gz: 5888e2114dfea0da7dd3681d800400f7393cb63804f8d4f043aac2f74b0bf9bce1f986f34ae9d85bcc9753e49f5c773ad7ec3791257fbe372f632f3deb81ee04

data/lib/solargraph.rb

@@ -40,6 +40,13 @@ module Solargraph
   YARDOC_PATH = File.realpath(File.join(dir, '..', 'yardoc'))
   YARD_EXTENSION_FILE = File.join(dir, 'yard-solargraph.rb')
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')
+
+  # A convenience method for Solargraph::Logging.logger.
+  #
+  # @return [Logger]
+  def self.logger
+    Solargraph::Logging.logger
+  end
 end
 
 Solargraph::YardMap::CoreDocs.require_minimum

data/lib/solargraph/api_map.rb

@@ -11,7 +11,7 @@ module Solargraph
     autoload :SourceToYard, 'solargraph/api_map/source_to_yard'
     autoload :Store,        'solargraph/api_map/store'
 
-    include Solargraph::ApiMap::SourceToYard
+    include SourceToYard
 
     # Get a LiveMap associated with the current workspace.
     #
@@ -40,7 +40,7 @@ module Solargraph
         @store = Store.new(pins + YardMap.new.pins)
         @unresolved_requires = []
       }
-      resolve_method_aliases
+      # resolve_method_aliases
       self
     end
 
@@ -66,9 +66,13 @@ module Solargraph
       # Bundle always needs to be merged if it adds or removes sources
       merged = (bundle.sources.length == source_map_hash.values.length)
       bundle.sources.each do |source|
-        if source_map_hash.has_key?(source.filename)
-          if source_map_hash[source.filename].code == source.code
+        if source_map_hash.key?(source.filename)
+          if source_map_hash[source.filename].code == source.code && source_map_hash[source.filename].source.synchronized? && source.synchronized?
             new_map_hash[source.filename] = source_map_hash[source.filename]
+          elsif !source.synchronized?
+            new_map_hash[source.filename] = source_map_hash[source.filename]
+            # @todo Smelly instance variable access
+            new_map_hash[source.filename].instance_variable_set(:@source, source)
           else
             map = Solargraph::SourceMap.map(source)
             if source_map_hash[source.filename].try_merge!(map)
@@ -114,7 +118,7 @@ module Solargraph
         @store = new_store
         @unresolved_requires = yard_map.unresolved_requires
       }
-      resolve_method_aliases
+      # resolve_method_aliases
       self
     end
 
@@ -142,8 +146,7 @@ module Solargraph
     # @param directory [String]
     # @return [ApiMap]
     def self.load directory
-      # @todo How should this work?
-      api_map = self.new #(Solargraph::Workspace.new(directory))
+      api_map = self.new
       workspace = Solargraph::Workspace.new(directory)
       api_map.catalog Bundle.new(workspace: workspace)
       api_map
@@ -220,13 +223,11 @@ module Solargraph
       return qualify(context) if namespace == 'self'
       cached = cache.get_qualified_namespace(namespace, context)
       return cached.clone unless cached.nil?
-      # result = inner_qualify(namespace, context, [])
-      # result = result[2..-1] if !result.nil? && result.start_with?('::')
-      if namespace.start_with?('::')
-        result = inner_qualify(namespace[2..-1], '', [])
-      else
-        result = inner_qualify(namespace, context, [])
-      end
+      result = if namespace.start_with?('::')
+                 inner_qualify(namespace[2..-1], '', [])
+               else
+                 inner_qualify(namespace, context, [])
+               end
       cache.set_qualified_namespace(namespace, context, result)
       result
     end
@@ -296,8 +297,9 @@ module Solargraph
       #   exist = result.map(&:name)
       #   result.concat live.reject{|p| exist.include?(p.name)}
       # end
-      cache.set_methods(fqns, scope, visibility, deep, result)
-      result
+      resolved = resolve_method_aliases(result)
+      cache.set_methods(fqns, scope, visibility, deep, resolved)
+      resolved
     end
 
     # Get an array of method pins for a complex type.
@@ -371,7 +373,7 @@ module Solargraph
       #   lp = live_map.get_path_pin(path)
       #   result.push lp unless lp.nil?
       # end
-      result
+      resolve_method_aliases(result)
     end
 
     # Get an array of pins that match the specified path.
@@ -461,6 +463,7 @@ module Solargraph
 
     private
 
+    # @return [YardMap]
     def yard_map
       @yard_map ||= YardMap.new
     end
@@ -469,23 +472,17 @@ module Solargraph
     #
     # @return [Hash{String => SourceMap}]
     def source_map_hash
-      @mutex.synchronize {
-        @source_map_hash
-      }
+      @mutex.synchronize { @source_map_hash }
     end
 
     # @return [ApiMap::Store]
     def store
-      @mutex.synchronize {
-        @store
-      }
+      @mutex.synchronize { @store }
     end
 
     # @return [Solargraph::ApiMap::Cache]
     def cache
-      @mutex.synchronize {
-        @cache
-      }
+      @mutex.synchronize { @cache }
     end
 
     # @param fqns [String] A fully qualified namespace
@@ -558,7 +555,7 @@ module Solargraph
     # @return [void]
     def require_extensions
       Gem::Specification.all_names.select{|n| n.match(/^solargraph\-[a-z0-9_\-]*?\-ext\-[0-9\.]*$/)}.each do |n|
-        STDERR.puts "Loading extension #{n}"
+        Solargraph::Logging.logger.info "Loading extension #{n}"
         require n.match(/^(solargraph\-[a-z0-9_\-]*?\-ext)\-[0-9\.]*$/)[1]
       end
     end
@@ -583,9 +580,8 @@ module Solargraph
           return inner_qualify(root, '', skip)
         end
       else
-        if (root == '')
+        if root == ''
           return name if store.namespace_exists?(name)
-          # @todo What to do about the @namespace_includes stuff above?
         else
           roots = root.to_s.split('::')
           while roots.length > 0
@@ -642,18 +638,15 @@ module Solargraph
       false
     end
 
-    # @return [void]
-    def resolve_method_aliases
-      aliased = false
-      result = pins.map do |pin|
-        next pin unless pin.is_a?(Pin::MethodAlias)
-        origin = get_method_stack(pin.namespace, pin.original, scope: pin.scope).select{|pin| pin.class == Pin::Method}.first
+    # @param pins [Array<Pin::Base>]
+    # @return [Array<Pin::Base>]
+    def resolve_method_aliases pins
+      pins.map do |pin|
+        next pin unless pin.kind == Pin::METHOD_ALIAS
+        origin = get_method_stack(pin.namespace, pin.original, scope: pin.scope).select{|pin| pin.is_a?(Pin::BaseMethod)}.first
         next pin if origin.nil?
-        aliased = true
         Pin::Method.new(pin.location, pin.namespace, pin.name, origin.comments, origin.scope, origin.visibility, origin.parameters)
       end
-      return nil unless aliased
-      @mutex.synchronize { @store = Store.new(result) }
     end
   end
 end

data/lib/solargraph/api_map/store.rb

@@ -26,8 +26,9 @@ module Solargraph
       # @param visibility [Array<Symbol>]
       # @return [Array<Solargraph::Pin::Base>]
       def get_methods fqns, scope: :instance, visibility: [:public]
+        kinds = [Pin::METHOD, Pin::ATTRIBUTE]
         namespace_children(fqns).select{ |pin|
-          [Pin::METHOD, Pin::ATTRIBUTE].include?(pin.kind) && pin.scope == scope && visibility.include?(pin.visibility)
+          kinds.include?(pin.kind) && pin.scope == scope && visibility.include?(pin.visibility)
         }
       end
 
@@ -120,6 +121,11 @@ module Solargraph
         end
       end
 
+      def inspect
+        # Avoid insane dumps in specs
+        to_s
+      end
+
       private
 
       # @param fqns [String]

data/lib/solargraph/diagnostics/require_not_found.rb

@@ -5,9 +5,10 @@ module Solargraph
     #
     class RequireNotFound < Base
       def diagnose source, api_map
+        return [] unless source.parsed? && source.synchronized?
         result = []
         refs = {}
-        map = Solargraph::SourceMap.map(source)
+        map = api_map.source_map(source.filename)
         map.requires.each do |ref|
           refs[ref.name] = ref
         end

data/lib/solargraph/language_server/host.rb

@@ -11,9 +11,11 @@ module Solargraph
       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'
 
-      include Solargraph::LanguageServer::UriHelpers
+      include UriHelpers
       include Logging
+      include Dispatch
 
       def initialize
         @cancel_semaphore = Mutex.new
@@ -21,12 +23,23 @@ module Solargraph
         @register_semaphore = Mutex.new
         @cancel = []
         @buffer = ''
-        @stopped = false
+        @stopped = true
         @next_request_id = 0
         @dynamic_capabilities = Set.new
         @registered_capabilities = Set.new
       end
 
+      # Start asynchronous process handling.
+      #
+      # @return [void]
+      def start
+        return unless stopped?
+        @stopped = false
+        diagnoser.start
+        cataloger.start
+        sources.start
+      end
+
       # Update the configuration options with the provided hash.
       #
       # @param update [Hash]
@@ -62,6 +75,7 @@ module Solargraph
       # Delete the specified ID from the list of cancelled IDs if it exists.
       #
       # @param id [Integer]
+      # @return [void]
       def clear id
         @cancel_semaphore.synchronize { @cancel.delete id }
       end
@@ -71,7 +85,7 @@ module Solargraph
       #
       # @param request [Hash] The contents of the message.
       # @return [Solargraph::LanguageServer::Message::Base] The message handler.
-      def start request
+      def receive request
         if request['method']
           logger.info "Server received #{request['method']}"
           logger.debug request
@@ -79,8 +93,8 @@ module Solargraph
           begin
             message.process
           rescue Exception => e
-            STDERR.puts e.message
-            STDERR.puts e.backtrace
+            logger.warn "Error processing request: [#{e.class}] #{e.message}"
+            logger.warn e.backtrace
             message.set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}"
           end
           message
@@ -89,7 +103,8 @@ module Solargraph
           requests[request['id']].process(request['result'])
           requests.delete request['id']
         else
-          STDERR.puts "Invalid message received."
+          logger.warn "Invalid message received."
+          logger.debug request
         end
       end
 
@@ -112,11 +127,13 @@ module Solargraph
       # Delete the specified file from the library.
       #
       # @param uri [String] The file uri.
+      # @return [void]
       def delete uri
         sources.close uri
         filename = uri_to_file(uri)
         libraries.each do |lib|
-          lib.delete filename
+          # lib.delete filename
+          lib.detach filename
         end
         send_notification "textDocument/publishDiagnostics", {
           uri: uri,
@@ -129,6 +146,7 @@ module Solargraph
       # @param uri [String] The file uri.
       # @param text [String] The contents of the file.
       # @param version [Integer] A version number.
+      # @return [void]
       def open uri, text, version
         src = sources.open(uri, text, version)
         libraries.each do |lib|
@@ -167,6 +185,7 @@ module Solargraph
         if sources.include?(uri)
           logger.info "Diagnosing #{uri}"
           library = library_for(uri)
+          library.catalog
           begin
             results = library.diagnose uri_to_file(uri)
             send_notification "textDocument/publishDiagnostics", {
@@ -196,11 +215,7 @@ module Solargraph
       # @return [void]
       def change params
         updater = generate_updater(params)
-        src = sources.update(params['textDocument']['uri'], updater)
-        libraries.each do |lib|
-          lib.merge src
-        end
-        diagnoser.schedule params['textDocument']['uri']
+        sources.async_update params['textDocument']['uri'], updater
       end
 
       # Queue a message to be sent to the client.
@@ -238,16 +253,13 @@ module Solargraph
         path = normalize_separators(directory) unless directory.nil?
         begin
           lib = Solargraph::Library.load(path, name)
+          libraries.push lib
         rescue WorkspaceTooLargeError => e
           send_notification 'window/showMessage', {
             'type' => Solargraph::LanguageServer::MessageTypes::WARNING,
             'message' => e.message
           }
-          lib = Solargraph::Library.new('', name)
         end
-        libraries.push lib
-        diagnoser.start
-        cataloger.start
       end
 
       # Prepare multiple folders.
@@ -400,9 +412,11 @@ module Solargraph
 
       # @return [void]
       def stop
+        return if @stopped
         @stopped = true
         cataloger.stop
         diagnoser.stop
+        sources.stop
       end
 
       def stopped?
@@ -576,80 +590,17 @@ module Solargraph
         }
       end
 
-      # Catalog the library.
-      #
-      # @return [void]
-      def catalog lib
-        lib.catalog
-      end
-
       # @param uri [String]
       # @return [Array<Range>]
       def folding_ranges uri
-        library = library_for(uri)
-        file = uri_to_file(uri)
-        library.folding_ranges(file)
+        # library = library_for(uri)
+        # file = uri_to_file(uri)
+        # library.folding_ranges(file)
+        sources.find(uri).folding_ranges
       end
 
       private
 
-      # @return [Array<Library>]
-      def libraries
-        @libraries ||= []
-      end
-
-      # @return [Sources]
-      def sources
-        @sources ||= Sources.new
-      end
-
-      # @param uri [String]
-      # @return [Library]
-      def library_for uri
-        explicit_library_for(uri) ||
-          implicit_library_for(uri) ||
-          generic_library_for(uri)
-      end
-
-      # @param uri [String]
-      # @return [Library, nil]
-      def explicit_library_for uri
-        filename = uri_to_file(uri)
-        libraries.each do |lib|
-          if lib.contain?(filename) #|| lib.open?(filename)
-            lib.attach sources.find(uri) if sources.include?(uri)
-            return lib
-          end
-        end
-        nil
-      end
-
-      # @param uri [String]
-      # @return [Library, nil]
-      def implicit_library_for uri
-        filename = uri_to_file(uri)
-        libraries.each do |lib|
-          # return lib if filename.start_with?(lib.workspace.directory)
-          if lib.open?(filename) || filename.start_with?(lib.workspace.directory)
-            lib.attach sources.find(uri)
-            return lib
-          end
-        end
-        nil
-      end
-
-      # @param uri [String]
-      # @return [Library]
-      def generic_library_for uri
-        generic_library.attach sources.find(uri)
-        generic_library
-      end
-
-      # @return [Library]
-      def generic_library
-        @generic_library ||= Solargraph::Library.new
-      end
-
       # @return [Diagnoser]
       def diagnoser
         @diagnoser ||= Diagnoser.new(self)