ruby-lsp 0.4.1 → 0.4.3

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

@@ -67,12 +67,13 @@ module RubyLsp
             return unless RAILTIES_VERSION
 
             warn("Fetching Rails Documents...")
-            # If the version's doc is not found, e.g. Rails main, it'll be redirected
-            # In this case, we just fetch the latest doc
-            response = if Gem::Version.new(RAILTIES_VERSION).prerelease?
-              Net::HTTP.get_response(URI("#{RAILS_DOC_HOST}/js/search_index.js"))
-            else
-              Net::HTTP.get_response(URI("#{RAILS_DOC_HOST}/v#{RAILTIES_VERSION}/js/search_index.js"))
+
+            response = Net::HTTP.get_response(URI("#{RAILS_DOC_HOST}/v#{RAILTIES_VERSION}/js/search_index.js"))
+
+            if response.code == "302"
+              # If the version's doc is not found, e.g. Rails main, it'll be redirected
+              # In this case, we just fetch the latest doc
+              response = Net::HTTP.get_response(URI("#{RAILS_DOC_HOST}/js/search_index.js"))
             end
 
             if response.code == "200"

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

@@ -4,7 +4,7 @@
 module RubyLsp
   module Requests
     module Support
-      class SelectionRange < LanguageServer::Protocol::Interface::SelectionRange
+      class SelectionRange < Interface::SelectionRange
         extend T::Sig
 
         sig { params(position: Document::PositionShape).returns(T::Boolean) }

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

@@ -16,7 +16,7 @@ module RubyLsp
         sig do
           params(
             tokens: T::Array[SemanticHighlighting::SemanticToken],
-          ).returns(LanguageServer::Protocol::Interface::SemanticTokens)
+          ).returns(Interface::SemanticTokens)
         end
         def encode(tokens)
           delta = tokens
@@ -27,7 +27,7 @@ module RubyLsp
               compute_delta(token)
             end
 
-          LanguageServer::Protocol::Interface::SemanticTokens.new(data: delta)
+          Interface::SemanticTokens.new(data: delta)
         end
 
         # The delta array is computed according to the LSP specification:

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

@@ -63,7 +63,8 @@ module RubyLsp
             when SyntaxTree::VCall
               ANNOTATIONS[node.value.value]
             when SyntaxTree::CallNode
-              ANNOTATIONS[node.message.value]
+              message = node.message
+              ANNOTATIONS[message.value] unless message.is_a?(Symbol)
             else
               T.absurd(node)
             end
@@ -84,21 +85,10 @@ module RubyLsp
           end
 
           sig do
-            params(node: T.nilable(T.any(
-              SyntaxTree::VarRef,
-              SyntaxTree::CallNode,
-              SyntaxTree::VCall,
-              SyntaxTree::Ident,
-              SyntaxTree::Backtick,
-              SyntaxTree::Const,
-              SyntaxTree::Op,
-              Symbol,
-            ))).returns(T.nilable(String))
+            params(node: T.nilable(SyntaxTree::Node)).returns(T.nilable(String))
           end
           def node_name(node)
             case node
-            when NilClass
-              nil
             when SyntaxTree::VarRef
               node.value.value
             when SyntaxTree::CallNode
@@ -107,8 +97,8 @@ module RubyLsp
               node_name(node.value)
             when SyntaxTree::Ident, SyntaxTree::Backtick, SyntaxTree::Const, SyntaxTree::Op
               node.value
-            when Symbol
-              node.to_s
+            when NilClass, SyntaxTree::Node
+              nil
             else
               T.absurd(node)
             end

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

@@ -0,0 +1,39 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "syntax_tree/cli"
+require "singleton"
+
+module RubyLsp
+  module Requests
+    module Support
+      # :nodoc:
+      class SyntaxTreeFormattingRunner
+        extend T::Sig
+        include Singleton
+
+        sig { void }
+        def initialize
+          @options =
+            T.let(
+              begin
+                opts = SyntaxTree::CLI::Options.new
+                opts.parse(SyntaxTree::CLI::ConfigFile.new.arguments)
+                opts
+              end,
+              SyntaxTree::CLI::Options,
+            )
+        end
+
+        sig { params(_uri: String, document: Document).returns(T.nilable(String)) }
+        def run(_uri, document)
+          SyntaxTree.format(
+            document.source,
+            @options.print_width,
+            options: @options.formatter_options,
+          )
+        end
+      end
+    end
+  end
+end

data/lib/ruby_lsp/server.rb

@@ -2,9 +2,11 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  # rubocop:disable RubyLsp/UseLanguageServerAliases
   Interface = LanguageServer::Protocol::Interface
   Constant = LanguageServer::Protocol::Constant
   Transport = LanguageServer::Protocol::Transport
+  # rubocop:enable RubyLsp/UseLanguageServerAliases
 
   class Server
     extend T::Sig
@@ -33,7 +35,8 @@ module RubyLsp
       # fall under the else branch which just pushes requests to the queue
       @reader.read do |request|
         case request[:method]
-        when "initialize", "initialized", "textDocument/didOpen", "textDocument/didClose", "textDocument/didChange"
+        when "initialize", "initialized", "textDocument/didOpen", "textDocument/didClose", "textDocument/didChange",
+              "textDocument/formatting", "textDocument/onTypeFormatting", "codeAction/resolve"
           result = Executor.new(@store).execute(request)
           finalize_request(result, request)
         when "$/cancelRequest"

data/lib/ruby_lsp/store.rb

@@ -12,10 +12,14 @@ module RubyLsp
     sig { params(encoding: String).void }
     attr_writer :encoding
 
+    sig { returns(String) }
+    attr_accessor :formatter
+
     sig { void }
     def initialize
       @state = T.let({}, T::Hash[String, Document])
       @encoding = T.let("utf-8", String)
+      @formatter = T.let("auto", String)
     end
 
     sig { params(uri: String).returns(Document) }
@@ -23,19 +27,19 @@ module RubyLsp
       document = @state[uri]
       return document unless document.nil?
 
-      set(uri, File.binread(CGI.unescape(URI.parse(uri).path)))
+      set(uri: uri, source: File.binread(CGI.unescape(URI.parse(uri).path)), version: 0)
       T.must(@state[uri])
     end
 
-    sig { params(uri: String, content: String).void }
-    def set(uri, content)
-      document = Document.new(content, @encoding)
+    sig { params(uri: String, source: String, version: Integer).void }
+    def set(uri:, source:, version:)
+      document = Document.new(source: source, version: version, uri: uri, encoding: @encoding)
       @state[uri] = document
     end
 
-    sig { params(uri: String, edits: T::Array[Document::EditShape]).void }
-    def push_edits(uri, edits)
-      T.must(@state[uri]).push_edits(edits)
+    sig { params(uri: String, edits: T::Array[Document::EditShape], version: Integer).void }
+    def push_edits(uri:, edits:, version:)
+      T.must(@state[uri]).push_edits(edits, version: version)
     end
 
     sig { void }

data/lib/ruby_lsp/utils.rb

@@ -5,6 +5,9 @@ module RubyLsp
   # Used to indicate that a request shouldn't return a response
   VOID = T.let(Object.new.freeze, Object)
 
+  # This freeze is not redundant since the interpolated string is mutable
+  WORKSPACE_URI = T.let("file://#{Dir.pwd}".freeze, String) # rubocop:disable Style/RedundantFreeze
+
   # A notification to be sent to the client
   class Notification
     extend T::Sig

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.1.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.1.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -70,6 +70,7 @@ files:
 - README.md
 - VERSION
 - exe/ruby-lsp
+- lib/rubocop/cop/ruby_lsp/use_language_server_aliases.rb
 - lib/ruby-lsp.rb
 - lib/ruby_lsp/document.rb
 - lib/ruby_lsp/executor.rb
@@ -102,6 +103,7 @@ files:
 - lib/ruby_lsp/requests/support/semantic_token_encoder.rb
 - lib/ruby_lsp/requests/support/sorbet.rb
 - lib/ruby_lsp/requests/support/source_uri.rb
+- lib/ruby_lsp/requests/support/syntax_tree_formatting_runner.rb
 - lib/ruby_lsp/server.rb
 - lib/ruby_lsp/store.rb
 - lib/ruby_lsp/utils.rb
@@ -125,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.9
 signing_key: 
 specification_version: 4
 summary: An opinionated language server for Ruby