ruby-lsp 0.27.0.beta4 → 0.27.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1859a4f73bdc2007364195d5e2c8aae9f999455a7523ad290263efb0edab30
-  data.tar.gz: 63e9388bc11ef954ed197db00c166a900e0f422c346c48af7bc485ab51a630c8
+  metadata.gz: 903ebc45a5a04d0cfde014fbf4fabae2e15248854fe699c6688ee20e002f258e
+  data.tar.gz: 32504e78105cf4534fa484884ff78b18c3ae79dde72aa90e3680ff46f5aeff7f
 SHA512:
-  metadata.gz: cade33d50651fb915408b36b0537cb201c9b61ee0151e2ae6a8a1bee3099054af2a184e93b7790a0d283860159326f31d391c71bda798f00229262c4c58123f2
-  data.tar.gz: 01f24b527c33cc3d741fe682d79b70a0881760a9dc6d599101356563cbfce30ce0e719619312f530f42256b6ecb82ac2a40c93d6cde0ad97ef5e2a8087922d3d
+  metadata.gz: 675bf06a96321cffb530e47b4a2c228e77250ba839ea2bb1a5f2dee610e84375c24538474005043661541b80d1deb548d3eb3e6d0d35b3efbeb8766bc0c03706
+  data.tar.gz: f705dc96d46659fbdfd112703f08d8d83804cc34c51cc832e483f00303503efe287e44e534056df5601897284e16cfd167979a08b35c9cdbbe057fdae4169502

data/VERSION

@@ -1 +1 @@
-0.27.0.beta4
+0.27.0.beta5

data/lib/ruby_lsp/addon.rb

@@ -56,9 +56,16 @@ module RubyLsp
         addon_files = Gem.find_files("ruby_lsp/**/addon.rb")
 
         if include_project_addons
-          bundle_path = Bundler.bundle_path.to_s
+          bundle_path = begin
+            Bundler.bundle_path.to_s
+          rescue Bundler::GemfileNotFound
+            nil
+          end
+
           project_addons = Dir.glob("#{global_state.workspace_path}/**/ruby_lsp/**/addon.rb")
-          project_addons.reject! { |path| path.start_with?(bundle_path) || gem_installation_path?(path) }
+          project_addons.reject! do |path|
+            (bundle_path && path.start_with?(bundle_path)) || gem_installation_path?(path)
+          end
 
           addon_files.concat(project_addons)
         end

data/lib/ruby_lsp/global_state.rb

@@ -117,7 +117,6 @@ module RubyLsp
       all_dependencies = gather_direct_and_indirect_dependencies
       workspace_uri = options.dig(:workspaceFolders, 0, :uri)
       @workspace_uri = URI(workspace_uri) if workspace_uri
-      @graph.workspace_path = workspace_path
 
       specified_formatter = options.dig(:initializationOptions, :formatter)
       rubocop_has_addon = defined?(::RuboCop::Version::STRING) &&

data/lib/ruby_lsp/server.rb

@@ -1463,7 +1463,7 @@ module RubyLsp
 
     #: () -> void
     def load_rubydex_config
-      @global_state.graph.load_config
+      @global_state.graph.load_config(Rubydex::Config.load(@global_state.workspace_path))
     rescue Rubydex::ConfigError => e
       send_message(Notification.window_show_message(
         "Error loading rubydex config: #{e.message}",

data/lib/ruby_lsp/setup_bundler.rb

@@ -191,7 +191,11 @@ module RubyLsp
       end
 
       if @rails_app && !@dependencies["ruby-lsp-rails"]
-        parts << 'gem "ruby-lsp-rails", require: false, group: :development'
+        parts << if @beta
+          'gem "ruby-lsp-rails", ">= 0.a", require: false, group: :development'
+        else
+          'gem "ruby-lsp-rails", require: false, group: :development'
+        end
       end
 
       content = parts.join("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.27.0.beta4
+  version: 0.27.0.beta5
 platform: ruby
 authors:
 - Shopify
@@ -69,20 +69,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
 description: An opinionated language server for Ruby
 email:
 - ruby@shopify.com