ruby-lsp 0.12.1 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2774623b2161a416bfb07769e8eb5ccf3d40177f98edf9e4d4ed4c7e3f7fd47b
-  data.tar.gz: 23626aa84fdaf85571c7d039d670f9131409ccb7a8cd2c61d4889ffd08ecb8de
+  metadata.gz: b053184e8e593901a5344dfd3d34d20962fd2ed773900e00112be751008dae7d
+  data.tar.gz: '087be2ed7ace3fdb9eed751215a806deab096c6a5aa415d170eceaa45286c4d9'
 SHA512:
-  metadata.gz: ffd099ba6d95ce10cd3fd2c3fb1e431d5481e0e8bad77c062fdd9b2f9fce534f9c58319672e508d17ca089e10ba9fdf398479dd9dfac3adbc347912815800cdd
-  data.tar.gz: fb0f4c3111718c5f792266459e2694787ea7939b63c819707bba764395dc6cc3bf1d925517a1fa412b362fbd0b3222e8460723df4f2c3a4272ac73dc62eb872a
+  metadata.gz: e29d0633e023d4d3ce3efe5347479d9e2c16b1cbf02638e29b8f617158c08d7aae84ae4ad1f5898f6bd34033e841070d8cd2ffe8d67180ad4c554f3d5f80b564
+  data.tar.gz: 7a74cc5acca390661a196e21760f6c82e00478a02539c4c5cc2d17089948287762886c8a169d2384b59aa7e3324dda08fc3fa52a1aa6112951a2a8bc6b9253ab

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.12.3

data/lib/ruby_indexer/lib/ruby_indexer/configuration.rb

@@ -198,7 +198,11 @@ module RubyIndexer
       excluded.each do |dependency|
         next unless dependency.runtime?
 
-        dependency.to_spec.dependencies.each do |transitive_dependency|
+        # If the dependency is prerelease, to_spec may return `nil`
+        spec = dependency.to_spec
+        next unless spec
+
+        spec.dependencies.each do |transitive_dependency|
           # If the transitive dependency is included in other groups, skip it
           next if others.any? { |d| d.name == transitive_dependency.name }
 

data/lib/ruby_indexer/lib/ruby_indexer/entry.rb

@@ -136,8 +136,9 @@ module RubyIndexer
         case node
         when Prism::RequiredParameterNode
           node.name
-        when Prism::RequiredDestructuredParameterNode
-          names = node.parameters.map { |parameter_node| parameter_name(parameter_node) }
+        when Prism::MultiTargetNode
+          names = [*node.lefts, *node.rest, *node.rights].map { |parameter_node| parameter_name(parameter_node) }
+
           names_with_commas = names.join(", ")
           :"(#{names_with_commas})"
         end

data/lib/ruby_indexer/lib/ruby_indexer/visitor.rb

@@ -35,7 +35,7 @@ module RubyIndexer
       value = node.value
       values = value.is_a?(Prism::ArrayNode) && value.opening_loc ? value.elements : []
 
-      node.targets.each_with_index do |target, i|
+      [*node.lefts, *node.rest, *node.rights].each_with_index do |target, i|
         current_value = values[i]
         # The moment we find a splat on the right hand side of the assignment, we can no longer figure out which value
         # gets assigned to what

data/lib/ruby_lsp/requests/code_action_resolve.rb

@@ -87,15 +87,19 @@ module RubyLsp
             :start,
             :line,
           ) && closest_node_loc.end_line - 1 >= source_range.dig(:end, :line)
-            indentation_line = closest_node_loc.start_line - 1
-            target_line = indentation_line
+            indentation_line_number = closest_node_loc.start_line - 1
+            target_line = indentation_line_number
           else
             target_line = closest_node_loc.end_line
-            indentation_line = closest_node_loc.end_line - 1
+            indentation_line_number = closest_node_loc.end_line - 1
           end
 
           lines = @document.source.lines
-          indentation = T.must(T.must(lines[indentation_line])[/\A */]).size
+
+          indentation_line = lines[indentation_line_number]
+          return Error::InvalidTargetRange unless indentation_line
+
+          indentation = T.must(indentation_line[/\A */]).size
 
           target_range = {
             start: { line: target_line, character: indentation },

data/lib/ruby_lsp/requests/document_highlight.rb

@@ -97,7 +97,8 @@ module RubyLsp
           Prism::LocalVariableWriteNode,
           Prism::BlockParameterNode,
           Prism::RequiredParameterNode,
-          Prism::KeywordParameterNode,
+          Prism::RequiredKeywordParameterNode,
+          Prism::OptionalKeywordParameterNode,
           Prism::RestParameterNode,
           Prism::OptionalParameterNode,
           Prism::KeywordRestParameterNode,
@@ -137,8 +138,9 @@ module RubyLsp
             Prism::ClassVariableReadNode, Prism::ClassVariableTargetNode, Prism::ClassVariableWriteNode,
             Prism::LocalVariableAndWriteNode, Prism::LocalVariableOperatorWriteNode, Prism::LocalVariableOrWriteNode,
             Prism::LocalVariableReadNode, Prism::LocalVariableTargetNode, Prism::LocalVariableWriteNode,
-            Prism::CallNode, Prism::BlockParameterNode, Prism::KeywordParameterNode, Prism::KeywordRestParameterNode,
-            Prism::OptionalParameterNode, Prism::RequiredParameterNode, Prism::RestParameterNode
+            Prism::CallNode, Prism::BlockParameterNode, Prism::RequiredKeywordParameterNode,
+            Prism::RequiredKeywordParameterNode, Prism::KeywordRestParameterNode, Prism::OptionalParameterNode,
+            Prism::RequiredParameterNode, Prism::RestParameterNode
             target
           end
 
@@ -171,7 +173,8 @@ module RubyLsp
             :on_constant_path_and_write_node_enter,
             :on_constant_path_operator_write_node_enter,
             :on_local_variable_write_node_enter,
-            :on_keyword_parameter_node_enter,
+            :on_required_keyword_parameter_node_enter,
+            :on_optional_keyword_parameter_node_enter,
             :on_rest_parameter_node_enter,
             :on_optional_parameter_node_enter,
             :on_keyword_rest_parameter_node_enter,
@@ -359,8 +362,15 @@ module RubyLsp
         add_highlight(Constant::DocumentHighlightKind::WRITE, node.name_loc)
       end
 
-      sig { params(node: Prism::KeywordParameterNode).void }
-      def on_keyword_parameter_node_enter(node)
+      sig { params(node: Prism::RequiredKeywordParameterNode).void }
+      def on_required_keyword_parameter_node_enter(node)
+        return unless matches?(node, LOCAL_NODES)
+
+        add_highlight(Constant::DocumentHighlightKind::WRITE, node.name_loc)
+      end
+
+      sig { params(node: Prism::OptionalKeywordParameterNode).void }
+      def on_optional_keyword_parameter_node_enter(node)
         return unless matches?(node, LOCAL_NODES)
 
         add_highlight(Constant::DocumentHighlightKind::WRITE, node.name_loc)
@@ -551,8 +561,8 @@ module RubyLsp
           Prism::ClassVariableTargetNode, Prism::ClassVariableWriteNode, Prism::LocalVariableAndWriteNode,
           Prism::LocalVariableOperatorWriteNode, Prism::LocalVariableOrWriteNode, Prism::LocalVariableReadNode,
           Prism::LocalVariableTargetNode, Prism::LocalVariableWriteNode, Prism::DefNode, Prism::BlockParameterNode,
-          Prism::KeywordParameterNode, Prism::KeywordRestParameterNode, Prism::OptionalParameterNode,
-          Prism::RequiredParameterNode, Prism::RestParameterNode
+          Prism::RequiredKeywordParameterNode, Prism::OptionalKeywordParameterNode, Prism::KeywordRestParameterNode,
+          Prism::OptionalParameterNode, Prism::RequiredParameterNode, Prism::RestParameterNode
 
           node.name.to_s
         when Prism::CallNode

data/lib/ruby_lsp/requests/document_symbol.rb

@@ -73,6 +73,8 @@ module RubyLsp
           :on_module_node_leave,
           :on_instance_variable_write_node_enter,
           :on_class_variable_write_node_enter,
+          :on_singleton_class_node_enter,
+          :on_singleton_class_node_leave,
         )
       end
 
@@ -103,6 +105,23 @@ module RubyLsp
         @stack.pop
       end
 
+      sig { params(node: Prism::SingletonClassNode).void }
+      def on_singleton_class_node_enter(node)
+        expression = node.expression
+
+        @stack << create_document_symbol(
+          name: "<< #{expression.slice}",
+          kind: Constant::SymbolKind::NAMESPACE,
+          range_location: node.location,
+          selection_range_location: expression.location,
+        )
+      end
+
+      sig { params(node: Prism::SingletonClassNode).void }
+      def on_singleton_class_node_leave(node)
+        @stack.pop
+      end
+
       sig { params(node: Prism::CallNode).void }
       def on_call_node_enter(node)
         return unless ATTR_ACCESSORS.include?(node.name) && node.receiver.nil?
@@ -163,10 +182,14 @@ module RubyLsp
       sig { params(node: Prism::DefNode).void }
       def on_def_node_enter(node)
         receiver = node.receiver
+        previous_symbol = @stack.last
 
         if receiver.is_a?(Prism::SelfNode)
           name = "self.#{node.name}"
-          kind = Constant::SymbolKind::METHOD
+          kind = Constant::SymbolKind::FUNCTION
+        elsif previous_symbol.is_a?(Interface::DocumentSymbol) && previous_symbol.name.start_with?("<<")
+          name = node.name.to_s
+          kind = Constant::SymbolKind::FUNCTION
         else
           name = node.name.to_s
           kind = name == "initialize" ? Constant::SymbolKind::CONSTRUCTOR : Constant::SymbolKind::METHOD

data/lib/ruby_lsp/requests/folding_ranges.rb

@@ -94,7 +94,7 @@ module RubyLsp
         opening_loc = node.opening_loc
         closing_loc = node.closing_loc
 
-        add_lines_range(opening_loc.start_line, closing_loc.end_line - 1) if opening_loc && closing_loc
+        add_lines_range(opening_loc.start_line, closing_loc.start_line - 1) if opening_loc && closing_loc
       end
 
       sig { params(node: Prism::ArrayNode).void }

data/lib/ruby_lsp/requests/semantic_highlighting.rb

@@ -135,7 +135,8 @@ module RubyLsp
           :on_local_variable_write_node_enter,
           :on_local_variable_read_node_enter,
           :on_block_parameter_node_enter,
-          :on_keyword_parameter_node_enter,
+          :on_required_keyword_parameter_node_enter,
+          :on_optional_keyword_parameter_node_enter,
           :on_keyword_rest_parameter_node_enter,
           :on_optional_parameter_node_enter,
           :on_required_parameter_node_enter,
@@ -252,11 +253,18 @@ module RubyLsp
         @current_scope << name.to_sym if name
       end
 
-      sig { params(node: Prism::KeywordParameterNode).void }
-      def on_keyword_parameter_node_enter(node)
-        name = node.name
-        @current_scope << name.to_s.delete_suffix(":").to_sym if name
+      sig { params(node: Prism::RequiredKeywordParameterNode).void }
+      def on_required_keyword_parameter_node_enter(node)
+        @current_scope << node.name
+        return unless visible?(node, @range)
+
+        location = node.name_loc
+        add_token(location.copy(length: location.length - 1), :parameter)
+      end
 
+      sig { params(node: Prism::OptionalKeywordParameterNode).void }
+      def on_optional_keyword_parameter_node_enter(node)
+        @current_scope << node.name
         return unless visible?(node, @range)
 
         location = node.name_loc

data/lib/ruby_lsp/server.rb

@@ -58,7 +58,7 @@ module RubyLsp
 
     sig { void }
     def start
-      warn("Starting Ruby LSP...")
+      warn("Starting Ruby LSP v#{VERSION}...")
 
       # Requests that have to be executed sequentially or in the main process are implemented here. All other requests
       # fall under the else branch which just pushes requests to the queue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement