solargraph 0.33.1 → 0.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c8b3e2034dbbcdaafda5c6f9183261078f9f91902ef1c0fd6b8381de923119d
-  data.tar.gz: 520d5c332a8f6077b8aabefbf5ffa27a40c2d6472dd82e512cd84bccd739944f
+  metadata.gz: 32fec2551136daaa8c608f7fe94fec4ef24e08ba03723b2ece3e4c8b66342c5b
+  data.tar.gz: edaa58070c532e97dd1b0ac2e43b7917e08ceb972d19c43f26eba7b9fc62cf5a
 SHA512:
-  metadata.gz: f967c5c5ae37b8c10417b953af1f663c3b6576602519990f32c5f43864d7318b86c5af14e0eabad85b6eba55147a722b7d4a178aab043e8ef8792c04aee77881
-  data.tar.gz: f6d7d2a0563226bfde47f077a0ac856bbc9fb24271c4bcd723a55901ca85cc547e9ce2fa4a128042d1d4f37346078aeb29d6c7fe92a3db1b0f7c7cf7d4faa6f7
+  metadata.gz: 46b6981ae2a47c4676a78fdb50ac01f46d70cc37b3f762b9c35936dd13b2cd529fca0ed6d9057bd3106164145967560f50d1836848c395d4d90b953facb48f27
+  data.tar.gz: c6f70f39fded5af0e588f6792c9dba1872c421fc62993e16e1f734fe828d36e5f287309368fb09b1a7130d9bd7f0aa87a9ac7e9bef8e0de9309247985bc67c9f

data/lib/solargraph/language_server/host.rb

@@ -159,8 +159,9 @@ module Solargraph
       # @param uri [String]
       # @return [void]
       def open_from_disk uri
+        sources.open_from_disk(uri)
         library = library_for(uri)
-        library.open_from_disk uri_to_file(uri)
+        # library.open_from_disk uri_to_file(uri)
         diagnoser.schedule uri
       end
 

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

@@ -36,9 +36,11 @@ module Solargraph
         # @param uri [String]
         # @return [Library]
         def library_for uri
-          explicit_library_for(uri) ||
+          result = explicit_library_for(uri) ||
             implicit_library_for(uri) ||
             generic_library_for(uri)
+          result.attach sources.find(uri) if sources.include?(uri)
+          result
         end
 
         # Find an explicit library match for the given URI. An explicit match

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

@@ -59,6 +59,11 @@ module Solargraph
           open_source_hash[uri] = source
         end
 
+        def open_from_disk uri
+          source = Solargraph::Source.load(UriHelpers.uri_to_file(uri))
+          open_source_hash[uri] = source
+        end
+    
         # Update an existing source.
         #
         # @raise [FileNotFoundError] if the URI does not match an open source.

data/lib/solargraph/language_server/message/completion_item/resolve.rb

@@ -18,10 +18,10 @@ module Solargraph
             return params if pins.empty?
             docs = pins
                    .reject { |pin| pin.documentation.empty? && pin.return_type.undefined? }
-                   .map { |pin| pin.resolve_completion_item[:documentation] }
+            # docs = filt.map { |pin| pin.resolve_completion_item[:documentation] }
             result = params
               .merge(pins.first.resolve_completion_item)
-              .merge(documentation: markup_content(docs.join("\n\n")))
+              .merge(documentation: markup_content(join_docs(docs)))
             result[:detail] = pins.first.detail
             result
           end
@@ -35,6 +35,19 @@ module Solargraph
               value: text
             }
           end
+
+          def join_docs pins
+            result = []
+            last_link = nil
+            pins.each_with_index do |pin|
+              if pin.link_documentation && pin.link_documentation != last_link
+                result.push pin.link_documentation
+              end
+              result.push pin.documentation
+              last_link = pin.link_documentation
+            end
+            result.join("\n\n")
+          end
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Solargraph
             suggestions.each do |pin|
               parts = []
               this_link = pin.link_documentation
-              if !this_link.nil? and this_link != last_link
+              if !this_link.nil? && this_link != last_link
                 parts.push this_link
               end
               parts.push HTMLEntities.new.encode(pin.detail) unless pin.kind == Solargraph::Pin::NAMESPACE or pin.detail.nil?

data/lib/solargraph/library.rb

@@ -10,6 +10,9 @@ module Solargraph
     # @return [String, nil]
     attr_reader :name
 
+    # @return [Source, nil]
+    attr_reader :current
+
     # @param workspace [Solargraph::Workspace]
     # @param name [String, nil]
     def initialize workspace = Solargraph::Workspace.new, name = nil
@@ -33,15 +36,6 @@ module Solargraph
       @synchronized
     end
 
-    # Open a file from disk and try to merge it into the workspace.
-    #
-    # @param filename [String]
-    # @return [Boolean] True if the file was merged into the source.
-    def open_from_disk filename
-      source = Solargraph::Source.load(filename)
-      merge source
-    end
-
     # Attach a source to the library.
     #
     # The attached source does not need to be a part of the workspace. The
@@ -54,6 +48,7 @@ module Solargraph
       mutex.synchronize do
         @synchronized = (@current == source) if synchronized?
         @current = source
+        catalog
       end
     end
 
@@ -159,7 +154,7 @@ module Solargraph
     # @todo Take a Location instead of filename/line/column
     def completions_at filename, line, column
       position = Position.new(line, column)
-      cursor = Source::Cursor.new(checkout(filename), position)
+      cursor = Source::Cursor.new(read(filename), position)
       api_map.clip(cursor).complete
     end
 
@@ -173,7 +168,7 @@ module Solargraph
     # @todo Take filename/position instead of filename/line/column
     def definitions_at filename, line, column
       position = Position.new(line, column)
-      cursor = Source::Cursor.new(checkout(filename), position)
+      cursor = Source::Cursor.new(read(filename), position)
       api_map.clip(cursor).define.map { |pin| pin.realize(api_map) }
     end
 
@@ -187,7 +182,7 @@ module Solargraph
     # @todo Take filename/position instead of filename/line/column
     def signatures_at filename, line, column
       position = Position.new(line, column)
-      cursor = Source::Cursor.new(checkout(filename), position)
+      cursor = Source::Cursor.new(read(filename), position)
       api_map.clip(cursor).signify
     end
 
@@ -198,7 +193,7 @@ module Solargraph
     # @return [Array<Solargraph::Range>]
     # @todo Take a Location instead of filename/line/column
     def references_from filename, line, column, strip: false
-      checkout filename
+      # checkout filename
       cursor = api_map.cursor_at(filename, Position.new(line, column))
       clip = api_map.clip(cursor)
       pins = clip.define
@@ -247,27 +242,6 @@ module Solargraph
       api_map.get_path_suggestions(path)
     end
 
-    # Check a file out of the library. If the file is not part of the
-    # workspace, the ApiMap will virtualize it for mapping purposes. If
-    # filename is nil, any source currently checked out of the library
-    # will be removed from the ApiMap. Only one file can be checked out
-    # (virtualized) at a time.
-    #
-    # @raise [FileNotFoundError] if the file does not exist.
-    #
-    # @param filename [String]
-    # @return [Source]
-    def checkout filename
-      checked = read(filename)
-      @synchronized = (checked == @current) if synchronized?
-      @current = checked
-      # Cataloging is necessary to avoid FileNotFoundErrors when the file is
-      # not in the workspace. Otherwise it should be safe to defer
-      # synchronization.
-      catalog unless workspace.has_file?(filename)
-      @current
-    end
-
     # @param query [String]
     # @return [Array<YARD::CodeObject::Base>]
     def document query
@@ -300,7 +274,7 @@ module Solargraph
     # @param filename [String]
     # @return [Array<Solargraph::Pin::Base>]
     def document_symbols filename
-      checkout filename
+      # checkout filename
       api_map.document_symbols(filename)
     end
 

data/lib/solargraph/pin/conversions.rb

@@ -22,8 +22,8 @@ module Solargraph
         if @resolve_completion_item.nil?
           extra = {}
           alldoc = ''
-          alldoc += link_documentation unless link_documentation.nil?
-          alldoc += "\n\n" unless alldoc.empty?
+          # alldoc += link_documentation unless link_documentation.nil?
+          # alldoc += "\n\n" unless alldoc.empty?
           alldoc += documentation unless documentation.nil?
           extra[:documentation] = alldoc unless alldoc.empty?
           @resolve_completion_item = completion_item.merge(extra)

data/lib/solargraph/pin/parameter.rb

@@ -37,6 +37,11 @@ module Solargraph
         tag.text
       end
 
+      def try_merge! pin
+        return false unless super && closure == pin.closure
+        true
+      end
+
       private
 
       # @return [YARD::Tags::Tag]

data/lib/solargraph/pin/proxy_type.rb

@@ -7,14 +7,6 @@ module Solargraph
         @return_type = return_type
       end
 
-      def path
-        @path ||= begin
-          result = namespace.to_s
-          result += '::' unless result.empty? or name.to_s.empty?
-          result += name.to_s
-        end
-      end
-
       def context
         @return_type
       end

data/lib/solargraph/source.rb

@@ -443,7 +443,7 @@ module Solargraph
     # @return [Array<AST::Node>]
     def inner_node_references name, top
       result = []
-      if top.is_a?(AST::Node)
+      if top.is_a?(AST::Node) && top.to_s.include?(":#{name}")
         result.push top if top.children.any? { |c| c.to_s == name }
         top.children.each { |c| result.concat inner_node_references(name, c) }
       end

data/lib/solargraph/source/chain.rb

@@ -18,6 +18,7 @@ module Solargraph
       autoload :Head,             'solargraph/source/chain/head'
       autoload :Or,               'solargraph/source/chain/or'
 
+      @@inference_stack = []
       @@inference_depth = 0
 
       UNDEFINED_CALL = Chain::Call.new('<undefined>')
@@ -94,19 +95,24 @@ module Solargraph
       # @return [ComplexType]
       def infer_first_defined pins, context, api_map
         type = ComplexType::UNDEFINED
-        return type if @@inference_depth >= 3
-        @@inference_depth += 1
         pins.each do |pin|
           type = pin.typify(api_map)
           break if type.defined?
         end
         if type.undefined?
+          # Limit method inference recursion
+          return type if @@inference_depth >= 2 && pins.first.is_a?(Pin::BaseMethod)
+          @@inference_depth += 1
           pins.each do |pin|
+            # Avoid infinite recursion
+            next if @@inference_stack.include?(pin)
+            @@inference_stack.push pin
             type = pin.probe(api_map)
+            @@inference_stack.pop
             break if type.defined?
           end
+          @@inference_depth -= 1
         end
-        @@inference_depth -= 1
         return type if context.nil? || context.return_type.undefined?
         type.self_to(context.return_type.namespace)
       end

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

@@ -7,7 +7,7 @@ module Solargraph
       # @note Chain::Head is only intended to handle `self` and `super`.
       class Head < Link
         def resolve api_map, name_pin, locals
-          return [name_pin] if word == 'self'
+          return [Pin::ProxyType.anonymous(name_pin.binder)] if word == 'self'
           return super_pins(api_map, name_pin) if word == 'super'
           []
         end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.33.1'
+  VERSION = '0.33.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.33.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport