ruby-lsp 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08f4db46a392926873115c77175be859ecdfc4c5093e003f913eec7288f05fac'
-  data.tar.gz: 2f34acc2fc69ab4dd6ad5fc9961a86c020d550284ed18aefd3221b0525af2628
+  metadata.gz: 0c2f16b0f0e93ade0e4465fcf71148ac156f6d65b1354f07af2df4007c600c15
+  data.tar.gz: 7c6f4668f461315039e37f04354dddadb1678dd89ff9c249a268897992dfa4c0
 SHA512:
-  metadata.gz: 99a9e243c0dd2f763532a5a1c52241ac86c9a7ba2ccb0814932d8e08b17add78143566ac26ad609b59ff8d96e1d2844b53995b85b473cb736c5f87e2a30c5a26
-  data.tar.gz: 2a1669be7a054a5d19b0b7eff113347571928cb601e1b432c6f49bc3f349a530b6d0df45c7ea5dfa46add7b69fd347713ec33f95fdca9baa896855f958814209
+  metadata.gz: 184683630988346ae617e3df3d6d04c66b822d6d9734f595a41caa3603b38046e5ee5a7a4361abede0f3b8d1584371730be9af905d006fa881d4b718f3381947
+  data.tar.gz: 7c10ef841c059110b1d5bc38cde57de243140c37d7095ab8c7ce16d28e4c520c402f2bfcf604f7002a7e06d7db031b8ab9e52ce28bf3c50be0dc2671d5728170

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.3

data/exe/ruby-lsp

@@ -3,6 +3,7 @@
 
 require "optparse"
 
+original_args = ARGV.dup
 options = {}
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: ruby-lsp [options]"
@@ -33,7 +34,7 @@ parser = OptionParser.new do |opts|
 end
 
 begin
-  parser.parse
+  parser.parse!
 rescue OptionParser::InvalidOption => e
   warn(e)
   warn("")
@@ -56,7 +57,7 @@ if ENV["BUNDLE_GEMFILE"].nil?
 
   env = { "BUNDLE_GEMFILE" => bundle_gemfile }
   env["BUNDLE_PATH"] = bundle_path if bundle_path
-  exit exec(env, "bundle exec ruby-lsp #{ARGV.join(" ")}")
+  exit exec(env, "bundle exec ruby-lsp #{original_args.join(" ")}")
 end
 
 require "sorbet-runtime"

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

@@ -134,7 +134,7 @@ module RubyIndexer
 
     sig { returns(Regexp) }
     def magic_comment_regex
-      /^\s*#\s*#{@excluded_magic_comments.join("|")}/
+      @magic_comment_regex ||= T.let(/^\s*#\s*#{@excluded_magic_comments.join("|")}/, T.nilable(Regexp))
     end
 
     private

data/lib/ruby_lsp/executor.rb

@@ -104,6 +104,7 @@ module RubyLsp
         emitter.visit(document.tree) if document.parsed?
 
         code_lens.merge_external_listeners_responses!
+        document_symbol.merge_external_listeners_responses!
 
         # Store all responses retrieve in this round of visits in the cache and then return the response for the request
         # we actually received
@@ -177,6 +178,8 @@ module RubyLsp
         workspace_symbol(request.dig(:params, :query))
       when "rubyLsp/textDocument/showSyntaxTree"
         show_syntax_tree(uri, request.dig(:params, :range))
+      else
+        VOID
       end
     end
 
@@ -204,8 +207,6 @@ module RubyLsp
 
     sig { void }
     def perform_initial_indexing
-      return unless @store.experimental_features
-
       # The begin progress invocation happens during `initialize`, so that the notification is sent before we are
       # stuck indexing files
       RubyIndexer.configuration.load_config
@@ -581,7 +582,7 @@ module RubyLsp
         Interface::DocumentSymbolClientCapabilities.new(
           hierarchical_document_symbol_support: true,
           symbol_kind: {
-            value_set: Requests::DocumentSymbol::SYMBOL_KIND.values,
+            value_set: (Constant::SymbolKind::FILE..Constant::SymbolKind::TYPE_PARAMETER).to_a,
           },
         )
       end
@@ -643,37 +644,35 @@ module RubyLsp
         )
       end
 
-      if @store.experimental_features
-        # Dynamically registered capabilities
-        file_watching_caps = options.dig(:capabilities, :workspace, :didChangeWatchedFiles)
-
-        # Not every client supports dynamic registration or file watching
-        if file_watching_caps&.dig(:dynamicRegistration) && file_watching_caps&.dig(:relativePatternSupport)
-          @message_queue << Request.new(
-            message: "client/registerCapability",
-            params: Interface::RegistrationParams.new(
-              registrations: [
-                # Register watching Ruby files
-                Interface::Registration.new(
-                  id: "workspace/didChangeWatchedFiles",
-                  method: "workspace/didChangeWatchedFiles",
-                  register_options: Interface::DidChangeWatchedFilesRegistrationOptions.new(
-                    watchers: [
-                      Interface::FileSystemWatcher.new(
-                        glob_pattern: "**/*.rb",
-                        kind: Constant::WatchKind::CREATE | Constant::WatchKind::CHANGE | Constant::WatchKind::DELETE,
-                      ),
-                    ],
-                  ),
+      # Dynamically registered capabilities
+      file_watching_caps = options.dig(:capabilities, :workspace, :didChangeWatchedFiles)
+
+      # Not every client supports dynamic registration or file watching
+      if file_watching_caps&.dig(:dynamicRegistration) && file_watching_caps&.dig(:relativePatternSupport)
+        @message_queue << Request.new(
+          message: "client/registerCapability",
+          params: Interface::RegistrationParams.new(
+            registrations: [
+              # Register watching Ruby files
+              Interface::Registration.new(
+                id: "workspace/didChangeWatchedFiles",
+                method: "workspace/didChangeWatchedFiles",
+                register_options: Interface::DidChangeWatchedFilesRegistrationOptions.new(
+                  watchers: [
+                    Interface::FileSystemWatcher.new(
+                      glob_pattern: "**/*.rb",
+                      kind: Constant::WatchKind::CREATE | Constant::WatchKind::CHANGE | Constant::WatchKind::DELETE,
+                    ),
+                  ],
                 ),
-              ],
-            ),
-          )
-        end
-
-        begin_progress("indexing-progress", "Ruby LSP: indexing files")
+              ),
+            ],
+          ),
+        )
       end
 
+      begin_progress("indexing-progress", "Ruby LSP: indexing files")
+
       Interface::InitializeResult.new(
         capabilities: Interface::ServerCapabilities.new(
           text_document_sync: Interface::TextDocumentSyncOptions.new(

data/lib/ruby_lsp/extension.rb

@@ -124,5 +124,14 @@ module RubyLsp
       ).returns(T.nilable(Listener[T.nilable(Interface::Hover)]))
     end
     def create_hover_listener(emitter, message_queue); end
+
+    # Creates a new DocumentSymbol listener. This method is invoked on every DocumentSymbol request
+    sig do
+      overridable.params(
+        emitter: EventEmitter,
+        message_queue: Thread::Queue,
+      ).returns(T.nilable(Listener[T.nilable(Interface::DocumentSymbol)]))
+    end
+    def create_document_symbol_listener(emitter, message_queue); end
   end
 end

data/lib/ruby_lsp/requests/code_lens.rb

@@ -65,7 +65,7 @@ module RubyLsp
         class_name = node.constant.constant.value
         @class_stack.push(class_name)
 
-        if class_name.end_with?("Test")
+        if @path && class_name.end_with?("Test")
           add_test_code_lens(
             node,
             name: class_name,
@@ -89,7 +89,7 @@ module RubyLsp
         visibility, _ = @visibility_stack.last
         if visibility == "public"
           method_name = node.name.value
-          if method_name.start_with?("test_")
+          if @path && method_name.start_with?("test_")
             add_test_code_lens(
               node,
               name: method_name,

data/lib/ruby_lsp/requests/document_symbol.rb

@@ -32,38 +32,6 @@ module RubyLsp
 
       ResponseType = type_member { { fixed: T::Array[Interface::DocumentSymbol] } }
 
-      SYMBOL_KIND = T.let(
-        {
-          file: 1,
-          module: 2,
-          namespace: 3,
-          package: 4,
-          class: 5,
-          method: 6,
-          property: 7,
-          field: 8,
-          constructor: 9,
-          enum: 10,
-          interface: 11,
-          function: 12,
-          variable: 13,
-          constant: 14,
-          string: 15,
-          number: 16,
-          boolean: 17,
-          array: 18,
-          object: 19,
-          key: 20,
-          null: 21,
-          enummember: 22,
-          struct: 23,
-          event: 24,
-          operator: 25,
-          typeparameter: 26,
-        }.freeze,
-        T::Hash[Symbol, Integer],
-      )
-
       ATTR_ACCESSORS = T.let(["attr_reader", "attr_writer", "attr_accessor"].freeze, T::Array[String])
 
       class SymbolHierarchyRoot
@@ -92,6 +60,10 @@ module RubyLsp
           T::Array[T.any(SymbolHierarchyRoot, Interface::DocumentSymbol)],
         )
 
+        @external_listeners.concat(
+          Extension.extensions.filter_map { |ext| ext.create_document_symbol_listener(emitter, message_queue) },
+        )
+
         emitter.register(
           self,
           :on_class,
@@ -107,11 +79,18 @@ module RubyLsp
         )
       end
 
+      # Merges responses from other listeners
+      sig { override.params(other: Listener[ResponseType]).returns(T.self_type) }
+      def merge_response!(other)
+        @response.concat(other.response)
+        self
+      end
+
       sig { params(node: SyntaxTree::ClassDeclaration).void }
       def on_class(node)
         @stack << create_document_symbol(
           name: full_constant_name(node.constant),
-          kind: :class,
+          kind: Constant::SymbolKind::CLASS,
           range_node: node,
           selection_range_node: node.constant,
         )
@@ -131,7 +110,7 @@ module RubyLsp
 
           create_document_symbol(
             name: argument.value.value,
-            kind: :field,
+            kind: Constant::SymbolKind::FIELD,
             range_node: argument,
             selection_range_node: argument.value,
           )
@@ -142,7 +121,7 @@ module RubyLsp
       def on_const_path_field(node)
         create_document_symbol(
           name: node.constant.value,
-          kind: :constant,
+          kind: Constant::SymbolKind::CONSTANT,
           range_node: node,
           selection_range_node: node.constant,
         )
@@ -154,10 +133,10 @@ module RubyLsp
 
         if target.is_a?(SyntaxTree::VarRef) && target.value.is_a?(SyntaxTree::Kw) && target.value.value == "self"
           name = "self.#{node.name.value}"
-          kind = :method
+          kind = Constant::SymbolKind::METHOD
         else
           name = node.name.value
-          kind = name == "initialize" ? :constructor : :method
+          kind = name == "initialize" ? Constant::SymbolKind::CONSTRUCTOR : Constant::SymbolKind::METHOD
         end
 
         symbol = create_document_symbol(
@@ -179,7 +158,7 @@ module RubyLsp
       def on_module(node)
         @stack << create_document_symbol(
           name: full_constant_name(node.constant),
-          kind: :module,
+          kind: Constant::SymbolKind::MODULE,
           range_node: node,
           selection_range_node: node.constant,
         )
@@ -194,7 +173,7 @@ module RubyLsp
       def on_top_const_field(node)
         create_document_symbol(
           name: node.constant.value,
-          kind: :constant,
+          kind: Constant::SymbolKind::CONSTANT,
           range_node: node,
           selection_range_node: node.constant,
         )
@@ -205,9 +184,9 @@ module RubyLsp
         value = node.value
         kind = case value
         when SyntaxTree::Const
-          :constant
+          Constant::SymbolKind::CONSTANT
         when SyntaxTree::CVar, SyntaxTree::IVar
-          :variable
+          Constant::SymbolKind::VARIABLE
         else
           return
         end
@@ -225,7 +204,7 @@ module RubyLsp
       sig do
         params(
           name: String,
-          kind: Symbol,
+          kind: Integer,
           range_node: SyntaxTree::Node,
           selection_range_node: SyntaxTree::Node,
         ).returns(Interface::DocumentSymbol)
@@ -233,7 +212,7 @@ module RubyLsp
       def create_document_symbol(name:, kind:, range_node:, selection_range_node:)
         symbol = Interface::DocumentSymbol.new(
           name: name,
-          kind: SYMBOL_KIND[kind],
+          kind: kind,
           range: range_from_syntax_tree_node(range_node),
           selection_range: range_from_syntax_tree_node(selection_range_node),
           children: [],

data/lib/ruby_lsp/requests/on_type_formatting.rb

@@ -112,11 +112,12 @@ module RubyLsp
         next_line = @lines[@position[:line] + 1]
 
         if current_line.nil? || current_line.strip.empty?
-          add_edit_with_text(" \n#{indents}end")
+          add_edit_with_text("\n")
+          add_edit_with_text("#{indents}end")
           move_cursor_to(@position[:line], @indentation + 2)
         elsif next_line.nil? || next_line.strip.empty?
-          add_edit_with_text("#{indents}end", { line: @position[:line] + 1, character: @position[:character] })
-          move_cursor_to(@position[:line], @indentation + 3)
+          add_edit_with_text("#{indents}end\n", { line: @position[:line] + 1, character: @position[:character] })
+          move_cursor_to(@position[:line] - 1, @indentation + @previous_line.size + 1)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol