ruby-lsp-i18n 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0fdc0478778d6e3c1f0a1214050b93bbf1e7fc5e88f1ca0b9600e1936d2952
-  data.tar.gz: 26070828190643f05f77cef165b995810eec828510ae78def86cae0d65588ad9
+  metadata.gz: ef50020995375f664510365b17c970d6732fd3affec58a902fd7865244ae6702
+  data.tar.gz: 362f3463407c6fa6fad0ea4f3121c4ed3f66ceb4ab079e32be4187da25c65e53
 SHA512:
-  metadata.gz: 5a9da889bf6f3fdb0ef5b773c7dd64c1b210cb62ff438b314b43ee1d57778324d7ada0ab36745119b9cb32b1080d6bb1988618b9a269a3232d2343d85e0bf8ce
-  data.tar.gz: f198ccadd9f2e09dccb32f149e030a901a8f479042d34aac0d4301bb822bfaabb4160991d913b1b3b94721de01ef848aa13beb32c389933bceb1392c56f22404
+  metadata.gz: 2ffebae3651d61ce648fb155ebf3b27f7456fabd93c931c57a26127e52e143bc18cc3843dbfb72203af91a0c7e47885968e5c0cbda96fad122f19dbc650037d6
+  data.tar.gz: 91ceb189f956e6f983084f74214ad21b55ce85b90e67eb6b6e96ef8313d1a16311478f15d770c68875dc3fb77868d4fb65a76cfa336f8bc873e989b276da5db7

data/.rubocop.yml

@@ -11,3 +11,6 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LineLength:
   Max: 120
+
+Layout/LeadingCommentSpace:
+  AllowRBSInlineAnnotation: true

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.4.0] - 2025-07-18
+
+- Removed sorbet runtime dependency
+- Fix bad use of generics because of RubyLsp sorbet runtime removal
+- Updated RubyLsp to 0.25
+
 ## [0.3.0] - 2025-07-18
 
 - Fix inlay hints patch thanks to [@enmy](https://github.com/enmy)

data/lib/ruby_lsp/ruby_lsp_i18n/addon.rb

@@ -8,24 +8,23 @@ require_relative "listeners/completion"
 require_relative "i18n_index"
 require_relative "../../ruby_lsp_i18n/version"
 
-RubyLsp::Addon.depend_on_ruby_lsp!("~> 0.24.0")
+RubyLsp::Addon.depend_on_ruby_lsp!("~> 0.25.0")
 
 module RubyLsp
   module RubyLspI18n
     GLOB_PATH = "**/config/locales/**/es.yml"
     # This class is the entry point for the addon. It is responsible for activating and deactivating the addon
     class Addon < ::RubyLsp::Addon
-      extend T::Sig
-
-      sig { void }
+      #: -> void
       def initialize
         super
-        @i18n_index = T.let(I18nIndex.new(language: "es"), I18nIndex)
-        @enabled = T.let(true, T::Boolean)
+        @i18n_index = I18nIndex.new(language: "es") #: I18nIndex
+        @enabled = true #: bool
       end
 
       # Performs any activation that needs to happen once when the language server is booted)}
-      sig { override.params(global_state: RubyLsp::GlobalState, message_queue: Thread::Queue).void }
+      # @override
+      #: (RubyLsp::GlobalState, Thread::Queue) -> void
       def activate(global_state, message_queue)
         settings = global_state.settings_for_addon(name) || {}
         @enabled = settings[:enabled] if settings.key?(:enabled)
@@ -60,14 +59,15 @@ module RubyLsp
       end
 
       # Performs any cleanup when shutting down the server, like terminating a subprocess
-      sig { override.void }
+      # @override
+      #: -> void
       def deactivate; end
 
-      sig { params(changes: T::Array[T::Hash[Symbol, T.untyped]]).void }
+      #: (Array[Hash[Symbol, untyped]]) -> void
       def workspace_did_change_watched_files(changes)
         changes.each do |change|
           change = Interface::FileEvent.new(uri: change[:uri], type: change[:type])
-          uri = T.let(change.uri, String)
+          uri = change.uri #: String
 
           next unless uri.end_with?("es.yml")
 
@@ -80,38 +80,27 @@ module RubyLsp
         end
       end
 
-      sig { override.returns(String) }
+      # @override
+      #: -> String
       def version
         RubyLsp::RubyLspI18n::VERSION
       end
 
       # Returns the name of the addon
-      sig { override.returns(String) }
+      # @override
+      #: -> String
       def name
         "Ruby LSP I18n"
       end
 
-      sig do
-        params(
-          response_builder: ResponseBuilders::CollectionResponseBuilder,
-          dispatcher: Prism::Dispatcher,
-          document: T.any(RubyDocument, ERBDocument),
-        ).void
-      end
+      #: (ResponseBuilders::CollectionResponseBuilder, Prism::Dispatcher, (RubyDocument | ERBDocument)) -> void
       def create_inlay_hints_listener(response_builder, dispatcher, document)
         return unless @enabled
 
         InlayHints.new(@i18n_index, response_builder, dispatcher, document)
       end
 
-      sig do
-        override.params(
-          response_builder: RubyLsp::ResponseBuilders::CollectionResponseBuilder,
-          node_context: RubyLsp::NodeContext,
-          dispatcher: Prism::Dispatcher,
-          uri: URI::Generic,
-        ).void
-      end
+      #: (RubyLsp::ResponseBuilders::CollectionResponseBuilder, RubyLsp::NodeContext, Prism::Dispatcher, URI::Generic) -> void
       def create_completion_listener(response_builder, node_context, dispatcher, uri)
         return unless @enabled
 
@@ -124,14 +113,7 @@ end
 # Patch the InlayHints request to support addons
 module RubyLsp
   class Addon
-    extend T::Sig
-    sig do
-      params(
-        response_builder: ResponseBuilders::CollectionResponseBuilder,
-        dispatcher: Prism::Dispatcher,
-        document: T.any(RubyDocument, ERBDocument),
-      ).void
-    end
+    #: (ResponseBuilders::CollectionResponseBuilder, Prism::Dispatcher, (RubyDocument | ERBDocument)) -> void
     def create_inlay_hints_listener(response_builder, dispatcher, document)
     end
   end

data/lib/ruby_lsp/ruby_lsp_i18n/i18n_index.rb

@@ -8,15 +8,13 @@ module RubyLsp
     # to their values and the files they are defined in.
 
     class Entry
-      extend T::Sig
-
-      sig { returns(String) }
+      #: String
       attr_reader :value
 
-      sig { returns(String) }
+      #: String
       attr_reader :file
 
-      sig { params(value: String, file: String).void }
+      #: (String, String) -> void
       def initialize(value, file)
         @value = value
         @file = file
@@ -24,59 +22,58 @@ module RubyLsp
     end
 
     class I18nIndex
-      extend T::Sig
-
-      sig { params(language: String).void }
+      #: (language: String) -> void
       def initialize(language:)
         @language = language
-        @data = T.let({}, T::Hash[String, T::Array[Entry]])
+        @data = {} #: Hash[String, Array[Entry]]
 
-        @file_keys = T.let(
-          Hash.new do |hash, key|
-            hash[key] = []
-          end,
-          T::Hash[String, T::Array[String]],
-        )
+        @file_keys = Hash.new do |hash, key|
+          hash[key] = []
+        end #: Hash[String, Array[String]]
 
-        @keys_tree = T.let(RubyLsp::RubyLspI18n::PrefixTree.new, RubyLsp::RubyLspI18n::PrefixTree[String])
+        @keys_tree = RubyLsp::RubyLspI18n::PrefixTree.new #: RubyLsp::RubyLspI18n::PrefixTree[String]
       end
 
-      sig { params(key: String, value: String, file: String).void }
+      #: (String key, String value, String file) -> void
       def add(key, value, file)
         entry = Entry.new(value, file)
         @data[key] ||= []
-        T.must(@data[key]) << entry
-        T.must(@file_keys[file]) << key
+        data_key = @data[key] #: as !nil
+        data_key << entry
+        data_file = @file_keys[file] #: as !nil
+        data_file << key
         @keys_tree.insert(key, key)
       end
 
-      sig { params(key: String, file: String).void }
+      #: (String key, String file) -> void
       def remove(key, file)
         return unless @data[key]
 
-        T.must(@data[key]).delete_if { |v| v.file == file }
-        T.must(@file_keys[file]).delete(key)
+        data_key = @data[key] #: as !nil
+        data_key.delete_if { |v| v.file == file }
+        data_file = @file_keys[file] #: as !nil
+        data_file.delete(key)
         @keys_tree.delete(key)
       end
 
-      sig { params(key: String).returns(T::Array[RubyLsp::RubyLspI18n::Entry]) }
+      #: (String key) -> Array[RubyLsp::RubyLspI18n::Entry]
       def find(key)
         datum = @data.dig(key)
         datum.nil? ? [] : datum
       end
 
-      sig { params(prefix: String).returns(T::Array[String]) }
+      #: (String prefix) -> Array[String]
       def find_prefix(prefix)
         @keys_tree.search(prefix)
       end
 
-      sig { params(key: String, value: String, file: String).void }
+      #: (String key, String value, String file) -> void
       def update(key, value, file)
         remove(key, file)
         add(key, value, file)
       end
 
-      sig { params(path: String).void }
+      #: (String path) -> void
       def sync_file(path)
         # Clean entries from the file
         current_keys = get_keys_from_file(path)
@@ -108,12 +105,12 @@ module RubyLsp
 
       private
 
-      sig { params(file: String).returns(T::Array[String]) }
+      #: (String file) -> Array[String]
       def get_keys_from_file(file)
-        T.must(@file_keys[file])
+        @file_keys[file] #: as !nil
       end
 
-      sig { params(translations: T::Hash[String, T.untyped], file: String, prefix: T.nilable(String)).void }
+      #: (Hash[String, untyped] translations, String file, ?String? prefix) -> void
       def process_translations(translations, file, prefix = nil)
         translations.each do |key, value|
           full_key = prefix ? "#{prefix}.#{key}" : key

data/lib/ruby_lsp/ruby_lsp_i18n/listeners/completion.rb

@@ -4,16 +4,9 @@
 module RubyLsp
   module RubyLspI18n
     class Completion
-      extend T::Sig
       include Requests::Support::Common
 
-      sig do
-        params(
-          i18n_index: I18nIndex,
-          response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::CompletionItem],
-          dispatcher: Prism::Dispatcher,
-        ).void
-      end
+      #: (I18nIndex, ResponseBuilders::CollectionResponseBuilder, Prism::Dispatcher) -> void
       def initialize(i18n_index, response_builder, dispatcher)
         @i18n_index = i18n_index
         @response_builder = response_builder
@@ -25,7 +18,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode) -> void
       def on_call_node_enter(node)
         return unless node.name == :t
 
@@ -42,7 +35,8 @@ module RubyLsp
         return unless key_node.is_a?(Prism::StringNode)
 
         key = key_node.unescaped
-        quote = T.must(key_node.opening_loc).slice
+        opening_location = key_node.opening_loc #: as !nil
+        quote = opening_location.slice
         candidates = @i18n_index.find_prefix(key)
 
         candidates.each do |candidate|

data/lib/ruby_lsp/ruby_lsp_i18n/listeners/inlay_hints.rb

@@ -4,21 +4,13 @@
 module RubyLsp
   module RubyLspI18n
     class InlayHints
-      extend T::Sig
       include Requests::Support::Common
 
-      sig do
-        params(
-          i18n_index: I18nIndex,
-          response_builder: ResponseBuilders::CollectionResponseBuilder[Interface::InlayHint],
-          dispatcher: Prism::Dispatcher,
-          document: T.any(RubyDocument, ERBDocument),
-        ).void
-      end
+      #: (I18nIndex, ResponseBuilders::CollectionResponseBuilder, Prism::Dispatcher, (RubyDocument | ERBDocument)) -> void
       def initialize(i18n_index, response_builder, dispatcher, document)
-        absolute_path = T.must(document.uri.path)
-        @absolute_path = T.let(absolute_path, String)
-        @path = T.let(Pathname(absolute_path).relative_path_from(Dir.pwd), Pathname)
+        absolute_path = document.uri.path
+        @absolute_path = absolute_path #: String
+        @path = Pathname(absolute_path).relative_path_from(Dir.pwd) #: Pathname
         @i18n_index = i18n_index
         @response_builder = response_builder
 
@@ -28,7 +20,7 @@ module RubyLsp
         )
       end
 
-      sig { params(node: Prism::CallNode).void }
+      #: (Prism::CallNode) -> void
       def on_call_node_enter(node)
         return unless node.name == :t
 
@@ -87,13 +79,13 @@ module RubyLsp
 
       private
 
-      sig { params(path: String).returns(String) }
+      #: (String path) -> String
       def create_file_uri(path)
         base_uri = "file://#{Dir.pwd}/"
         URI.join(base_uri, path).to_s
       end
 
-      sig { params(arguments: Prism::ArgumentsNode).returns(T::Boolean) }
+      #: (Prism::ArgumentsNode arguments) -> bool
       def i18n_arguments_has_scope_argument(arguments)
         arguments = arguments.arguments
         return false if arguments.size <= 1

data/lib/ruby_lsp/ruby_lsp_i18n/prefix_tree.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module RubyLsp
@@ -35,15 +35,14 @@ module RubyLsp
     # `Value` type.
     #
     # See https://en.wikipedia.org/wiki/Trie for more information
+    #: [Value]
     class PrefixTree
-      extend T::Sig
-      extend T::Generic
-
-      Value = type_member
-
-      sig { void }
+      #: -> void
       def initialize
-        @root = T.let(Node.new("", ""), Node[Value])
+        @root = Node.new(
+          "",
+          "", #: as untyped
+        ) #: Node[Value]
       end
 
       # Search the PrefixTree based on a given `prefix`. If `foo` is an entry in the tree, then searching for `fo` will
@@ -51,7 +50,7 @@ module RubyLsp
       # Notice that if the `Value` is an array, this method will return an array of arrays, where each entry is
       # the array
       # of values for a given match
-      sig { params(prefix: String).returns(T::Array[Value]) }
+      #: (String prefix) -> Array[Value]
       def search(prefix)
         node = find_node(prefix)
         return [] unless node
@@ -60,7 +59,7 @@ module RubyLsp
       end
 
       # Inserts a `value` using the given `key`
-      sig { params(key: String, value: Value).void }
+      #: (String key, Value value) -> void
       def insert(key, value)
         node = @root
 
@@ -77,13 +76,13 @@ module RubyLsp
 
       # Deletes the entry identified by `key` from the tree. Notice that a partial match will still delete all entries
       # that match it. For example, if the tree contains `foo` and we ask to delete `fo`, then `foo` will be deleted
-      sig { params(key: String).void }
+      #: (String key) -> void
       def delete(key)
         node = find_node(key)
         return unless node
 
         # Remove the node from the tree and then go up the parents to remove any of them with empty children
-        parent = T.let(T.must(node.parent), T.nilable(Node[Value]))
+        parent = node.parent #: Node[Value]?
 
         while parent
           parent.children.delete(node.key)
@@ -97,7 +96,7 @@ module RubyLsp
       private
 
       # Find a node that matches the given `key`
-      sig { params(key: String).returns(T.nilable(Node[Value])) }
+      #: (String key) -> Node[Value]?
       def find_node(key)
         node = @root
 
@@ -111,37 +110,33 @@ module RubyLsp
         node
       end
 
+      #: [Value]
       class Node
-        extend T::Sig
-        extend T::Generic
-
-        Value = type_member
-
-        sig { returns(T::Hash[String, Node[Value]]) }
+        #: Hash[String, Node[Value]]
         attr_reader :children
 
-        sig { returns(String) }
+        #: String
         attr_reader :key
 
-        sig { returns(Value) }
+        #: Value
         attr_accessor :value
 
-        sig { returns(T::Boolean) }
+        #: bool
         attr_accessor :leaf
 
-        sig { returns(T.nilable(Node[Value])) }
+        #: Node[Value]?
         attr_reader :parent
 
-        sig { params(key: String, value: Value, parent: T.nilable(Node[Value])).void }
+        #: (String key, Value value, ?Node[Value]? parent) -> void
         def initialize(key, value, parent = nil)
           @key = key
           @value = value
           @parent = parent
-          @children = {}
-          @leaf = false
+          @children = {} #: Hash[String, Node[Value]]
+          @leaf = false #: bool
         end
 
-        sig { returns(T::Array[Value]) }
+        #: -> Array[Value]
         def collect
           result = []
           result << @value if @leaf

data/lib/ruby_lsp/ruby_lsp_i18n/requests/inlay_hints.rb

@@ -6,19 +6,9 @@
 module RubyLsp
   module Requests
     module InlayHintsPatch
-      extend T::Sig
-      extend T::Helpers
-
-      requires_ancestor { InlayHints }
-
-      sig do
-        params(
-          document: T.any(RubyDocument, ERBDocument),
-          hints_configuration: RequestConfig,
-          dispatcher: Prism::Dispatcher,
-        ).void
-      end
-      def initialize(document, hints_configuration, dispatcher)
+      # @requires_ancestor: Kernel
+      #: (RubyLsp::GlobalState, RubyDocument | ERBDocument, Prism::Dispatcher) -> void
+      def initialize(global_state, document, dispatcher)
         super
 
         Addon.addons.each do |addon|

data/lib/ruby_lsp_i18n/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module RubyLspI18n
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/sorbet/config

@@ -2,3 +2,5 @@
 .
 --ignore=tmp/
 --ignore=vendor/
+--enable-experimental-rbs-comments
+--enable-experimental-requires-ancestor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-i18n
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - domingo2000
@@ -38,6 +38,7 @@ files:
 - lib/ruby_lsp_i18n.rb
 - lib/ruby_lsp_i18n/version.rb
 - media/demo.gif
+- ruby-lsp-i18n-0.3.0.gem
 - ruby-lsp-i18n.gemspec
 - sorbet/config
 - sorbet/rbi/annotations/.gitattributes