solargraph 0.23.3 → 0.23.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37ebc106375480d4721557e69fb312eb21c7ab0d554448e7c71c975cdebc36af
-  data.tar.gz: d9bd5e65e05323ade331a4d864029688bb46f1eac4456a3394e128988651c987
+  metadata.gz: 3d2dc2283964f7972f289ef9aa43a939948049b02d351f244ec522afc1033265
+  data.tar.gz: 8e60c7d6d9a3f7bd25fcbc66566c1ce795b3b8999572b454e6d07a027460ec4d
 SHA512:
-  metadata.gz: 98be9bd79773d42e69e81cafefa214c9c6f9ea4b0fccb59386433d81dfd4718d69c97a1670c3f006f7fd445f6282a9575cb7a8f74a35b009f5f8b513496ed905
-  data.tar.gz: 99fb8faa39d51725271b6bb92dde96e0b61933bd2350403784cee3aee65ca5179c879d05fe32e745608a14b9f96042d4a29e9245bd77f30b59449827a4db5205
+  metadata.gz: 9ffd40c951fb253bef3653525c9cbf10362582c292c529559b59698a1636939ed589fe76d9eacb01b26f6e7340c4f854d557fff0bd94a34e4b9d277196c3e637
+  data.tar.gz: d589e62eb1024c07eb2bd15cde0f29552a07089fa812b2508c51ad701622b1ab59e783b69f2cb4bc40645044c514f6167e83f2b1c3064c7eea8c372aad95c380

data/lib/solargraph/pin/attribute.rb

@@ -33,6 +33,12 @@ module Solargraph
         end
         @return_type
       end
+
+      def parameters
+        # Since attributes are generally equivalent to methods, treat
+        # them as methods without parameters
+        []
+      end
     end
   end
 end

data/lib/solargraph/source.rb

@@ -93,7 +93,7 @@ module Solargraph
     # @param fqns [String] The namespace (nil for all)
     # @return [Array<Solargraph::Pin::Method>]
     def method_pins fqns = nil
-      pins.select{|pin| pin.kind == Solargraph::Pin::METHOD}
+      pins.select{|pin| pin.kind == Solargraph::Pin::METHOD or pin.kind == Solargraph::Pin::ATTRIBUTE}
     end
 
     # @return [Array<Solargraph::Pin::Attribute>]
@@ -162,17 +162,6 @@ module Solargraph
       _locate_pin line, character, Pin::NAMESPACE, Pin::METHOD, Pin::BLOCK
     end
 
-    def _locate_pin line, character, *kinds
-      position = Solargraph::Source::Position.new(line, character)
-      found = nil
-      pins.each do |pin|
-        found = pin if (kinds.empty? or kinds.include?(pin.kind)) and pin.location.range.contain?(position)
-        break if pin.location.range.start.line > line
-      end
-      # @todo Assuming the root pin is always valid
-      found || pins.first
-    end
-
     # Get the nearest node that contains the specified index.
     #
     # @param line [Integer]
@@ -242,11 +231,9 @@ module Solargraph
     end
 
     def all_symbols
-      result = []
-      result.concat namespace_pins.reject{ |pin| pin.name.empty? }
-      result.concat method_pins
-      result.concat constant_pins
-      result
+      @all_symbols ||= pins.select{ |pin|
+        [Pin::ATTRIBUTE, Pin::CONSTANT, Pin::METHOD, Pin::NAMESPACE].include?(pin.kind)
+      }
     end
 
     def locate_pin location
@@ -265,6 +252,17 @@ module Solargraph
 
     private
 
+    def _locate_pin line, character, *kinds
+      position = Solargraph::Source::Position.new(line, character)
+      found = nil
+      pins.each do |pin|
+        found = pin if (kinds.empty? or kinds.include?(pin.kind)) and pin.location.range.contain?(position)
+        break if pin.location.range.start.line > line
+      end
+      # @todo Assuming the root pin is always valid
+      found || pins.first
+    end
+
     def inner_node_references name, top
       result = []
       if top.kind_of?(AST::Node)

data/lib/solargraph/source/mapper.rb

@@ -154,7 +154,7 @@ module Solargraph
                 here = get_node_start_position(c)
                 block = get_block_pin(here)
                 pins.push Solargraph::Pin::Constant.new(get_node_location(c), fqn, c.children[1].to_s, docstring_for(c), resolve_node_signature(c.children[2]), infer_literal_node_type(c.children[2]), block, :public)
-              elsif c.type == :def and c.children[0].to_s[0].match(/[a-z]/i)
+              elsif c.type == :def
                 methpin = Solargraph::Pin::Method.new(get_node_location(c), fqn || '', c.children[(c.type == :def ? 0 : 1)].to_s, docstring_for(c), scope, visibility, get_method_args(c))
                 if methpin.name == 'initialize' and methpin.scope == :instance
                   pins.push Solargraph::Pin::Method.new(methpin.location, methpin.namespace, 'new', methpin.docstring, :class, :public, methpin.parameters)

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.23.3'
+  VERSION = '0.23.4'
 end

metadata

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