Refactor RbsMap::Conversions

.github/workflows/plugins.yml

@@ -118,9 +118,12 @@ jobs:
     - name: clone https://github.com/lekemula/solargraph-rspec/
       run: |
        cd ..
-       git clone https://github.com/lekemula/solargraph-rspec.git
+       # git clone https://github.com/lekemula/solargraph-rspec.git
 
+       # pending https://github.com/lekemula/solargraph-rspec/pull/31
+       git clone https://github.com/apiology/solargraph-rspec.git
        cd solargraph-rspec
+       git checkout test_solargraph_prereleases
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

.gitignore

@@ -14,3 +14,4 @@ coverage
 /Makefile
 /.pryrc
 /.rspec-local
+vendor/cache

CHANGELOG.md

@@ -1,5 +1,11 @@
+## 0.58.2 - January 19, 2026
+- Avoid rbs pollution (#1146)
+- Fix 'solargraph pin --references ClassName' private method call (#1150)
+- Improve memory efficiency of Position class (#1054)
+- Raise InvalidOffsetError for offsets > text (#1155)
+
 ## 0.58.1 - January 2, 2026
--  Normalize line endings to LF (#1142)
+- Normalize line endings to LF (#1142)
 
 ## 0.58.0 - January 1, 2026
 - Faster constant resolution (#1083)

lib/solargraph/pin/reference.rb

@@ -12,6 +12,22 @@ class Reference < Base
 
       attr_reader :generic_values
 
+      # A Reference is a pin that associates a type with another type.
+      # The existing type is marked as the closure.  The name of the
+      # type we're associating with it is the 'name' field, and
+      # subtypes are in the 'generic_values' field.
+      #
+      # These pins are a little different - the name is a rooted name,
+      # which may be relative or absolute, preceded with ::, not a
+      # fully qualified namespace, which is implicitly in the root
+      # namespace and is never preceded by ::.
+      #
+      # @todo can the above be represented in a less subtle way?
+      # @todo consider refactoring so that we can replicate more
+      # complex types like Hash{String => Integer} and has both key
+      # types and subtypes.
+      #
+      # @param name [String] rooted name of the referenced type
       # @param generic_values [Array<String>]
       def initialize generic_values: [], **splat
         super(**splat)

lib/solargraph/position.rb

@@ -57,7 +57,24 @@ def inspect
     # @return [Integer]
     def self.to_offset text, position
       return 0 if text.empty?
-      text.lines[0...position.line].sum(&:length) + position.character
+
+      newline_index = -1
+      line = -1
+      last_line_index = 0
+
+      # @sg-ignore flow sensitive typing should be able to handle redefinition
+      while (newline_index = text.index("\n", newline_index + 1)) && line <= position.line
+        line += 1
+        break if line == position.line
+
+        # @sg-ignore oflow sensitive typing should be able to handle redefinition
+        line_length = newline_index - last_line_index
+        last_line_index = newline_index
+      end
+
+      last_line_index += 1 if position.line > 0
+      # @sg-ignore flow sensitive typing should be able to handle redefinition
+      last_line_index + position.character
     end
 
     # Get a numeric offset for the specified text and a position identified
@@ -73,23 +90,24 @@ def self.line_char_to_offset text, line, character
 
     # Get a position for the specified text and offset.
     #
+    # @raise [InvalidOffsetError] if the offset is outside the text range
+    #
     # @param text [String]
     # @param offset [Integer]
     # @return [Position]
     def self.from_offset text, offset
+      raise InvalidOffsetError if offset > text.length
+
       cursor = 0
       line = 0
-      # @type [Integer, nil]
-      character = nil
-      text.lines.each do |l|
-        line_length = l.length
-        char_length = l.chomp.length
-        if cursor + char_length >= offset
-          character = offset - cursor
-          break
-        end
-        cursor += line_length
+      character = offset
+      newline_index = -1
+
+      # @sg-ignore flow sensitive typing should be able to handle redefinition
+      while (newline_index = text.index("\n", newline_index + 1)) && newline_index < offset
         line += 1
+        # @sg-ignore flow sensitive typing should be able to handle redefinition
+        character = offset - newline_index - 1
       end
       character = 0 if character.nil? and (cursor - offset).between?(0, 1)
       raise InvalidOffsetError if character.nil?