solargraph 0.38.3 → 0.38.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b938f9be15a1bf0d05152f83b00bb4b04018b37b3da1ab921963f57d7a837484
-  data.tar.gz: 8dc52f3e77661d53fd107610e33441f94cab71c4529e47559cbcb055bf04fddd
+  metadata.gz: fee6de28dda75ac732866b6ca8e68f52d3b5c4216feac100cbe3196280059f34
+  data.tar.gz: f8f51dc88c5aff911673a186d2c7ddb60a9e31cd084318741f2cae237091607a
 SHA512:
-  metadata.gz: b5d48c9e67760aca62df62495ce1ad372327f556462498e7aaf9149eabc047be796a8c59dd5ea2874aa88827fcc204059f18f74f32ed4ed4912e49c7986ae783
-  data.tar.gz: 27fa823a0b024ee78aafbfc69d6ea555351155bf6a963abcd9f94a1d15e79ca630f5b32cb0acfe97192e5ef0e0d8d730d34f4bcd9091cb91c699f8684930554e
+  metadata.gz: 78f433fe6a05b703945d53f74ef2b19c24e23c1aca77fcc71c0c6a88499e6c7900e275cdc43913cd51ff3a3fda7785885ece07e68daa18c7eae1f705dc990974
+  data.tar.gz: 313f01cdc3336c46a1ff6659c84b393192f0b7fab112ae479285f4e7a4b0866da61e47bbb8c2e41638beb931a92e408e2a285d841071a47f006ca16281d3a16c

data/Gemfile

@@ -5,5 +5,3 @@ gemspec name: 'solargraph'
 # Local gemfile for development tools, etc.
 local_gemfile = File.expand_path(".Gemfile", __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile
-
-gem 'readapt', '~> 1.0'

data/lib/solargraph/api_map.rb

@@ -121,7 +121,7 @@ module Solargraph
       pins.concat implicit.overrides
       br = reqs.include?('bundler/require') ? require_from_bundle(bundle.workspace.directory) : {}
       reqs.merge br.keys
-      yard_map.change(reqs.to_a, br)
+      yard_map.change(reqs.to_a, br, bundle.workspace.gemnames)
       new_store = Store.new(pins + yard_map.pins)
       @mutex.synchronize {
         @cache.clear

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

@@ -45,7 +45,7 @@ module Solargraph
               if this_link && this_link != last_link && this_link != 'undefined'
                 result.push this_link
               end
-              result.push pin.documentation
+              result.push pin.documentation unless result.last && result.last.end_with?(pin.documentation)
               last_link = this_link
             end
             result.join("\n\n")

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

@@ -19,7 +19,11 @@ module Solargraph
               end
               parts.push pin.detail.gsub(':', '\\:') unless pin.is_a?(Pin::Namespace) || pin.detail.nil?
               parts.push pin.documentation unless pin.documentation.nil? || pin.documentation.empty?
-              contents.push parts.join("\n\n") unless parts.empty?
+              unless parts.empty?
+                data = parts.join("\n\n")
+                next if contents.last && contents.last.end_with?(data)
+                contents.push data
+              end
               last_link = this_link unless this_link.nil?
             end
             set_result(

data/lib/solargraph/source/chain.rb

@@ -23,8 +23,6 @@ module Solargraph
 
       @@inference_stack = []
       @@inference_depth = 0
-      @@last_api_map = nil
-      @@pin_cache = {}
 
       UNDEFINED_CALL = Chain::Call.new('<undefined>')
       UNDEFINED_CONSTANT = Chain::Constant.new('<undefined>')
@@ -123,9 +121,7 @@ module Solargraph
             # Avoid infinite recursion
             next if @@inference_stack.include?(pin)
             @@inference_stack.push pin
-            # puts "    Inferring #{pin.class} | #{pin.path} | #{pin.name} | #{pin.location ? pin.location.to_hash : pin.location}"
-            # type = pin.probe(api_map)
-            type = remember_or_probe(pin, api_map)
+            type = pin.probe(api_map)
             @@inference_stack.pop
             break if type.defined?
           end
@@ -163,12 +159,6 @@ module Solargraph
           end
         end
       end
-
-      def remember_or_probe pin, api_map
-        @@pin_cache.clear if @@last_api_map != api_map
-        @@last_api_map = api_map
-        @@pin_cache[pin] ||= pin.probe(api_map)
-      end
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Solargraph
         # @param type [String]
         def initialize type
           @type = type
-          @complex_type = ComplexType.try_parse(type).first
+          @complex_type = ComplexType.try_parse(type)
         end
 
         def resolve api_map, name_pin, locals

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -11,12 +11,22 @@ module Solargraph
     # @return [String]
     attr_reader :directory
 
+    # The require paths associated with the workspace.
+    #
+    # @return [Array<String>]
+    attr_reader :require_paths
+
+    # @return [Array<String>]
+    attr_reader :gemnames
+
     # @param directory [String]
     # @param config [Config, nil]
     def initialize directory = '', config = nil
       @directory = directory
       @config = config
       load_sources
+      @gemnames = []
+      @require_paths = generate_require_paths
     end
 
     # @return [Solargraph::Workspace::Config]
@@ -85,13 +95,6 @@ module Solargraph
       source_hash[filename]
     end
 
-    # The require paths associated with the workspace.
-    #
-    # @return [Array<String>]
-    def require_paths
-      @require_paths ||= generate_require_paths
-    end
-
     # True if the path resolves to a file in the workspace's require paths.
     #
     # @param path [String]
@@ -164,6 +167,7 @@ module Solargraph
             # @type [Gem::Specification]
             spec = eval(File.read(file), binding, file)
             next unless Gem::Specification === spec
+            @gemnames.push spec.name
             result.concat(spec.require_paths.map { |path| File.join(base, path) })
           rescue Exception => e
             # Don't die if we have an error during eval-ing a gem spec.

data/lib/solargraph/yard_map.rb

@@ -50,6 +50,7 @@ module Solargraph
       @gem_paths = {}
       @stdlib_namespaces = []
       @gemset = gemset
+      @source_gems = []
       process_requires
       yardocs.uniq!
     end
@@ -67,13 +68,14 @@ module Solargraph
     # @param new_requires [Array<String>]
     # @param new_gemset [Hash{String => String}]
     # @return [Boolean]
-    def change new_requires, new_gemset
-      if new_requires.uniq.sort == required.uniq.sort && new_gemset == gemset
+    def change new_requires, new_gemset, source_gems = []
+      if new_requires.uniq.sort == required.uniq.sort && new_gemset == gemset && @source_gems.uniq.sort == source_gems.uniq.sort
         false
       else
         required.clear
         required.concat new_requires
         @gemset = new_gemset
+        @source_gems = source_gems
         process_requires
         true
       end
@@ -181,6 +183,10 @@ module Solargraph
         result = []
         begin
           spec = spec_for_require(r)
+          if @source_gems.include?(spec.name)
+            next
+          end
+          next if @gem_paths.key?(spec.name)
           yd = yardoc_file_for_spec(spec)
           # YARD detects gems for certain libraries that do not have a yardoc
           # but exist in the stdlib. `fileutils` is an example. Treat those
@@ -252,6 +258,9 @@ module Solargraph
       result = []
       (spec.dependencies - spec.development_dependencies).each do |dep|
         begin
+          if @source_gems.include?(dep.name)
+            next
+          end
           depspec = Gem::Specification.find_by_name(dep.name)
           next if depspec.nil? || @gem_paths.key?(depspec.name)
           @gem_paths[depspec.name] = depspec.full_gem_path
@@ -304,7 +313,10 @@ module Solargraph
     # @return [Gem::Specification]
     def spec_for_require path
       spec = Gem::Specification.find_by_path(path) || Gem::Specification.find_by_name(path.split('/').first)
-      if @gemset[spec.name]
+      # Avoid loading the spec again if it's going to be skipped anyway
+      return spec if @source_gems.include?(spec.name)
+      # Avoid loading the spec again if it's alredy the correct version
+      if @gemset[spec.name] && @gemset[spec.name] != spec.version
         begin
           return Gem::Specification.find_by_name(spec.name, "= #{@gemset[spec.name]}")
         rescue Gem::LoadError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.38.3
+  version: 0.38.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport