solargraph 0.44.2 → 0.46.0

data/lib/solargraph/pin/reference/extend.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference
-      class Extend < Reference
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference
+      class Extend < Reference
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference/include.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference
-      class Include < Reference
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference
+      class Include < Reference
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference/override.rb

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference
-      class Override < Reference
-        # @return [Array<YARD::Tags::Tag>]
-        attr_reader :tags
-
-        # @return [Array<Symbol>]
-        attr_reader :delete
-
-        def initialize location, name, tags, delete = []
-          super(location: location, name: name)
-          @tags = tags
-          @delete = delete
-        end
-
-        def self.method_return name, *tags, delete: []
-          new(nil, name, [YARD::Tags::Tag.new('return', nil, tags)], delete)
-        end
-
-        def self.from_comment name, comment
-          new(nil, name, Solargraph::Source.parse_docstring(comment).to_docstring.tags)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference
+      class Override < Reference
+        # @return [Array<YARD::Tags::Tag>]
+        attr_reader :tags
+
+        # @return [Array<Symbol>]
+        attr_reader :delete
+
+        def initialize location, name, tags, delete = []
+          super(location: location, name: name)
+          @tags = tags
+          @delete = delete
+        end
+
+        def self.method_return name, *tags, delete: []
+          new(nil, name, [YARD::Tags::Tag.new('return', nil, tags)], delete)
+        end
+
+        def self.from_comment name, comment
+          new(nil, name, Solargraph::Source.parse_docstring(comment).to_docstring.tags)
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference/prepend.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference
-      class Prepend < Reference
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference
+      class Prepend < Reference
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference/require.rb

@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference
-      class Require < Reference
-        def initialize location, name
-          # super(location, '', name)
-          super(location: location, name: name)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference
+      class Require < Reference
+        def initialize location, name
+          # super(location, '', name)
+          super(location: location, name: name)
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference/superclass.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference
-      class Superclass < Reference
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference
+      class Superclass < Reference
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference.rb

@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference < Base
-      autoload :Require,    'solargraph/pin/reference/require'
-      autoload :Superclass, 'solargraph/pin/reference/superclass'
-      autoload :Include,    'solargraph/pin/reference/include'
-      autoload :Prepend,    'solargraph/pin/reference/prepend'
-      autoload :Extend,     'solargraph/pin/reference/extend'
-      autoload :Override,   'solargraph/pin/reference/override'
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference < Base
+      autoload :Require,    'solargraph/pin/reference/require'
+      autoload :Superclass, 'solargraph/pin/reference/superclass'
+      autoload :Include,    'solargraph/pin/reference/include'
+      autoload :Prepend,    'solargraph/pin/reference/prepend'
+      autoload :Extend,     'solargraph/pin/reference/extend'
+      autoload :Override,   'solargraph/pin/reference/override'
+    end
+  end
+end

data/lib/solargraph/pin/search.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'jaro_winkler'
+
+module Solargraph
+  module Pin
+    class Search
+      class Result
+        # @return [Float]
+        attr_reader :match
+
+        # @return [Pin::Base]
+        attr_reader :pin
+
+        def initialize match, pin
+          @match = match
+          @pin = pin
+        end
+      end
+
+      # @param pins [Array<Pin::Base>]
+      # @param query [String]
+      def initialize pins, query
+        @pins = pins
+        @query = query
+      end
+
+      # @return [Array<Pin::Base>]
+      def results
+        @results ||= do_query
+      end
+
+      private
+
+      # @return [Array<Pin::Base>]
+      def do_query
+        return @pins if @query.nil? || @query.empty?
+        @pins.map do |pin|
+          match = [fuzzy_string_match(pin.path, @query), fuzzy_string_match(pin.name, @query)].max
+          Result.new(match, pin) if match > 0.7
+        end
+          .compact
+          .sort { |a, b| b.match <=> a.match }
+          .map(&:pin)
+      end
+
+      # @param str1 [String]
+      # @param str2 [String]
+      # @return [Float]
+      def fuzzy_string_match str1, str2
+        return (1.0 + (str2.length.to_f / str1.length.to_f)) if str1.downcase.include?(str2.downcase)
+        JaroWinkler.distance(str1, str2, ignore_case: true)
+      end
+    end
+  end
+end

data/lib/solargraph/pin/singleton.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Singleton < Closure
-      def initialize name: '', location: nil, closure: nil
-        super
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Singleton < Closure
+      def initialize name: '', location: nil, closure: nil
+        super
+      end
+    end
+  end
+end

data/lib/solargraph/pin/symbol.rb

@@ -1,47 +1,47 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Symbol < Base
-      # @param location [Solargraph::Location]
-      # @param name [String]
-      def initialize location, name
-        super(location: location, name: name)
-        # @name = name
-        # @location = location
-      end
-
-      def namespace
-        ''
-      end
-
-      def path
-        ''
-      end
-
-      def completion_item_kind
-        Solargraph::LanguageServer::CompletionItemKinds::KEYWORD
-      end
-
-      def comments
-        ''
-      end
-
-      def return_type
-        @return_type ||= Solargraph::ComplexType::SYMBOL
-      end
-
-      def directives
-        []
-      end
-
-      def visibility
-        :public
-      end
-
-      def deprecated?
-        false
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Symbol < Base
+      # @param location [Solargraph::Location]
+      # @param name [String]
+      def initialize location, name
+        super(location: location, name: name)
+        # @name = name
+        # @location = location
+      end
+
+      def namespace
+        ''
+      end
+
+      def path
+        ''
+      end
+
+      def completion_item_kind
+        Solargraph::LanguageServer::CompletionItemKinds::KEYWORD
+      end
+
+      def comments
+        ''
+      end
+
+      def return_type
+        @return_type ||= Solargraph::ComplexType::SYMBOL
+      end
+
+      def directives
+        []
+      end
+
+      def visibility
+        :public
+      end
+
+      def deprecated?
+        false
+      end
+    end
+  end
+end

data/lib/solargraph/pin.rb

@@ -1,36 +1,37 @@
-# frozen_string_literal: true
-
-require 'yard'
-
-module Solargraph
-  # The namespace for pins used in maps.
-  #
-  module Pin
-    autoload :Common,           'solargraph/pin/common'
-    autoload :Conversions,      'solargraph/pin/conversions'
-    autoload :Base,             'solargraph/pin/base'
-    autoload :Method,           'solargraph/pin/method'
-    autoload :MethodAlias,      'solargraph/pin/method_alias'
-    autoload :BaseVariable,     'solargraph/pin/base_variable'
-    autoload :InstanceVariable, 'solargraph/pin/instance_variable'
-    autoload :ClassVariable,    'solargraph/pin/class_variable'
-    autoload :LocalVariable,    'solargraph/pin/local_variable'
-    autoload :GlobalVariable,   'solargraph/pin/global_variable'
-    autoload :Constant,         'solargraph/pin/constant'
-    autoload :Symbol,           'solargraph/pin/symbol'
-    autoload :Closure,          'solargraph/pin/closure'
-    autoload :Namespace,        'solargraph/pin/namespace'
-    autoload :Keyword,          'solargraph/pin/keyword'
-    autoload :Parameter,        'solargraph/pin/parameter'
-    autoload :Reference,        'solargraph/pin/reference'
-    autoload :Documenting,      'solargraph/pin/documenting'
-    autoload :Block,            'solargraph/pin/block'
-    autoload :Localized,        'solargraph/pin/localized'
-    autoload :ProxyType,        'solargraph/pin/proxy_type'
-    autoload :DuckMethod,       'solargraph/pin/duck_method'
-    autoload :Singleton,        'solargraph/pin/singleton'
-    autoload :KeywordParam,     'solargraph/pin/keyword_param'
-
-    ROOT_PIN = Pin::Namespace.new(type: :class, name: '', closure: nil)
-  end
-end
+# frozen_string_literal: true
+
+require 'yard'
+
+module Solargraph
+  # The namespace for pins used in maps.
+  #
+  module Pin
+    autoload :Common,           'solargraph/pin/common'
+    autoload :Conversions,      'solargraph/pin/conversions'
+    autoload :Base,             'solargraph/pin/base'
+    autoload :Method,           'solargraph/pin/method'
+    autoload :MethodAlias,      'solargraph/pin/method_alias'
+    autoload :BaseVariable,     'solargraph/pin/base_variable'
+    autoload :InstanceVariable, 'solargraph/pin/instance_variable'
+    autoload :ClassVariable,    'solargraph/pin/class_variable'
+    autoload :LocalVariable,    'solargraph/pin/local_variable'
+    autoload :GlobalVariable,   'solargraph/pin/global_variable'
+    autoload :Constant,         'solargraph/pin/constant'
+    autoload :Symbol,           'solargraph/pin/symbol'
+    autoload :Closure,          'solargraph/pin/closure'
+    autoload :Namespace,        'solargraph/pin/namespace'
+    autoload :Keyword,          'solargraph/pin/keyword'
+    autoload :Parameter,        'solargraph/pin/parameter'
+    autoload :Reference,        'solargraph/pin/reference'
+    autoload :Documenting,      'solargraph/pin/documenting'
+    autoload :Block,            'solargraph/pin/block'
+    autoload :Localized,        'solargraph/pin/localized'
+    autoload :ProxyType,        'solargraph/pin/proxy_type'
+    autoload :DuckMethod,       'solargraph/pin/duck_method'
+    autoload :Singleton,        'solargraph/pin/singleton'
+    autoload :KeywordParam,     'solargraph/pin/keyword_param'
+    autoload :Search,           'solargraph/pin/search'
+
+    ROOT_PIN = Pin::Namespace.new(type: :class, name: '', closure: nil)
+  end
+end

data/lib/solargraph/position.rb

@@ -1,100 +1,100 @@
-# frozen_string_literal: true
-
-module Solargraph
-  # The zero-based line and column numbers of a position in a string.
-  #
-  class Position
-    # @return [Integer]
-    attr_reader :line
-
-    # @return [Integer]
-    attr_reader :character
-
-    alias column character
-
-    # @param line [Integer]
-    # @param character [Integer]
-    def initialize line, character
-      @line = line
-      @character = character
-    end
-
-    # Get a hash of the position. This representation is suitable for use in
-    # the language server protocol.
-    #
-    # @return [Hash]
-    def to_hash
-      {
-        line: line,
-        character: character
-      }
-    end
-
-    def inspect
-      "#<#{self.class} #{line}, #{character}>"
-    end
-
-    # Get a numeric offset for the specified text and position.
-    #
-    # @param text [String]
-    # @param position [Position]
-    # @return [Integer]
-    def self.to_offset text, position
-      return 0 if text.empty?
-      text.lines[0...position.line].sum(&:length) + position.character
-    end
-
-    # Get a numeric offset for the specified text and a position identified
-    # by its line and character.
-    #
-    # @param text [String]
-    # @param line [Integer]
-    # @param character [Integer]
-    # @return [Integer]
-    def self.line_char_to_offset text, line, character
-      to_offset(text, Position.new(line, character))
-    end
-
-    # Get a position for the specified text and offset.
-    #
-    # @param text [String]
-    # @param offset [Integer]
-    # @return [Position]
-    def self.from_offset text, offset
-      cursor = 0
-      line = 0
-      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
-        line += 1
-      end
-      character = 0 if character.nil? and (cursor - offset).between?(0, 1)
-      raise InvalidOffsetError if character.nil?
-      Position.new(line, character)
-    end
-
-    # A helper method for generating positions from arrays of integers. The
-    # original parameter is returned if it is already a position.
-    #
-    # @raise [ArgumentError] if the object cannot be converted to a position.
-    #
-    # @param object [Position, Array(Integer, Integer)]
-    # @return [Position]
-    def self.normalize object
-      return object if object.is_a?(Position)
-      return Position.new(object[0], object[1]) if object.is_a?(Array)
-      raise ArgumentError, "Unable to convert #{object.class} to Position"
-    end
-
-    def == other
-      return false unless other.is_a?(Position)
-      line == other.line and character == other.character
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  # The zero-based line and column numbers of a position in a string.
+  #
+  class Position
+    # @return [Integer]
+    attr_reader :line
+
+    # @return [Integer]
+    attr_reader :character
+
+    alias column character
+
+    # @param line [Integer]
+    # @param character [Integer]
+    def initialize line, character
+      @line = line
+      @character = character
+    end
+
+    # Get a hash of the position. This representation is suitable for use in
+    # the language server protocol.
+    #
+    # @return [Hash]
+    def to_hash
+      {
+        line: line,
+        character: character
+      }
+    end
+
+    def inspect
+      "#<#{self.class} #{line}, #{character}>"
+    end
+
+    # Get a numeric offset for the specified text and position.
+    #
+    # @param text [String]
+    # @param position [Position]
+    # @return [Integer]
+    def self.to_offset text, position
+      return 0 if text.empty?
+      text.lines[0...position.line].sum(&:length) + position.character
+    end
+
+    # Get a numeric offset for the specified text and a position identified
+    # by its line and character.
+    #
+    # @param text [String]
+    # @param line [Integer]
+    # @param character [Integer]
+    # @return [Integer]
+    def self.line_char_to_offset text, line, character
+      to_offset(text, Position.new(line, character))
+    end
+
+    # Get a position for the specified text and offset.
+    #
+    # @param text [String]
+    # @param offset [Integer]
+    # @return [Position]
+    def self.from_offset text, offset
+      cursor = 0
+      line = 0
+      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
+        line += 1
+      end
+      character = 0 if character.nil? and (cursor - offset).between?(0, 1)
+      raise InvalidOffsetError if character.nil?
+      Position.new(line, character)
+    end
+
+    # A helper method for generating positions from arrays of integers. The
+    # original parameter is returned if it is already a position.
+    #
+    # @raise [ArgumentError] if the object cannot be converted to a position.
+    #
+    # @param object [Position, Array(Integer, Integer)]
+    # @return [Position]
+    def self.normalize object
+      return object if object.is_a?(Position)
+      return Position.new(object[0], object[1]) if object.is_a?(Array)
+      raise ArgumentError, "Unable to convert #{object.class} to Position"
+    end
+
+    def == other
+      return false unless other.is_a?(Position)
+      line == other.line and character == other.character
+    end
+  end
+end