solargraph 0.29.3 → 0.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54a4cf3c7dfa6b68a345b08958c7bf2663792962ad6a9176b3cee642324278a
-  data.tar.gz: 6f494588dc4440ed5ef8d455d52e89e1626e3f5c4fdeb569a260aeba1f776418
+  metadata.gz: 60d754493bfc4ef0b40c6fd5b7c872b67e9ee5caa83930f9ede99389bb4b9007
+  data.tar.gz: '077452469bb99c0b6b7fede9bcadf8fb115d1b9889733c52170800f4b2a953f3'
 SHA512:
-  metadata.gz: 448855a77c7b65ae2018f325f9d381476ac3a3bba3d3e0e3c6de0bb8961a48915218016fa4b0d09104068db82610e5eac1ca88acc75204848c441d471ded8728
-  data.tar.gz: 527b35bb211a2820acf74e18daf00097f62858911b70e2ba5b62d613a09433c0271f274b9aadef7d1b936854ce887dcf3b3e4ea91e5a7c19e6ef926fb0e0279a
+  metadata.gz: 066a7d0a1b04ba6c9cba7cac8cbb8339a2c2b5a47bd387ab8fdc11b40a6b9ec3cd076c8f2672efb08be8d90db5df32575fea5cf3516e0d0d9e844a169b778580
+  data.tar.gz: 16a58b9ffc792406b3c95b4ab7d0b5835334a8851c6bb9ab89657606bde490c5184ca7bc5228dc122d39d70a71cb94d459d8a868bde0501c0ebba3cf6804c906

data/lib/solargraph/pin/constant.rb

@@ -22,6 +22,7 @@ module Solargraph
       end
 
       def path
+        return name if namespace.empty?
         "#{namespace}::#{name}"
       end
     end

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

@@ -20,7 +20,9 @@ module Solargraph
           else
             ns = ''
           end
-          api_map.get_constants(ns, context).select{|p| p.path.end_with?(bottom)}
+          result = api_map.get_constants(ns, context)
+          last_name = bottom.split('::').last
+          result.select{ |p| p.name == last_name }
         end
       end
     end

data/lib/solargraph/source/node_methods.rb

@@ -109,6 +109,22 @@ module Solargraph
         signature
       end
 
+      # Find all the nodes within the provided node that potentially return a
+      # value.
+      #
+      # The node parameter typically represents a method's logic, e.g., the
+      # second child (after the :args node) of a :def node. A simple one-line
+      # method would typically return itself, while a node with conditions
+      # would return the resulting node from each conditional branch. Nodes
+      # that follow a :return node are assumed to be unreachable. Implicit nil
+      # values are ignored.
+      #
+      # @todo Maybe this method should include implicit nil values in results.
+      #   For example, a bare `return` would return a :nil node instead of an
+      #   empty array.
+      #
+      # @param node [AST::Node]
+      # @return [Array<AST::Node>]
       def returns_from node
         DeepInference.get_return_nodes(node)
       end
@@ -120,11 +136,14 @@ module Solargraph
           SKIPPABLE = [:def, :defs, :class, :sclass, :module]
 
           def get_return_nodes node
+            return [] unless node.is_a?(Parser::AST::Node)
             result = []
             if REDUCEABLE.include?(node.type)
               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 == :return
+              result.concat reduce_to_value_nodes([node.children[0]])
             else
               result.push node
             end
@@ -140,8 +159,8 @@ module Solargraph
               next if SKIPPABLE.include?(node.type)
               if node.type == :return
                 result.concat reduce_to_value_nodes([node.children[0]])
-                # @todo Maybe return the result here because the rest of the code is
-                #   unreachable
+                # Return the result here because the rest of the code is
+                # unreachable
                 return result
               else
                 result.concat get_return_nodes_only(node)
@@ -158,8 +177,9 @@ module Solargraph
               next if SKIPPABLE.include?(node.type)
               if node.type == :return
                 result.concat reduce_to_value_nodes([node.children[0]])
-                # @todo Maybe return the result here because the rest of the code is
-                #   unreachable
+                # Return the result here because the rest of the code is
+                # unreachable
+                return result
               else
                 result.concat get_return_nodes_only(node)
               end
@@ -170,11 +190,9 @@ module Solargraph
           def reduce_to_value_nodes nodes
             result = []
             nodes.each do |node|
+              next unless node.is_a?(Parser::AST::Node)
               if REDUCEABLE.include?(node.type)
                 result.concat get_return_nodes_from_children(node)
-                # node.children.each do |child|
-                #   result.concat reduce_to_value_nodes(child)
-                # end
               elsif CONDITIONAL.include?(node.type)
                 result.concat reduce_to_value_nodes(node.children[1..-1])
               elsif node.type == :return
@@ -186,7 +204,7 @@ module Solargraph
             result
           end
         end
-      end      
+      end
     end
   end
 end

data/lib/solargraph/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.29.3
+  version: 0.29.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine