solargraph 0.41.0 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed08215481576c83b9ff5014648c0fa5fe7e458eb59eabcf86632496e4a9f32
-  data.tar.gz: 8f036f65304ecf1401504a84a49bc34ed6d9be97308be8a1e080be884af100fc
+  metadata.gz: 821bc3321cdaf8fd3a707fbf5c04545fadde37dbb4ce177c0f64cfc2330dd2f2
+  data.tar.gz: 29bfda592a11968558178117ac849e1dbc7bf02c5685740a79682e911cadadf4
 SHA512:
-  metadata.gz: '024920c42f1f1e37f604b616481bca07b91ec52ed9fd315e6e12a6cc0ab7c0a88ef9ecd827866ab52d66d2f43b679a97c68d3877b88adc5092fc9c2dc2dca5a1'
-  data.tar.gz: 02c6de30fdac85feedbee8e8b3cbd35ea846a9cbb3a5cb8c476053208a63ae5781a45382fcca43e760875f3f5f911675bdec3f8ba318b122ef6ea0c42f735a29
+  metadata.gz: 0c1c06c2996704646df0c140b47e5109bfd6f70ba7504e7021fec26c1b6c8416cb099f4d23654b06959ccf268f2d213f65c2d586a2aae7b3ba6e6479d1f83bfb
+  data.tar.gz: '09f816e9bc2d8aed6e95f414e9859a32996f8b989d41e06519afdd2be72cffe6409c9502e9a57594c9d587fda187a2b218b0bdd46027a0d11e044d4320284842'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.41.1 - May 31, 2021
+- ApiMap handles required bundles (#443)
+
 ## 0.41.0 - May 30, 2021
 - Chain constant at last double colon with more than two nested namespaces
 - Fill Integer#times return type (#440)

data/lib/solargraph/api_map.rb

@@ -80,7 +80,7 @@ module Solargraph
           external_requires.push req unless result
         end
       end
-      br = @required.include?('bundler/require') ? bench.gemnames.to_h { |gs| [gs.name, gs] } : {}
+      br = @required.include?('bundler/require') ? require_from_bundle(bench.directory) : {}
       @required.merge br.keys
       yard_map.change(external_requires, br, bench.gemnames)
       @store = Store.new(yard_map.pins + implicit.pins + pins)

data/lib/solargraph/bench.rb

@@ -15,13 +15,17 @@ module Solargraph
     # @return [Set<String>]
     attr_reader :gemnames
 
+    # @return [String]
+    attr_reader :directory
+
     # @param source_maps [Array<SourceMap>, Set<SourceMap>]
     # @param load_paths [Array<String>, Set<String>]
     # @param gemnames [Array<String>, Set<String>]
-    def initialize source_maps: [], load_paths: [], gemnames: []
+    def initialize source_maps: [], load_paths: [], gemnames: [], directory: ''
       @source_maps = source_maps.to_set
       @load_paths = load_paths.to_set
       @gemnames = gemnames.to_set
+      @directory = directory
     end
   end
 end

data/lib/solargraph/library.rb

@@ -366,7 +366,8 @@ module Solargraph
       Bench.new(
         source_maps: source_maps,
         load_paths: workspace.require_paths,
-        gemnames: workspace.gemnames
+        gemnames: workspace.gemnames,
+        directory: workspace.directory
       )
     end
 

data/lib/solargraph/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.41.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport