ruby-lsp 0.3.6 → 0.3.8

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

@@ -34,12 +34,12 @@ module RubyLsp
         def matched_highlight(other)
           case @node
           # Method definitions and invocations
-          when SyntaxTree::VCall, SyntaxTree::FCall, SyntaxTree::Call, SyntaxTree::Command,
-               SyntaxTree::CommandCall, SyntaxTree::Def, SyntaxTree::Defs, SyntaxTree::DefEndless
+          when SyntaxTree::VCall, SyntaxTree::CallNode, SyntaxTree::Command,
+               SyntaxTree::CommandCall, SyntaxTree::DefNode
             case other
-            when SyntaxTree::VCall, SyntaxTree::FCall, SyntaxTree::Call, SyntaxTree::Command, SyntaxTree::CommandCall
+            when SyntaxTree::VCall, SyntaxTree::CallNode, SyntaxTree::Command, SyntaxTree::CommandCall
               HighlightMatch.new(type: READ, node: other)
-            when SyntaxTree::Def, SyntaxTree::Defs, SyntaxTree::Defs
+            when SyntaxTree::DefNode
               HighlightMatch.new(type: WRITE, node: other.name)
             end
           # Variables, parameters and constants
@@ -67,15 +67,14 @@ module RubyLsp
           case node
           when SyntaxTree::ConstPathRef, SyntaxTree::ConstPathField, SyntaxTree::TopConstField
             node.constant.value
-          when SyntaxTree::GVar, SyntaxTree::IVar, SyntaxTree::Const, SyntaxTree::CVar, SyntaxTree::Ident,
-               SyntaxTree::ArgsForward
+          when SyntaxTree::GVar, SyntaxTree::IVar, SyntaxTree::Const, SyntaxTree::CVar, SyntaxTree::Ident
             node.value
-          when SyntaxTree::Field, SyntaxTree::Def, SyntaxTree::Defs, SyntaxTree::DefEndless, SyntaxTree::RestParam,
+          when SyntaxTree::Field, SyntaxTree::DefNode, SyntaxTree::RestParam,
                SyntaxTree::KwRestParam, SyntaxTree::BlockArg
             node.name&.value
-          when SyntaxTree::VarField, SyntaxTree::VarRef, SyntaxTree::VCall, SyntaxTree::FCall
+          when SyntaxTree::VarField, SyntaxTree::VarRef, SyntaxTree::VCall
             node.value&.value
-          when SyntaxTree::Call, SyntaxTree::Command, SyntaxTree::CommandCall
+          when SyntaxTree::CallNode, SyntaxTree::Command, SyntaxTree::CommandCall
             message = node.message
             message != :call ? message.value : nil
           when SyntaxTree::ClassDeclaration, SyntaxTree::ModuleDeclaration

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

@@ -10,8 +10,14 @@ module RubyLsp
         RAILS_DOC_HOST = "https://api.rubyonrails.org"
         SUPPORTED_RAILS_DOC_NAMESPACES = T.let(
           Regexp.union(
-            /ActionDispatch/, /ActionController/, /AbstractController/, /ActiveRecord/, /ActiveModel/, /ActiveStorage/,
-            /ActionText/, /ActiveJob/
+            /ActionDispatch/,
+            /ActionController/,
+            /AbstractController/,
+            /ActiveRecord/,
+            /ActiveModel/,
+            /ActiveStorage/,
+            /ActionText/,
+            /ActiveJob/,
           ).freeze,
           Regexp,
         )
@@ -19,7 +25,8 @@ module RubyLsp
         RAILTIES_VERSION = T.let(
           [*::Gem::Specification.default_stubs, *::Gem::Specification.stubs].find do |s|
             s.name == "railties"
-          end&.version&.to_s, T.nilable(String)
+          end&.version&.to_s,
+          T.nilable(String),
         )
 
         class << self
@@ -59,7 +66,7 @@ module RubyLsp
           private def build_search_index
             return unless RAILTIES_VERSION
 
-            $stderr.puts "Fetching Rails Documents..."
+            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?
@@ -71,11 +78,11 @@ module RubyLsp
             if response.code == "200"
               process_search_index(response.body)
             else
-              $stderr.puts("Response failed: #{response.inspect}")
+              warn("Response failed: #{response.inspect}")
               nil
             end
           rescue StandardError => e
-            $stderr.puts("Exception occurred when fetching Rails document index: #{e.inspect}")
+            warn("Exception occurred when fetching Rails document index: #{e.inspect}")
           end
 
           sig { params(js: String).returns(T::Hash[String, T::Array[T::Hash[Symbol, String]]]) }

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

@@ -7,14 +7,17 @@ module RubyLsp
       class RuboCopDiagnostic
         extend T::Sig
 
-        RUBOCOP_TO_LSP_SEVERITY = T.let({
-          convention: LanguageServer::Protocol::Constant::DiagnosticSeverity::INFORMATION,
-          info: LanguageServer::Protocol::Constant::DiagnosticSeverity::INFORMATION,
-          refactor: LanguageServer::Protocol::Constant::DiagnosticSeverity::INFORMATION,
-          warning: LanguageServer::Protocol::Constant::DiagnosticSeverity::WARNING,
-          error: LanguageServer::Protocol::Constant::DiagnosticSeverity::ERROR,
-          fatal: LanguageServer::Protocol::Constant::DiagnosticSeverity::ERROR,
-        }.freeze, T::Hash[Symbol, Integer])
+        RUBOCOP_TO_LSP_SEVERITY = T.let(
+          {
+            convention: LanguageServer::Protocol::Constant::DiagnosticSeverity::INFORMATION,
+            info: LanguageServer::Protocol::Constant::DiagnosticSeverity::INFORMATION,
+            refactor: LanguageServer::Protocol::Constant::DiagnosticSeverity::INFORMATION,
+            warning: LanguageServer::Protocol::Constant::DiagnosticSeverity::WARNING,
+            error: LanguageServer::Protocol::Constant::DiagnosticSeverity::ERROR,
+            fatal: LanguageServer::Protocol::Constant::DiagnosticSeverity::ERROR,
+          }.freeze,
+          T::Hash[Symbol, Integer],
+        )
 
         sig { returns(T::Array[LanguageServer::Protocol::Interface::TextEdit]) }
         attr_reader :replacements
@@ -94,8 +97,10 @@ module RubyLsp
             LanguageServer::Protocol::Interface::TextEdit.new(
               range: LanguageServer::Protocol::Interface::Range.new(
                 start: LanguageServer::Protocol::Interface::Position.new(line: range.line - 1, character: range.column),
-                end: LanguageServer::Protocol::Interface::Position.new(line: range.last_line - 1,
-                  character: range.last_column),
+                end: LanguageServer::Protocol::Interface::Position.new(
+                  line: range.last_line - 1,
+                  character: range.last_column,
+                ),
               ),
               new_text: replacement,
             )

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

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "ruby_lsp/requests/support/rubocop_runner"
-return unless defined?(::RubyLsp::Requests::Support::RuboCopRunner)
+return unless defined?(RubyLsp::Requests::Support::RuboCopRunner)
 
 require "cgi"
 require "singleton"

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

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "ruby_lsp/requests/support/rubocop_runner"
-return unless defined?(::RubyLsp::Requests::Support::RuboCopRunner)
+return unless defined?(RubyLsp::Requests::Support::RuboCopRunner)
 
 require "cgi"
 require "singleton"

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

@@ -25,12 +25,15 @@ module RubyLsp
         sig { returns(T::Array[RuboCop::Cop::Offense]) }
         attr_reader :offenses
 
-        DEFAULT_ARGS = T.let([
-          "--stderr", # Print any output to stderr so that our stdout does not get polluted
-          "--force-exclusion",
-          "--format",
-          "RuboCop::Formatter::BaseFormatter", # Suppress any output by using the base formatter
-        ].freeze, T::Array[String])
+        DEFAULT_ARGS = T.let(
+          [
+            "--stderr", # Print any output to stderr so that our stdout does not get polluted
+            "--force-exclusion",
+            "--format",
+            "RuboCop::Formatter::BaseFormatter", # Suppress any output by using the base formatter
+          ].freeze,
+          T::Array[String],
+        )
 
         sig { params(args: String).void }
         def initialize(*args)

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

@@ -8,13 +8,16 @@ module URI
   class Source < URI::File
     extend T::Sig
 
-    COMPONENT = T.let([
-      :scheme,
-      :gem_name,
-      :gem_version,
-      :path,
-      :line_number,
-    ].freeze, T::Array[Symbol])
+    COMPONENT = T.let(
+      [
+        :scheme,
+        :gem_name,
+        :gem_version,
+        :path,
+        :line_number,
+      ].freeze,
+      T::Array[Symbol],
+    )
 
     T.unsafe(self).alias_method(:gem_name, :host)
     T.unsafe(self).alias_method(:line_number, :fragment)

data/lib/ruby_lsp/server.rb

@@ -7,6 +7,8 @@ module RubyLsp
   Handler.start do
     on("initialize") do |request|
       store.clear
+      store.encoding = request.dig(:params, :capabilities, :general, :positionEncodings)
+
       initialization_options = request.dig(:params, :initializationOptions)
       enabled_features = initialization_options.fetch(:enabledFeatures, [])
 
@@ -38,10 +40,8 @@ module RubyLsp
             token_types: Requests::SemanticHighlighting::TOKEN_TYPES.keys,
             token_modifiers: Requests::SemanticHighlighting::TOKEN_MODIFIERS.keys,
           ),
-          range: false,
-          full: {
-            delta: true,
-          },
+          range: true,
+          full: { delta: false },
         )
       end
 
@@ -168,6 +168,19 @@ module RubyLsp
       end
     end
 
+    on("textDocument/semanticTokens/range", parallel: true) do |request|
+      document = store.get(request.dig(:params, :textDocument, :uri))
+      range = request.dig(:params, :range)
+      start_line = range.dig(:start, :line)
+      end_line = range.dig(:end, :line)
+
+      Requests::SemanticHighlighting.new(
+        document,
+        range: start_line..end_line,
+        encoder: Requests::Support::SemanticTokenEncoder.new,
+      ).run
+    end
+
     on("textDocument/formatting", parallel: true) do |request|
       uri = request.dig(:params, :textDocument, :uri)
 
@@ -192,13 +205,12 @@ module RubyLsp
 
     on("textDocument/codeAction", parallel: true) do |request|
       uri = request.dig(:params, :textDocument, :uri)
+      document = store.get(uri)
       range = request.dig(:params, :range)
       start_line = range.dig(:start, :line)
       end_line = range.dig(:end, :line)
 
-      store.cache_fetch(uri, :code_actions) do |document|
-        Requests::CodeActions.new(uri, document, start_line..end_line).run
-      end
+      Requests::CodeActions.new(uri, document, start_line..end_line).run
     end
 
     on("textDocument/inlayHint", parallel: true) do |request|

data/lib/ruby_lsp/store.rb

@@ -9,9 +9,13 @@ module RubyLsp
   class Store
     extend T::Sig
 
+    sig { params(encoding: String).void }
+    attr_writer :encoding
+
     sig { void }
     def initialize
       @state = T.let({}, T::Hash[String, Document])
+      @encoding = T.let("utf-8", String)
     end
 
     sig { params(uri: String).returns(Document) }
@@ -25,7 +29,7 @@ module RubyLsp
 
     sig { params(uri: String, content: String).void }
     def set(uri, content)
-      document = Document.new(content)
+      document = Document.new(content, @encoding)
       @state[uri] = document
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
 description: An opinionated language server for Ruby
 email:
 - ruby@shopify.com