solargraph 0.59.0.dev.1 → 0.59.0

data/lib/solargraph/position.rb

@@ -21,12 +21,8 @@ module Solargraph
       @character = character
     end
 
-    protected def equality_fields
-      [line, character]
-    end
-
     # @param other [Position]
-    def <=>(other)
+    def <=> other
       return nil unless other.is_a?(Position)
       if line == other.line
         character <=> other.character
@@ -57,7 +53,24 @@ module Solargraph
     # @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 Typechecker thinks `newline_index` inside of the assignment
+      #   can be nil
+      while (newline_index = text.index("\n", newline_index + 1)) && line <= position.line
+        line += 1
+        break if line == position.line
+
+        last_line_index = newline_index
+      end
+
+      last_line_index += 1 if position.line.positive?
+      # @sg-ignore `last_line_index` is always an Integer because `newline_index`
+      #   is never nil inside the while block
+      last_line_index + position.character
     end
 
     # Get a numeric offset for the specified text and a position identified
@@ -73,25 +86,27 @@ module Solargraph
 
     # 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 Typechecker thinks `newline_index` inside of the assignment
+      #   can be nil
+      while (newline_index = text.index("\n", newline_index + 1)) && newline_index < offset
         line += 1
+        # @sg-ignore `newline_index` is always an Integer inside the while block
+        character = offset - newline_index - 1
       end
-      character = 0 if character.nil? and (cursor - offset).between?(0, 1)
+      character = 0 if character.nil? && (cursor - offset).between?(0, 1)
       raise InvalidOffsetError if character.nil?
       # @sg-ignore flow sensitive typing needs to handle 'raise if'
       Position.new(line, character)
@@ -114,5 +129,11 @@ module Solargraph
       return false unless other.is_a?(Position)
       line == other.line and character == other.character
     end
+
+    protected
+
+    def equality_fields
+      [line, character]
+    end
   end
 end

data/lib/solargraph/range.rb

@@ -19,12 +19,8 @@ module Solargraph
       @ending = ending
     end
 
-    protected def equality_fields
-      [start, ending]
-    end
-
     # @param other [BasicObject]
-    def <=>(other)
+    def <=> other
       return nil unless other.is_a?(Range)
       if start == other.start
         ending <=> other.ending
@@ -36,7 +32,7 @@ module Solargraph
     # Get a hash of the range. This representation is suitable for use in
     # the language server protocol.
     #
-    # @return [Hash<Symbol, Position>]
+    # @return [Hash{Symbol => Position}]
     def to_hash
       {
         start: start.to_hash,
@@ -86,9 +82,8 @@ module Solargraph
     # @param node [::Parser::AST::Node]
     # @return [Range, nil]
     def self.from_node node
-      if node&.loc && node.loc.expression
-        from_expr(node.loc.expression)
-      end
+      return unless node&.loc&.expression
+      from_expr(node.loc.expression)
     end
 
     # Get a range from a Parser range, usually found in
@@ -108,5 +103,11 @@ module Solargraph
     def inspect
       "#<#{self.class} #{start.inspect} to #{ending.inspect}>"
     end
+
+    protected
+
+    def equality_fields
+      [start, ending]
+    end
   end
 end