solargraph 0.33.2 → 0.34.0

data/lib/solargraph/source/cursor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class Source
     # Information about a position in a source, including the word located
@@ -140,6 +142,8 @@ module Solargraph
 
       # @return [Parser::AST::Node, nil]
       def recipient_node
+        tree = source.tree_at(position.line, position.column)
+        return tree[1] if tree[1] && tree[1].type == :send && tree[1].children[2..-1].include?(tree[0])
         return nil if source.code[offset-1] == ')' || source.code[0..offset] =~ /[^,][ \t]*?\n[ \t]*?\Z/
         return nil if first_char_offset < offset && source.code[first_char_offset..offset-1] =~ /\)[\s]*\Z/
         pos = Position.from_offset(source.code, first_char_offset)
@@ -151,7 +155,6 @@ module Solargraph
         end
         return tree[1] if tree[1] && tree[1].type == :send
         return tree[3] if tree[1] && tree[3] && tree[1].type == :pair && tree[3].type == :send
-        nil
       end
 
       private

data/lib/solargraph/source/encoding_fixes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class Source
     module EncodingFixes

data/lib/solargraph/source/flawed_builder.rb

@@ -1,13 +1,15 @@
-module Solargraph
-  class Source
-    # A custom builder for source parsers that ignores character encoding
-    # issues in literal strings.
-    #
-    class FlawedBuilder < Parser::Builders::Default
-      def string_value(token)
-        value(token)
-      end
-    end
-    private_constant :FlawedBuilder
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    # A custom builder for source parsers that ignores character encoding
+    # issues in literal strings.
+    #
+    class FlawedBuilder < Parser::Builders::Default
+      def string_value(token)
+        value(token)
+      end
+    end
+    private_constant :FlawedBuilder
+  end
+end

data/lib/solargraph/source/node_chainer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class Source
     # A factory for generating chains from nodes.

data/lib/solargraph/source/node_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class Source
     module NodeMethods
@@ -13,9 +15,9 @@ module Solargraph
       # @return [Array<String>]
       def pack_name(node)
         parts = []
-        if node.kind_of?(AST::Node)
+        if node.is_a?(AST::Node)
           node.children.each { |n|
-            if n.kind_of?(AST::Node)
+            if n.is_a?(AST::Node)
               if n.type == :cbase
                 parts = [''] + pack_name(n)
               else
@@ -32,7 +34,7 @@ module Solargraph
       # @param node [Parser::AST::Node]
       # @return [String]
       def const_from node
-        if node.kind_of?(AST::Node) and node.type == :const
+        if node.is_a?(AST::Node) and node.type == :const
           result = ''
           unless node.children[0].nil?
             result = const_from(node.children[0])
@@ -51,7 +53,7 @@ module Solargraph
       # @param node [Parser::AST::Node]
       # @return [String]
       def infer_literal_node_type node
-        return nil unless node.kind_of?(AST::Node)
+        return nil unless node.is_a?(AST::Node)
         if node.type == :str || node.type == :dstr
           return 'String'
         elsif node.type == :array
@@ -66,6 +68,8 @@ module Solargraph
           return 'Symbol'
         elsif node.type == :regexp
           return 'Regexp'
+        elsif node.type == :irange
+          return 'Range'
         # @todo Support `nil` keyword in types
         # elsif node.type == :nil
         #   return 'NilClass'
@@ -98,7 +102,7 @@ module Solargraph
       end
 
       def drill_signature node, signature
-        return signature unless node.kind_of?(AST::Node)
+        return signature unless node.is_a?(AST::Node)
         if node.type == :const or node.type == :cbase
           unless node.children[0].nil?
             signature += drill_signature(node.children[0], signature)

data/lib/solargraph/source/source_chainer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class Source
     # Information about a location in a source, including the location's word

data/lib/solargraph/source/updater.rb

@@ -1,50 +1,52 @@
-module Solargraph
-  class Source
-    # Updaters contain changes to be applied to a source. The source applies
-    # the update via the Source#synchronize method.
-    #
-    class Updater
-      # @return [String]
-      attr_reader :filename
-
-      # @return [Integer]
-      attr_reader :version
-
-      # @return [Array<Change>]
-      attr_reader :changes
-
-      # @param filename [String] The file to update.
-      # @param version [Integer] A version number associated with this update.
-      # @param changes [Array<Solargraph::Source::Change>] The changes.
-      def initialize filename, version, changes
-        @filename = filename
-        @version = version
-        @changes = changes
-        @input = nil
-        @did_nullify = nil
-        @output = nil
-      end
-
-      # @return [String]
-      def write text, nullable = false
-        can_nullify = (nullable and changes.length == 1)
-        return @output if @input == text and can_nullify == @did_nullify
-        @input = text
-        @output = text
-        @did_nullify = can_nullify
-        changes.each do |ch|
-          @output = ch.write(@output, can_nullify)
-        end
-        @output
-      end
-
-      # @return [String]
-      def repair text
-        changes.each do |ch|
-          text = ch.repair(text)
-        end
-        text
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    # Updaters contain changes to be applied to a source. The source applies
+    # the update via the Source#synchronize method.
+    #
+    class Updater
+      # @return [String]
+      attr_reader :filename
+
+      # @return [Integer]
+      attr_reader :version
+
+      # @return [Array<Change>]
+      attr_reader :changes
+
+      # @param filename [String] The file to update.
+      # @param version [Integer] A version number associated with this update.
+      # @param changes [Array<Solargraph::Source::Change>] The changes.
+      def initialize filename, version, changes
+        @filename = filename
+        @version = version
+        @changes = changes
+        @input = nil
+        @did_nullify = nil
+        @output = nil
+      end
+
+      # @return [String]
+      def write text, nullable = false
+        can_nullify = (nullable and changes.length == 1)
+        return @output if @input == text and can_nullify == @did_nullify
+        @input = text
+        @output = text
+        @did_nullify = can_nullify
+        changes.each do |ch|
+          @output = ch.write(@output, can_nullify)
+        end
+        @output
+      end
+
+      # @return [String]
+      def repair text
+        changes.each do |ch|
+          text = ch.repair(text)
+        end
+        text
+      end
+    end
+  end
+end

data/lib/solargraph/source_map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'jaro_winkler'
 
 module Solargraph
@@ -27,6 +29,7 @@ module Solargraph
       @source = source.dup
       @pins = pins
       @locals = locals
+      environ.merge Convention.for(source)
     end
 
     # @return [String]
@@ -41,13 +44,18 @@ module Solargraph
 
     # @return [Array<Pin::Reference::Require>]
     def requires
-      @requires ||= pins.select{|p| p.kind == Pin::REQUIRE_REFERENCE}
+      @requires ||= pins.select{ |p| p.is_a?(Pin::Reference::Require) }
+    end
+
+    # @return [Environ]
+    def environ
+      @environ ||= Environ.new
     end
 
     # @return [Array<Pin::Base>]
     def document_symbols
       @document_symbols ||= pins.select { |pin|
-        [Pin::ATTRIBUTE, Pin::CONSTANT, Pin::METHOD, Pin::NAMESPACE].include?(pin.kind) and !pin.path.empty?
+        pin.path && !pin.path.empty?
       }
     end
 
@@ -77,11 +85,11 @@ module Solargraph
     end
 
     def locate_named_path_pin line, character
-      _locate_pin line, character, Pin::NAMESPACE, Pin::METHOD
+      _locate_pin line, character, Pin::Namespace, Pin::Method
     end
 
     def locate_block_pin line, character
-      _locate_pin line, character, Pin::NAMESPACE, Pin::METHOD, Pin::BLOCK
+      _locate_pin line, character, Pin::Namespace, Pin::Method, Pin::Block
     end
 
     # @param other_map [SourceMap]
@@ -139,13 +147,13 @@ module Solargraph
 
     # @param line [Integer]
     # @param character [Integer]
-    # @param kinds [Array<Symbol>]
+    # @param klasses [Array<Class>]
     # @return [Pin::Base]
-    def _locate_pin line, character, *kinds
+    def _locate_pin line, character, *klasses
       position = Position.new(line, character)
       found = nil
       pins.each do |pin|
-        found = pin if (kinds.empty? || kinds.include?(pin.kind)) && pin.location.range.contain?(position)
+        found = pin if (klasses.empty? || klasses.any? { |kls| pin.is_a?(kls) } ) && pin.location.range.contain?(position)
         break if pin.location.range.start.line > line
       end
       # Assuming the root pin is always valid

data/lib/solargraph/source_map/clip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     # A static analysis tool for obtaining definitions, completions,
@@ -25,6 +27,7 @@ module Solargraph
         return package_completions(api_map.get_symbols) if cursor.chain.literal? && cursor.chain.links.last.word == '<Symbol>'
         return Completion.new([], cursor.range) if cursor.chain.literal? || cursor.comment?
         result = []
+        result.concat complete_keyword_parameters
         if cursor.chain.constant? || cursor.start_of_constant?
           if cursor.chain.undefined?
             type = cursor.chain.base.infer(api_map, context_pin, locals)
@@ -38,7 +41,7 @@ module Solargraph
               type = ComplexType::UNDEFINED
             end
           end
-          result.concat api_map.get_constants(type.undefined? ? '' : type.namespace, cursor.start_of_constant? ? '' : context_pin.full_context.namespace)
+          result.concat api_map.get_constants(type.undefined? ? '' : type.namespace, cursor.start_of_constant? ? '' : context_pin.full_context.namespace, *gates)
         else
           type = cursor.chain.base.infer(api_map, block, locals)
           result.concat api_map.get_complex_type_methods(type, block.binder.namespace, cursor.chain.links.length == 1)
@@ -51,7 +54,7 @@ module Solargraph
               return package_completions(api_map.get_global_variable_pins)
             end
             result.concat locals
-            result.concat api_map.get_constants('', context_pin.context.namespace)
+            result.concat api_map.get_constants(context_pin.context.namespace, *gates)
             result.concat api_map.get_methods(block.binder.namespace, scope: block.binder.scope, visibility: [:public, :private, :protected])
             result.concat api_map.get_methods('Kernel')
             result.concat ApiMap.keywords
@@ -88,6 +91,10 @@ module Solargraph
         }.reverse
       end
 
+      def gates
+        block.gates
+      end
+
       private
 
       # @return [ApiMap]
@@ -128,13 +135,38 @@ module Solargraph
         result
       end
 
+      # @return [Array<Pin::KeywordParam]
+      def complete_keyword_parameters
+        return [] unless cursor.argument? && cursor.chain.links.one? && cursor.word =~ /^[a-z0-9_]*:?$/
+        pins = signify
+        result = []
+        done = []
+        pins.each do |pin|
+          pin.parameter_names.each do |name|
+            next if done.include?(name)
+            done.push name
+            if pin.parameters.any? { |par| par.start_with?("#{name}:") }
+              result.push Pin::KeywordParam.new(pin.location, "#{name}:")
+            end
+          end
+          if !pin.parameters.empty? && pin.parameters.last.start_with?('**') || pin.parameters.last =~ /= *?\{\}$/
+            pin.docstring.tags(:param).each do |tag|
+              next if done.include?(tag.name)
+              done.push tag.name
+              result.push Pin::KeywordParam.new(pin.location, "#{tag.name}:")
+            end
+          end
+        end
+        result
+      end
+
       # @param result [Array<Pin::Base>]
       # @return [Completion]
       def package_completions result
         frag_start = cursor.start_of_word.to_s.downcase
         filtered = result.uniq(&:name).select { |s|
           s.name.downcase.start_with?(frag_start) &&
-            (s.kind != Pin::METHOD || s.name.match(/^[a-z0-9_]+(\!|\?|=)?$/i))
+            (!s.is_a?(Pin::BaseMethod) || s.name.match(/^[a-z0-9_]+(\!|\?|=)?$/i))
         }
         Completion.new(filtered, cursor.range)
       end

data/lib/solargraph/source_map/completion.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     # The result of a completion request containing the pins that describe

data/lib/solargraph/source_map/mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     # The Mapper generates pins and other data for SourceMaps.

data/lib/solargraph/source_map/node_processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     # The processor classes used by SourceMap::Mapper to generate pins from

data/lib/solargraph/source_map/node_processor/alias_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     module NodeProcessor

data/lib/solargraph/source_map/node_processor/args_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     module NodeProcessor

data/lib/solargraph/source_map/node_processor/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     module NodeProcessor
@@ -60,12 +62,12 @@ module Solargraph
         end
 
         def named_path_pin position
-          pins.select{|pin| [Pin::NAMESPACE, Pin::METHOD].include?(pin.kind) && pin.location.range.contain?(position)}.last
+          pins.select{|pin| pin.is_a?(Pin::Closure) && !pin.path.empty? && pin.location.range.contain?(position)}.last
         end
 
         # @todo Candidate for deprecation
         def block_pin position
-          pins.select{|pin| [Pin::BLOCK, Pin::NAMESPACE, Pin::METHOD].include?(pin.kind) && pin.location.range.contain?(position)}.last
+          pins.select{|pin| pin.is_a?(Pin::Closure) && pin.location.range.contain?(position)}.last
         end
 
         # @todo Candidate for deprecation
@@ -80,7 +82,7 @@ module Solargraph
           list = nil
           args = []
           node.children.each { |c|
-            if c.kind_of?(AST::Node) and c.type == :args
+            if c.is_a?(AST::Node) and c.type == :args
               list = c
               break
             end

data/lib/solargraph/source_map/node_processor/begin_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class SourceMap
     module NodeProcessor