ruby-lsp 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b197d35d03d1b5b78894bce8b03c6aa76be7586fc7034422415d0656ddea7a
-  data.tar.gz: 2fd148c0ab5d8b3ac55784722ab49a3be6b1b4885c8b284e8a6cf40c503b4066
+  metadata.gz: 906f8ef7ff4c3c0da126b61e41772b36989c93e391575099121c7a31184de81c
+  data.tar.gz: 67eb8cd92613348b9b2bf7163b458ed0ba7772e4c0304c01b80e3b0c4e8b34c7
 SHA512:
-  metadata.gz: 1994f1d014bc3f70ff96e90d5b3961c279166e5f58be6b38415ec1e2515b7557c6a00f4cde45ba3a66e0d9dd6c1402f7e4754c6f8addb6efb848ec7a65fbadc7
-  data.tar.gz: ffec2a6c5321eb159ea4d505f9b6c6dd56b64cb16d2f052666b9c15f406d59fa478d9e7f7c9734219874c3ca3bb8dcae9b2cbdd683576a3d74b523cf769298e4
+  metadata.gz: e6b28979f399686bf62943bb49036ed26411a11439120f8ddf52f7c86310ecc8964d32de8fffe98c12686021f8d2b019c49347de4ced546a1a2e4e1b47726bfd
+  data.tar.gz: 3339ddda6a9450cf4449a0336a38ec4bdd95b4d81e9b2aa834bfd87db11f3bb2d0caf02e5ad4d0366f040d4718046e36744750e46ef9638b78a4235f0dfad1b7

data/VERSION

@@ -1 +1 @@
-0.16.2
+0.16.3

data/lib/ruby_lsp/document.rb

@@ -20,13 +20,13 @@ module RubyLsp
     sig { returns(URI::Generic) }
     attr_reader :uri
 
-    sig { returns(String) }
+    sig { returns(Encoding) }
     attr_reader :encoding
 
-    sig { params(source: String, version: Integer, uri: URI::Generic, encoding: String).void }
-    def initialize(source:, version:, uri:, encoding: Constant::PositionEncodingKind::UTF8)
+    sig { params(source: String, version: Integer, uri: URI::Generic, encoding: Encoding).void }
+    def initialize(source:, version:, uri:, encoding: Encoding::UTF_8)
       @cache = T.let({}, T::Hash[String, T.untyped])
-      @encoding = T.let(encoding, String)
+      @encoding = T.let(encoding, Encoding)
       @source = T.let(source, String)
       @version = T.let(version, Integer)
       @uri = T.let(uri, URI::Generic)
@@ -187,7 +187,7 @@ module RubyLsp
       # After character 0xFFFF, UTF-16 considers characters to have length 2 and we have to account for that
       SURROGATE_PAIR_START = T.let(0xFFFF, Integer)
 
-      sig { params(source: String, encoding: String).void }
+      sig { params(source: String, encoding: Encoding).void }
       def initialize(source, encoding)
         @current_line = T.let(0, Integer)
         @pos = T.let(0, Integer)
@@ -209,7 +209,7 @@ module RubyLsp
         # need to adjust for surrogate pairs
         requested_position = @pos + position[:character]
 
-        if @encoding == Constant::PositionEncodingKind::UTF16
+        if @encoding == Encoding::UTF_16LE
           requested_position -= utf_16_character_position_correction(@pos, requested_position)
         end
 

data/lib/ruby_lsp/global_state.rb

@@ -17,9 +17,13 @@ module RubyLsp
     sig { returns(RubyIndexer::Index) }
     attr_reader :index
 
+    sig { returns(Encoding) }
+    attr_reader :encoding
+
     sig { void }
     def initialize
       @workspace_uri = T.let(URI::Generic.from_path(path: Dir.pwd), URI::Generic)
+      @encoding = T.let(Encoding::UTF_8, Encoding)
 
       @formatter = T.let("auto", String)
       @test_library = T.let(detect_test_library, String)
@@ -46,6 +50,17 @@ module RubyLsp
       specified_formatter = options.dig(:initializationOptions, :formatter)
       @formatter = specified_formatter if specified_formatter
       @formatter = detect_formatter if @formatter == "auto"
+
+      encodings = options.dig(:capabilities, :general, :positionEncodings)
+      @encoding = if !encodings || encodings.empty?
+        Encoding::UTF_16LE
+      elsif encodings.include?(Constant::PositionEncodingKind::UTF8)
+        Encoding::UTF_8
+      elsif encodings.include?(Constant::PositionEncodingKind::UTF16)
+        Encoding::UTF_16LE
+      else
+        Encoding::UTF_32
+      end
     end
 
     sig { returns(String) }
@@ -53,6 +68,25 @@ module RubyLsp
       T.must(@workspace_uri.to_standardized_path)
     end
 
+    sig { returns(String) }
+    def encoding_name
+      case @encoding
+      when Encoding::UTF_8
+        Constant::PositionEncodingKind::UTF8
+      when Encoding::UTF_16LE
+        Constant::PositionEncodingKind::UTF16
+      else
+        Constant::PositionEncodingKind::UTF32
+      end
+    end
+
+    sig { params(gem_pattern: Regexp).returns(T::Boolean) }
+    def direct_dependency?(gem_pattern)
+      dependencies.any?(gem_pattern)
+    end
+
+    private
+
     sig { returns(String) }
     def detect_formatter
       # NOTE: Intentionally no $ at end, since we want to match rubocop-shopify, etc.
@@ -70,8 +104,10 @@ module RubyLsp
       if direct_dependency?(/^rspec/)
         "rspec"
       # A Rails app may have a dependency on minitest, but we would instead want to use the Rails test runner provided
-      # by ruby-lsp-rails.
-      elsif direct_dependency?(/^rails$/)
+      # by ruby-lsp-rails. A Rails app doesn't need to depend on the rails gem itself, individual components like
+      # activestorage may be added to the gemfile so that other components aren't downloaded. Check for the presence
+      #  of bin/rails to support these cases.
+      elsif File.exist?(File.join(workspace_path, "bin/rails"))
         "rails"
       # NOTE: Intentionally ends with $ to avoid mis-matching minitest-reporters, etc. in a Rails app.
       elsif direct_dependency?(/^minitest$/)
@@ -83,11 +119,6 @@ module RubyLsp
       end
     end
 
-    sig { params(gem_pattern: Regexp).returns(T::Boolean) }
-    def direct_dependency?(gem_pattern)
-      dependencies.any?(gem_pattern)
-    end
-
     sig { returns(T::Boolean) }
     def detect_typechecker
       return false if ENV["RUBY_LSP_BYPASS_TYPECHECKER"]

data/lib/ruby_lsp/requests/support/rubocop_diagnostic.rb

@@ -163,7 +163,7 @@ module RubyLsp
 
         sig { params(line: String).returns(Integer) }
         def length_of_line(line)
-          if @document.encoding == Constant::PositionEncodingKind::UTF16
+          if @document.encoding == Encoding::UTF_16LE
             line_length = 0
             line.codepoints.each do |codepoint|
               line_length += 1

data/lib/ruby_lsp/server.rb

@@ -118,15 +118,6 @@ module RubyLsp
       client_name = options.dig(:clientInfo, :name)
       @store.client_name = client_name if client_name
 
-      encodings = options.dig(:capabilities, :general, :positionEncodings)
-      @store.encoding = if encodings.nil? || encodings.empty?
-        Constant::PositionEncodingKind::UTF16
-      elsif encodings.include?(Constant::PositionEncodingKind::UTF8)
-        Constant::PositionEncodingKind::UTF8
-      else
-        encodings.first
-      end
-
       progress = options.dig(:capabilities, :window, :workDoneProgress)
       @store.supports_progress = progress.nil? ? true : progress
       configured_features = options.dig(:initializationOptions, :enabledFeatures)
@@ -168,7 +159,7 @@ module RubyLsp
             change: Constant::TextDocumentSyncKind::INCREMENTAL,
             open_close: true,
           ),
-          position_encoding: @store.encoding,
+          position_encoding: @global_state.encoding_name,
           selection_range_provider: enabled_features["selectionRanges"],
           hover_provider: hover_provider,
           document_symbol_provider: document_symbol_provider,
@@ -269,25 +260,31 @@ module RubyLsp
 
     sig { params(message: T::Hash[Symbol, T.untyped]).void }
     def text_document_did_open(message)
-      text_document = message.dig(:params, :textDocument)
-      @store.set(uri: text_document[:uri], source: text_document[:text], version: text_document[:version])
-    rescue Errno::ENOENT
-      # If someone re-opens the editor with a file that was deleted or doesn't exist in the current branch, we don't
-      # want to crash
+      @mutex.synchronize do
+        text_document = message.dig(:params, :textDocument)
+        @store.set(
+          uri: text_document[:uri],
+          source: text_document[:text],
+          version: text_document[:version],
+          encoding: @global_state.encoding,
+        )
+      end
     end
 
     sig { params(message: T::Hash[Symbol, T.untyped]).void }
     def text_document_did_close(message)
-      uri = message.dig(:params, :textDocument, :uri)
-      @store.delete(uri)
+      @mutex.synchronize do
+        uri = message.dig(:params, :textDocument, :uri)
+        @store.delete(uri)
 
-      # Clear diagnostics for the closed file, so that they no longer appear in the problems tab
-      send_message(
-        Notification.new(
-          method: "textDocument/publishDiagnostics",
-          params: Interface::PublishDiagnosticsParams.new(uri: uri.to_s, diagnostics: []),
-        ),
-      )
+        # Clear diagnostics for the closed file, so that they no longer appear in the problems tab
+        send_message(
+          Notification.new(
+            method: "textDocument/publishDiagnostics",
+            params: Interface::PublishDiagnosticsParams.new(uri: uri.to_s, diagnostics: []),
+          ),
+        )
+      end
     end
 
     sig { params(message: T::Hash[Symbol, T.untyped]).void }

data/lib/ruby_lsp/setup_bundler.rb

@@ -19,6 +19,7 @@ module RubyLsp
     extend T::Sig
 
     class BundleNotLocked < StandardError; end
+    class BundleInstallFailure < StandardError; end
 
     FOUR_HOURS = T.let(4 * 60 * 60, Integer)
 
@@ -49,6 +50,7 @@ module RubyLsp
       @last_updated_path = T.let(@custom_dir + "last_updated", Pathname)
 
       @dependencies = T.let(load_dependencies, T::Hash[String, T.untyped])
+      @retry = T.let(false, T::Boolean)
     end
 
     # Sets up the custom bundle and returns the `BUNDLE_GEMFILE`, `BUNDLE_PATH` and `BUNDLE_APP_CONFIG` that should be
@@ -224,7 +226,17 @@ module RubyLsp
       # Add bundle update
       $stderr.puts("Ruby LSP> Running bundle install for the custom bundle. This may take a while...")
       $stderr.puts("Ruby LSP> Command: #{command}")
-      system(env, command)
+
+      # Try to run the bundle install or update command. If that fails, it normally means that the custom lockfile is in
+      # a bad state that no longer reflects the top level one. In that case, we can remove the whole directory, try
+      # another time and give up if it fails again
+      if !system(env, command) && !@retry && @custom_dir.exist?
+        @retry = true
+        @custom_dir.rmtree
+        $stderr.puts("Ruby LSP> Running bundle install failed. Trying to re-generate the custom bundle from scratch")
+        return setup!
+      end
+
       [bundle_gemfile.to_s, expanded_path, env["BUNDLE_APP_CONFIG"]]
     end
 

data/lib/ruby_lsp/store.rb

@@ -5,9 +5,6 @@ module RubyLsp
   class Store
     extend T::Sig
 
-    sig { returns(String) }
-    attr_accessor :encoding
-
     sig { returns(T::Boolean) }
     attr_accessor :supports_progress
 
@@ -23,7 +20,6 @@ module RubyLsp
     sig { void }
     def initialize
       @state = T.let({}, T::Hash[String, Document])
-      @encoding = T.let(Constant::PositionEncodingKind::UTF8, String)
       @supports_progress = T.let(true, T::Boolean)
       @experimental_features = T.let(false, T::Boolean)
       @features_configuration = T.let(
@@ -49,9 +45,9 @@ module RubyLsp
       T.must(@state[uri.to_s])
     end
 
-    sig { params(uri: URI::Generic, source: String, version: Integer).void }
-    def set(uri:, source:, version:)
-      document = RubyDocument.new(source: source, version: version, uri: uri, encoding: @encoding)
+    sig { params(uri: URI::Generic, source: String, version: Integer, encoding: Encoding).void }
+    def set(uri:, source:, version:, encoding: Encoding::UTF_8)
+      document = RubyDocument.new(source: source, version: version, uri: uri, encoding: encoding)
       @state[uri.to_s] = document
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol