solargraph 0.29.4 → 0.29.5

data/lib/solargraph/source/chain.rb

@@ -66,9 +66,10 @@ module Solargraph
         type = ComplexType::UNDEFINED
         pins = define(api_map, name_pin, locals)
         pins.each do |pin|
-          type = pin.infer(api_map)
+          type = pin.typify(api_map)
           break unless type.undefined?
         end
+        type = pins.first.probe(api_map) unless type.defined? || pins.empty?
         @@inference_stack.pop
         type
       end
@@ -107,9 +108,11 @@ module Solargraph
       def infer_first_defined pins, api_map
         type = ComplexType::UNDEFINED
         pins.each do |pin|
-          type = pin.infer(api_map)
+          # type = pin.infer(api_map)
+          type = pin.typify(api_map)
           break unless type.undefined?
         end
+        type = pins.first.probe(api_map) unless type.defined? || pins.empty?
         type
       end
     end

data/lib/solargraph/source/chain/call.rb

@@ -55,7 +55,9 @@ module Solargraph
               next result unless result.return_type.undefined?
             end
             next p if p.kind == Pin::METHOD || p.kind == Pin::ATTRIBUTE || p.kind == Pin::NAMESPACE
-            type = p.infer(api_map)
+            # type = p.infer(api_map)
+            type = p.typify(api_map)
+            type = p.probe(api_map) if type.undefined?
             next p if p.return_complex_type == type
             Pin::ProxyType.new(p.location, nil, p.name, type)
           end

data/lib/solargraph/source/change.rb

@@ -57,9 +57,9 @@ module Solargraph
         else
           result = commit text, fixed
           off = Position.to_offset(text, range.start)
-          match = result[0..off].match(/[\.:]+\z/)
+          match = result[0, off].match(/[\.:]+\z/)
           if match
-            result = result[0..off].sub(/#{match[0]}\z/, ' ' * match[0].length) + result[off..-1]
+            result = result[0, off].sub(/#{match[0]}\z/, ' ' * match[0].length) + result[off..-1]
           end
           result
         end

data/lib/solargraph/source/node_chainer.rb

@@ -80,6 +80,8 @@ module Solargraph
           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

data/lib/solargraph/source/node_methods.rb

@@ -3,11 +3,13 @@ module Solargraph
     module NodeMethods
       module_function
 
+      # @param node [Parser::AST::Node]
       # @return [String]
       def unpack_name(node)
         pack_name(node).join("::")
       end
 
+      # @param node [Parser::AST::Node]
       # @return [Array<String>]
       def pack_name(node)
         parts = []
@@ -27,6 +29,7 @@ module Solargraph
         parts
       end
 
+      # @param node [Parser::AST::Node]
       # @return [String]
       def const_from node
         if node.kind_of?(AST::Node) and node.type == :const
@@ -45,6 +48,7 @@ module Solargraph
         end
       end
 
+      # @param node [Parser::AST::Node]
       # @return [String]
       def infer_literal_node_type node
         return nil unless node.kind_of?(AST::Node)
@@ -73,6 +77,7 @@ module Solargraph
       # The result should be a string in the form of a method path, e.g.,
       # String.new or variable.method.
       #
+      # @param node [Parser::AST::Node]
       # @return [String]
       def resolve_node_signature node
         result = drill_signature node, ''
@@ -80,10 +85,14 @@ module Solargraph
         result
       end
 
+      # @param node [Parser::AST::Node]
+      # @return [Position]
       def get_node_start_position(node)
         Position.new(node.loc.line, node.loc.column)
       end
 
+      # @param node [Parser::AST::Node]
+      # @return [Position]
       def get_node_end_position(node)
         Position.new(node.loc.last_line, node.loc.last_column)
       end
@@ -135,6 +144,8 @@ module Solargraph
           REDUCEABLE = [:begin, :kwbegin]
           SKIPPABLE = [:def, :defs, :class, :sclass, :module]
 
+          # @param node [Parser::AST::Node]
+          # @return [Array<Parser::AST::Node>]
           def get_return_nodes node
             return [] unless node.is_a?(Parser::AST::Node)
             result = []
@@ -142,6 +153,8 @@ module Solargraph
               result.concat get_return_nodes_from_children(node)
             elsif CONDITIONAL.include?(node.type)
               result.concat reduce_to_value_nodes(node.children[1..-1])
+            elsif node.type == :and || node.type == :or
+              result.concat reduce_to_value_nodes(node.children)
             elsif node.type == :return
               result.concat reduce_to_value_nodes([node.children[0]])
             else
@@ -197,6 +210,8 @@ module Solargraph
                 result.concat reduce_to_value_nodes(node.children[1..-1])
               elsif node.type == :return
                 result.concat get_return_nodes(node.children[0])
+              elsif node.type == :and || node.type == :or
+                result.concat reduce_to_value_nodes(node.children)
               else
                 result.push node
               end

data/lib/solargraph/source/source_chainer.rb

@@ -31,7 +31,6 @@ module Solargraph
       # @return [Source::Chain]
       def chain
         return Chain.new([Chain::Literal.new('Symbol')]) if phrase.start_with?(':') && !phrase.start_with?('::')
-        # return Chain.new([Chain::UNDEFINED_CALL]) unless infer_literal_node_type(source.node_at(position.line, position.column)).nil?
         begin
           return Chain.new([]) if phrase.end_with?('..')
           if !source.repaired? && source.parsed?
@@ -170,27 +169,6 @@ module Solargraph
           end
           index -= 1
         end
-        # @todo Smelly exceptional case for integer literals
-        # match = signature.match(/^[0-9]+/)
-        # if match
-        #   index += match[0].length
-        #   signature = signature[match[0].length..-1].to_s
-        #   @base_literal = 'Integer'
-        # # @todo Smelly exceptional case for array literals
-        # elsif signature.start_with?('.[]')
-        #   index += 2
-        #   signature = signature[3..-1].to_s
-        #   @base_literal = 'Array'
-        # elsif signature.start_with?('.')
-        #   pos = Position.from_offset(@source.code, index)
-        #   node = @source.node_at(pos.line, pos.character)
-        #   lit = infer_literal_node_type(node)
-        #   unless lit.nil?
-        #     signature = signature[1..-1].to_s
-        #     index += 1
-        #     @base_literal = lit
-        #   end
-        # end
         [index + 1, signature]
       end
     end

data/lib/solargraph/source_map.rb

@@ -42,15 +42,17 @@ module Solargraph
       @requires ||= pins.select{|p| p.kind == Pin::REQUIRE_REFERENCE}
     end
 
-    # @param position [Position]
+    # @param position [Position, Array(Integer, Integer)]
     # @return [Boolean]
     def string_at? position
+      position = Position.normalize(position)
       @source.string_at?(position)
     end
 
-    # @param position [Position]
+    # @param position [Position, Array(Integer, Integer)]
     # @return [Boolean]
     def comment_at? position
+      position = Position.normalize(position)
       @source.comment_at?(position)
     end
 
@@ -73,6 +75,8 @@ module Solargraph
       Source::Cursor.new(source, position)
     end
 
+    # @param path [String]
+    # @return [Pin::Base]
     def first_pin path
       pins.select { |p| p.path == path }.first
     end
@@ -93,7 +97,7 @@ module Solargraph
     end
 
     # @param other_map [SourceMap]
-    # @return Boolean
+    # @return [Boolean]
     def try_merge! other_map
       return false if pins.length != other_map.pins.length || locals.length != other_map.locals.length || requires.map(&:name).uniq.sort != other_map.requires.map(&:name).uniq.sort
       pins.each_index do |i|
@@ -138,6 +142,10 @@ module Solargraph
 
     private
 
+    # @param line [Integer]
+    # @param character [Integer]
+    # @param *kinds [Array<Symbol>]
+    # @return [Pin::Base]
     def _locate_pin line, character, *kinds
       position = Position.new(line, character)
       found = nil

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.29.4'
+  VERSION = '0.29.5'
 end

data/lib/solargraph/workspace.rb

@@ -28,7 +28,7 @@ module Solargraph
     # @param source [Solargraph::Source]
     # @return [Boolean] True if the source was added to the workspace
     def merge source
-      unless source_hash.has_key?(source.filename)
+      unless directory == '*' || source_hash.has_key?(source.filename)
         # Reload the config to determine if a new source should be included
         @config = Solargraph::Workspace::Config.new(directory)
         return false unless config.calculated.include?(source.filename)
@@ -42,7 +42,7 @@ module Solargraph
     # @param filename [String]
     # @return [Boolean]
     def would_merge? filename
-      return true if source_hash.include?(filename)
+      return true if directory == '*' || source_hash.include?(filename)
       @config = Solargraph::Workspace::Config.new(directory)
       config.calculated.include?(filename)
     end
@@ -130,7 +130,7 @@ module Solargraph
 
     def load_sources
       source_hash.clear
-      unless directory.empty?
+      unless directory.empty? || directory == '*'
         size = config.calculated.length
         raise WorkspaceTooLargeError, "The workspace is too large to index (#{size} files, #{config.max_files} max)" if config.max_files > 0 and size > config.max_files
         config.calculated.each do |filename|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.29.4
+  version: 0.29.5
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -178,22 +178,22 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +296,7 @@ files:
 - lib/solargraph/pin.rb
 - lib/solargraph/pin/attribute.rb
 - lib/solargraph/pin/base.rb
+- lib/solargraph/pin/base_method.rb
 - lib/solargraph/pin/base_variable.rb
 - lib/solargraph/pin/block.rb
 - lib/solargraph/pin/block_parameter.rb
@@ -411,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Solargraph for Ruby