Move encoder into the Requests::Support namespace

Shopify · May 13, 2022 · e9009b3 · e9009b3
1 parent 48101ad
commit e9009b3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 53 deletions.
diff --git a/lib/ruby_lsp/encoder/relative.rb b/lib/ruby_lsp/encoder/relative.rb
diff --git a/lib/ruby_lsp/handler.rb b/lib/ruby_lsp/handler.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "ruby_lsp/encoder/relative"
 require "ruby_lsp/requests"
 require "ruby_lsp/store"
 require "benchmark"
@@ -126,7 +125,7 @@ def respond_with_selection_ranges(uri, positions)
 
     def respond_with_semantic_highlighting(uri)
       store.cache_fetch(uri, :semantic_highlighting) do |document|
-        Requests::SemanticHighlighting.new(document, encoder: Encoder::Relative).run
+        Requests::SemanticHighlighting.new(document, encoder: Requests::Support::SemanticTokenEncoder).run
       end
     end
 

diff --git a/lib/ruby_lsp/requests.rb b/lib/ruby_lsp/requests.rb
@@ -15,6 +15,7 @@ module Requests
     module Support
       autoload :RuboCopDiagnostic, "ruby_lsp/requests/support/rubocop_diagnostic"
       autoload :SelectionRange, "ruby_lsp/requests/support/selection_range"
+      autoload :SemanticTokenEncoder, "ruby_lsp/requests/support/semantic_token_encoder"
       autoload :SyntaxErrorDiagnostic, "ruby_lsp/requests/support/syntax_error_diagnostic"
     end
   end

diff --git a/test/requests/semantic_highlighting_test.rb b/test/requests/semantic_highlighting_test.rb
@@ -223,7 +223,8 @@ def some_method
 
   def assert_tokens(expected, source_code)
     document = RubyLsp::Document.new(source_code)
-    tokens = RubyLsp::Requests::SemanticHighlighting.new(document, encoder: RubyLsp::Encoder::Relative).run
+    tokens = RubyLsp::Requests::SemanticHighlighting.new(document,
+      encoder: RubyLsp::Requests::Support::SemanticTokenEncoder).run
 
     assert_equal(
       inline_tokens(expected),