Add lib to LOAD_PATH instead of using require_relative (#1140)

Shopify · Oct 26, 2023 · 943f76e · 943f76e
1 parent 4e80438
commit 943f76e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,4 +44,4 @@ jobs:
         run: bundle exec rake
 
       - name: Run index troubleshooting tool
-        run: ./exe/ruby-lsp-doctor
+        run: bundle exec ruby-lsp-doctor
diff --git a/exe/ruby-lsp b/exe/ruby-lsp
@@ -85,7 +85,8 @@ rescue
   nil
 end
 
-require_relative "../lib/ruby_lsp/internal"
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
+require "ruby_lsp/internal"
 
 if options[:debug]
   if ["x64-mingw-ucrt", "x64-mingw32"].include?(RUBY_PLATFORM)

diff --git a/exe/ruby-lsp-check b/exe/ruby-lsp-check
@@ -14,7 +14,8 @@ rescue
   nil
 end
 
-require_relative "../lib/ruby_lsp/internal"
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
+require "ruby_lsp/internal"
 
 RubyLsp::Addon.load_addons
 

diff --git a/exe/ruby-lsp-doctor b/exe/ruby-lsp-doctor
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
-
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 require "ruby_lsp/internal"
 
 index = RubyIndexer::Index.new