ruby-lsp 0.27.0.beta1 → 0.27.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5c88483f280d13f2691e131a16e35df07df898e8f380071d077479cd24133e
-  data.tar.gz: 7630ce8844fcb532ca63c77e299b692471b145530a623dcbc78ecbb50ce08596
+  metadata.gz: b3bc7e833f5619665b205e3346555594540a1150cf4a66514ed1fe6900fc8d0e
+  data.tar.gz: c7cf77eed53ba29b680221474abffd5356f723dd4bb2bd586b8158c5b3794dba
 SHA512:
-  metadata.gz: 7757882e6e441d49705a389bad6b0b617b7f9a26fb1e5f34ebd3fc93eeb8921b31a703253cff79ed123ae411333fc7d91f0555ae162cafee1d10adfb13b76cf4
-  data.tar.gz: c215743ab00113e4dd3186732faabd462fef6a3be425f1c76bb65b045846effd7db0673478244218f1087e3fa9ca96f8668c86970def65bf2e5fbb4ea0728a8d
+  metadata.gz: 3b265bbdf75bd46df7acc181a9d77aced50b403b5efa21dc7c22eeda92b5b0319b5d1ac21a279d2c436c5126026c3f643760974c57d26bbbcc32ca69fba5b9bc
+  data.tar.gz: ee7b8e028a2a38e301ec14c33c2a7c6f292e89f1c850a935b26dce19bc4a10f15915a07c2dea8f8e32839acd3018f7613e698a06d6e908b3334d38cccddd47de

data/VERSION

@@ -1 +1 @@
-0.27.0.beta1
+0.27.0.beta3

data/exe/ruby-lsp

@@ -17,14 +17,6 @@ parser = OptionParser.new do |opts|
     options[:debug] = true
   end
 
-  opts.on("--time-index", "Measure the time it takes to index the project") do
-    options[:time_index] = true
-  end
-
-  opts.on("--doctor", "Run troubleshooting steps") do
-    options[:doctor] = true
-  end
-
   opts.on("--use-launcher", "[EXPERIMENTAL] Use launcher mechanism to handle missing dependencies gracefully") do
     options[:launcher] = true
   end
@@ -110,44 +102,6 @@ if options[:debug]
   end
 end
 
-if options[:time_index]
-  index = RubyIndexer::Index.new
-
-  time_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-  index.index_all
-  elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - time_start
-
-  entries = index.instance_variable_get(:@entries)
-  entries_by_entry_type = entries.values.flatten.group_by(&:class)
-
-  puts <<~MSG
-    Ruby LSP v#{RubyLsp::VERSION}: Indexing took #{elapsed_time.round(5)} seconds and generated:
-    - #{entries_by_entry_type.sort_by { |k, _| k.to_s }.map { |k, v| "#{k.name.split("::").last}: #{v.size}" }.join("\n- ")}
-  MSG
-  return
-end
-
-if options[:doctor]
-  index = RubyIndexer::Index.new
-
-  if File.exist?(".index.yml")
-    begin
-      config = YAML.parse_file(".index.yml").to_ruby
-    rescue => e
-      abort("Error parsing config: #{e.message}")
-    end
-    index.configuration.apply_config(config)
-  end
-
-  puts "Globbing for indexable files"
-
-  index.configuration.indexable_uris.each do |uri|
-    puts "indexing: #{uri}"
-    index.index_file(uri)
-  end
-  return
-end
-
 server = RubyLsp::Server.new
 
 # Ensure all output goes out stderr by default to allow puts/p/pp to work

data/exe/ruby-lsp-check

@@ -36,21 +36,6 @@ ensure
 end
 puts "\n"
 
-# Indexing
-puts "Verifying that indexing executes successfully. This may take a while..."
-
-index = RubyIndexer::Index.new
-uris = index.configuration.indexable_uris
-
-uris.each_with_index do |uri, i|
-  index.index_file(uri)
-rescue => e
-  errors[uri.full_path] = e
-ensure
-  print("\033[M\033[0KIndexed #{i + 1}/#{uris.length}") unless ENV["CI"]
-end
-puts "\n"
-
 if errors.empty?
   puts "All operations completed successfully!"
   exit

data/lib/ruby_lsp/addon.rb

@@ -56,26 +56,9 @@ module RubyLsp
         addon_files = Gem.find_files("ruby_lsp/**/addon.rb")
 
         if include_project_addons
-          project_addons = Dir.glob("#{global_state.workspace_path}/**/ruby_lsp/**/addon.rb")
           bundle_path = Bundler.bundle_path.to_s
-          gems_dir = Bundler.bundle_path.join("gems")
-
-          # Create an array of rejection glob patterns to ignore add-ons already discovered through Gem.find_files if
-          # they are also copied inside the workspace for whatever reason. We received reports of projects having gems
-          # installed in vendor/bundle despite BUNDLE_PATH pointing elsewhere. Without this mechanism, we will
-          # double-require the same add-on, potentially for different versions of the same gem, which leads to incorrect
-          # behavior
-          reject_glob_patterns = addon_files.map do |path|
-            relative_gem_path = Pathname.new(path).relative_path_from(gems_dir)
-            first_part, *parts = relative_gem_path.to_s.split(File::SEPARATOR)
-            first_part&.gsub!(/-([0-9.]+)$/, "*")
-            "**/#{first_part}/#{parts.join("/")}"
-          end
-
-          project_addons.reject! do |path|
-            path.start_with?(bundle_path) ||
-              reject_glob_patterns.any? { |pattern| File.fnmatch?(pattern, path, File::Constants::FNM_PATHNAME) }
-          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) }
 
           addon_files.concat(project_addons)
         end
@@ -162,6 +145,23 @@ module RubyLsp
             "Add-on is not compatible with this version of the Ruby LSP. Skipping its activation"
         end
       end
+
+      private
+
+      # Checks if a path appears to be inside a versioned gem installation directory (e.g., `rubocop-1.73.0/lib/...`) by
+      # looking for a directory segment matching `name-version` before the `lib` component
+      #
+      #: (String path) -> bool
+      def gem_installation_path?(path)
+        parts = path.split(%r{[/\\]})
+        lib_index = parts.rindex("lib")
+        return false unless lib_index
+
+        prefix = parts[0...lib_index] #: Array[String]?
+        return false unless prefix
+
+        prefix.any? { |part| part.match?(/-\d+(\.\d+)+$/) }
+      end
     end
 
     #: -> void

data/lib/ruby_lsp/global_state.rb

@@ -27,9 +27,6 @@ module RubyLsp
     #: bool
     attr_reader :has_type_checker
 
-    #: RubyIndexer::Index
-    attr_reader :index
-
     #: Rubydex::Graph
     attr_reader :graph
 
@@ -60,7 +57,6 @@ module RubyLsp
       @linters = [] #: Array[String]
       @test_library = "minitest" #: String
       @has_type_checker = true #: bool
-      @index = RubyIndexer::Index.new #: RubyIndexer::Index
       @graph = Rubydex::Graph.new #: Rubydex::Graph
       @supported_formatters = {} #: Hash[String, Requests::Support::Formatter]
       @type_inferrer = TypeInferrer.new(@graph) #: TypeInferrer
@@ -204,9 +200,8 @@ module RubyLsp
         Encoding::UTF_16LE
       else
         @graph.encoding = "utf32"
-        Encoding::UTF_32
+        Encoding::UTF_32LE
       end
-      @index.configuration.encoding = @encoding
 
       @client_capabilities.apply_client_capabilities(options[:capabilities]) if options[:capabilities]
 

data/lib/ruby_lsp/internal.rb

@@ -32,14 +32,15 @@ require "shellwords"
 require "set"
 
 # Rubydex LSP additions
+require "ruby_lsp/rubydex/declaration"
 require "ruby_lsp/rubydex/definition"
 require "ruby_lsp/rubydex/reference"
+require "ruby_lsp/rubydex/signature"
 
 require "ruby-lsp"
 require "ruby_lsp/base_server"
-require "ruby_indexer/ruby_indexer"
+require "ruby_lsp/uri"
 require "ruby_lsp/utils"
-require "ruby_lsp/static_docs"
 require "ruby_lsp/scope"
 require "ruby_lsp/client_capabilities"
 require "ruby_lsp/global_state"

data/lib/ruby_lsp/listeners/code_lens.rb

@@ -279,7 +279,7 @@ module RubyLsp
         when Prism::StringNode
           first_argument.content
         when Prism::ConstantReadNode, Prism::ConstantPathNode
-          RubyIndexer::Index.constant_name(first_argument)
+          constant_name(first_argument)
         end
 
         return unless name