solargraph 0.32.1 → 0.32.2

data/lib/solargraph/source/cursor.rb

@@ -1,157 +1,157 @@
-module Solargraph
-  class Source
-    # Information about a position in a source, including the word located
-    # there.
-    #
-    class Cursor
-      # @return [Position]
-      attr_reader :position
-
-      # @return [Source]
-      attr_reader :source
-
-      # @param source [Source]
-      # @param position [Position, Array(Integer, Integer)]
-      def initialize source, position
-        @source = source
-        @position = Position.normalize(position)
-      end
-
-      # @return [String]
-      def filename
-        source.filename
-      end
-
-      # The whole word at the current position. Given the text `foo.bar`, the
-      # word at position(0,6) is `bar`.
-      #
-      # @return [String]
-      def word
-        @word ||= start_of_word + end_of_word
-      end
-
-      # The part of the word before the current position. Given the text
-      # `foo.bar`, the start_of_word at position(0, 6) is `ba`.
-      #
-      # @return [String]
-      def start_of_word
-        @start_of_word ||= begin
-          match = source.code[0..offset-1].to_s.match(start_word_pattern)
-          result = (match ? match[0] : '')
-          # Including the preceding colon if the word appears to be a symbol
-          result = ":#{result}" if source.code[0..offset-result.length-1].end_with?(':') and !source.code[0..offset-result.length-1].end_with?('::')
-          result
-        end
-      end
-
-      # The part of the word after the current position. Given the text
-      # `foo.bar`, the end_of_word at position (0,6) is `r`.
-      #
-      # @return [String]
-      def end_of_word
-        @end_of_word ||= begin
-          match = source.code[offset..-1].to_s.match(end_word_pattern)
-          match ? match[0] : ''
-        end
-      end
-
-      def start_of_constant?
-        source.code[offset-2, 2] == '::'
-      end
-
-      # The range of the word at the current position.
-      #
-      # @return [Range]
-      def range
-        @range ||= begin
-          s = Position.from_offset(source.code, offset - start_of_word.length)
-          e = Position.from_offset(source.code, offset + end_of_word.length)
-          Solargraph::Range.new(s, e)
-        end
-      end
-
-      # @return [Chain]
-      def chain
-        @chain ||= SourceChainer.chain(source, position)
-      end
-
-      # @return [Boolean]
-      def argument?
-        @argument ||= !signature_position.nil?
-      end
-
-      # @return [Boolean]
-      def comment?
-        @comment ||= source.comment_at?(position)
-      end
-
-      # @return [Boolean]
-      def string?
-        @string ||= source.string_at?(position)
-      end
-
-      # @return [Cursor, nil]
-      def recipient
-        return nil unless argument?
-        @recipient ||= Cursor.new(source, signature_position)
-      end
-
-      def node_position
-        @node_position ||= begin
-          if start_of_word.empty?
-            match = source.code[0, offset].match(/[\s]*(\.|:+)[\s]*$/)
-            if match
-              Position.from_offset(source.code, offset - match[0].length)
-            else
-              position
-            end
-          else
-            position
-          end
-        end
-      end
-
-      private
-
-      # @return [Integer]
-      def offset
-        @offset ||= Position.to_offset(source.code, position)
-      end
-
-      # A regular expression to find the start of a word from an offset.
-      #
-      # @return [Regexp]
-      def start_word_pattern
-        /(@{1,2}|\$)?([a-z0-9_]|[^\u0000-\u007F])*\z/i
-      end
-
-      # A regular expression to find the end of a word from an offset.
-      #
-      # @return [Regexp]
-      def end_word_pattern
-        /^([a-z0-9_]|[^\u0000-\u007F])*[\?\!]?/i
-      end
-
-      def signature_position
-        if @signature_position.nil?
-          open_parens = 0
-          cursor = offset - 1
-          while cursor >= 0
-            break if cursor < 0
-            if source.code[cursor] == ')'
-              open_parens -= 1
-            elsif source.code[cursor] == '('
-              open_parens += 1
-            end
-            break if open_parens == 1
-            cursor -= 1
-          end
-          if cursor >= 0
-            @signature_position = Position.from_offset(source.code, cursor)
-          end
-        end
-        @signature_position
-      end
-    end
-  end
-end
+module Solargraph
+  class Source
+    # Information about a position in a source, including the word located
+    # there.
+    #
+    class Cursor
+      # @return [Position]
+      attr_reader :position
+
+      # @return [Source]
+      attr_reader :source
+
+      # @param source [Source]
+      # @param position [Position, Array(Integer, Integer)]
+      def initialize source, position
+        @source = source
+        @position = Position.normalize(position)
+      end
+
+      # @return [String]
+      def filename
+        source.filename
+      end
+
+      # The whole word at the current position. Given the text `foo.bar`, the
+      # word at position(0,6) is `bar`.
+      #
+      # @return [String]
+      def word
+        @word ||= start_of_word + end_of_word
+      end
+
+      # The part of the word before the current position. Given the text
+      # `foo.bar`, the start_of_word at position(0, 6) is `ba`.
+      #
+      # @return [String]
+      def start_of_word
+        @start_of_word ||= begin
+          match = source.code[0..offset-1].to_s.match(start_word_pattern)
+          result = (match ? match[0] : '')
+          # Including the preceding colon if the word appears to be a symbol
+          result = ":#{result}" if source.code[0..offset-result.length-1].end_with?(':') and !source.code[0..offset-result.length-1].end_with?('::')
+          result
+        end
+      end
+
+      # The part of the word after the current position. Given the text
+      # `foo.bar`, the end_of_word at position (0,6) is `r`.
+      #
+      # @return [String]
+      def end_of_word
+        @end_of_word ||= begin
+          match = source.code[offset..-1].to_s.match(end_word_pattern)
+          match ? match[0] : ''
+        end
+      end
+
+      def start_of_constant?
+        source.code[offset-2, 2] == '::'
+      end
+
+      # The range of the word at the current position.
+      #
+      # @return [Range]
+      def range
+        @range ||= begin
+          s = Position.from_offset(source.code, offset - start_of_word.length)
+          e = Position.from_offset(source.code, offset + end_of_word.length)
+          Solargraph::Range.new(s, e)
+        end
+      end
+
+      # @return [Chain]
+      def chain
+        @chain ||= SourceChainer.chain(source, position)
+      end
+
+      # @return [Boolean]
+      def argument?
+        @argument ||= !signature_position.nil?
+      end
+
+      # @return [Boolean]
+      def comment?
+        @comment ||= source.comment_at?(position)
+      end
+
+      # @return [Boolean]
+      def string?
+        @string ||= source.string_at?(position)
+      end
+
+      # @return [Cursor, nil]
+      def recipient
+        return nil unless argument?
+        @recipient ||= Cursor.new(source, signature_position)
+      end
+
+      def node_position
+        @node_position ||= begin
+          if start_of_word.empty?
+            match = source.code[0, offset].match(/[\s]*(\.|:+)[\s]*$/)
+            if match
+              Position.from_offset(source.code, offset - match[0].length)
+            else
+              position
+            end
+          else
+            position
+          end
+        end
+      end
+
+      private
+
+      # @return [Integer]
+      def offset
+        @offset ||= Position.to_offset(source.code, position)
+      end
+
+      # A regular expression to find the start of a word from an offset.
+      #
+      # @return [Regexp]
+      def start_word_pattern
+        /(@{1,2}|\$)?([a-z0-9_]|[^\u0000-\u007F])*\z/i
+      end
+
+      # A regular expression to find the end of a word from an offset.
+      #
+      # @return [Regexp]
+      def end_word_pattern
+        /^([a-z0-9_]|[^\u0000-\u007F])*[\?\!]?/i
+      end
+
+      def signature_position
+        if @signature_position.nil?
+          open_parens = 0
+          cursor = offset - 1
+          while cursor >= 0
+            break if cursor < 0
+            if source.code[cursor] == ')'
+              open_parens -= 1
+            elsif source.code[cursor] == '('
+              open_parens += 1
+            end
+            break if open_parens == 1
+            cursor -= 1
+          end
+          if cursor >= 0
+            @signature_position = Position.from_offset(source.code, cursor)
+          end
+        end
+        @signature_position
+      end
+    end
+  end
+end

data/lib/solargraph/source/node_chainer.rb

@@ -1,96 +1,96 @@
-module Solargraph
-  class Source
-    # A factory for generating chains from nodes.
-    #
-    class NodeChainer
-      include Source::NodeMethods
-
-      # @param node [Parser::AST::Node]
-      # @param filename [String]
-      def initialize node, filename = nil
-        @node = node
-        @filename = filename
-      end
-
-      # @return [Source::Chain]
-      def chain
-        links = generate_links(@node)
-        Chain.new(links)
-      end
-
-      class << self
-        # @param node [Parser::AST::Node]
-        # @param filename [String]
-        # @return [Chain]
-        def chain node, filename = nil
-          NodeChainer.new(node, filename).chain
-        end
-
-        # @param code [String]
-        # @return [Chain]
-        def load_string(code)
-          node = Source.parse(code.sub(/\.$/, ''))
-          chain = NodeChainer.new(node).chain
-          chain.links.push(Chain::Link.new) if code.end_with?('.')
-          chain
-        end
-      end
-
-      private
-
-      # @param n [Parser::AST::Node]
-      # @return [Array<Chain::Link>]
-      def generate_links n
-        return [] unless n.is_a?(Parser::AST::Node)
-        return generate_links(n.children[0]) if n.type == :begin
-        # @todo This might not be right. It's weird either way.
-        # return generate_links(n.children[2] || n.children[0]) if n.type == :block
-        result = []
-        if n.type == :block
-          result.concat generate_links(n.children[0])
-        elsif n.type == :send
-          if n.children[0].is_a?(Parser::AST::Node)
-            result.concat generate_links(n.children[0])
-            args = []
-            n.children[2..-1].each do |c|
-              args.push NodeChainer.chain(c)
-            end
-            result.push Chain::Call.new(n.children[1].to_s, args)
-          elsif n.children[0].nil?
-            args = []
-            n.children[2..-1].each do |c|
-              args.push NodeChainer.chain(c)
-            end
-            result.push Chain::Call.new(n.children[1].to_s, args)
-          else
-            raise "No idea what to do with #{n}"
-          end
-        elsif n.type == :self
-          result.push Chain::Head.new('self')
-        elsif n.type == :zsuper
-          result.push Chain::Head.new('super')
-        elsif n.type == :const
-          const = unpack_name(n)
-          result.push Chain::Constant.new(const)
-        elsif [:lvar, :lvasgn].include?(n.type)
-          result.push Chain::Call.new(n.children[0].to_s)
-        elsif [:ivar, :ivasgn].include?(n.type)
-          result.push Chain::InstanceVariable.new(n.children[0].to_s)
-        elsif [:cvar, :cvasgn].include?(n.type)
-          result.push Chain::ClassVariable.new(n.children[0].to_s)
-        elsif [:gvar, :gvasgn].include?(n.type)
-          result.push Chain::GlobalVariable.new(n.children[0].to_s)
-        elsif n.type == :or_asgn
-          result.concat generate_links n.children[1]
-        elsif [:class, :module, :def, :defs].include?(n.type)
-          # @todo Undefined or what?
-          result.push Chain::UNDEFINED_CALL
-        else
-          lit = infer_literal_node_type(n)
-          result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
-        end
-        result
-      end
-    end
-  end
-end
+module Solargraph
+  class Source
+    # A factory for generating chains from nodes.
+    #
+    class NodeChainer
+      include Source::NodeMethods
+
+      # @param node [Parser::AST::Node]
+      # @param filename [String]
+      def initialize node, filename = nil
+        @node = node
+        @filename = filename
+      end
+
+      # @return [Source::Chain]
+      def chain
+        links = generate_links(@node)
+        Chain.new(links)
+      end
+
+      class << self
+        # @param node [Parser::AST::Node]
+        # @param filename [String]
+        # @return [Chain]
+        def chain node, filename = nil
+          NodeChainer.new(node, filename).chain
+        end
+
+        # @param code [String]
+        # @return [Chain]
+        def load_string(code)
+          node = Source.parse(code.sub(/\.$/, ''))
+          chain = NodeChainer.new(node).chain
+          chain.links.push(Chain::Link.new) if code.end_with?('.')
+          chain
+        end
+      end
+
+      private
+
+      # @param n [Parser::AST::Node]
+      # @return [Array<Chain::Link>]
+      def generate_links n
+        return [] unless n.is_a?(Parser::AST::Node)
+        return generate_links(n.children[0]) if n.type == :begin
+        # @todo This might not be right. It's weird either way.
+        # return generate_links(n.children[2] || n.children[0]) if n.type == :block
+        result = []
+        if n.type == :block
+          result.concat generate_links(n.children[0])
+        elsif n.type == :send
+          if n.children[0].is_a?(Parser::AST::Node)
+            result.concat generate_links(n.children[0])
+            args = []
+            n.children[2..-1].each do |c|
+              args.push NodeChainer.chain(c)
+            end
+            result.push Chain::Call.new(n.children[1].to_s, args)
+          elsif n.children[0].nil?
+            args = []
+            n.children[2..-1].each do |c|
+              args.push NodeChainer.chain(c)
+            end
+            result.push Chain::Call.new(n.children[1].to_s, args)
+          else
+            raise "No idea what to do with #{n}"
+          end
+        elsif n.type == :self
+          result.push Chain::Head.new('self')
+        elsif n.type == :zsuper
+          result.push Chain::Head.new('super')
+        elsif n.type == :const
+          const = unpack_name(n)
+          result.push Chain::Constant.new(const)
+        elsif [:lvar, :lvasgn].include?(n.type)
+          result.push Chain::Call.new(n.children[0].to_s)
+        elsif [:ivar, :ivasgn].include?(n.type)
+          result.push Chain::InstanceVariable.new(n.children[0].to_s)
+        elsif [:cvar, :cvasgn].include?(n.type)
+          result.push Chain::ClassVariable.new(n.children[0].to_s)
+        elsif [:gvar, :gvasgn].include?(n.type)
+          result.push Chain::GlobalVariable.new(n.children[0].to_s)
+        elsif n.type == :or_asgn
+          result.concat generate_links n.children[1]
+        elsif [:class, :module, :def, :defs].include?(n.type)
+          # @todo Undefined or what?
+          result.push Chain::UNDEFINED_CALL
+        else
+          lit = infer_literal_node_type(n)
+          result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
+        end
+        result
+      end
+    end
+  end
+end