solargraph 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bdbd6d7185bb73e6b6514f5e544c78319643d3e
-  data.tar.gz: 2d11a5b505c083281d39315b49c4dc984c8ece8f
+  metadata.gz: 973c57ed92c49cbc1c242f26d30660a0260329c3
+  data.tar.gz: 0f4313ae7372cac8995a78f23992cc2c91c58d85
 SHA512:
-  metadata.gz: c20907913080fd29e47bd66218f4b44736985424a128e13e49ea595154ff6b4673a103fa29a97629fb0fb7f6081873d0f1a53737c377a861c76efcdfe527d2dc
-  data.tar.gz: 37091d44a903d2c0d9edf994e90b771465bfc5c8a464bb310c73f5cfa66231d274c6ccaf5959ac8fbd38cb0164d8fecf83bad8ec8bf7474a619dcf5d48951aa7
+  metadata.gz: 28dad009825df7ce472a842b134f47eb6341171a176c4ebf88c01f092819d7e1cdf3645c88142e18fbe35c9c811ff022eee4715df47b8a053382158b426fa987
+  data.tar.gz: 86d7d8120d867c48cd2a480b71cc4ee0fd72f39bd2c70cc34ae8a73bbd9706fc031e4b39d522387865f107bba1b43fdd8fae7f9bb3e1a6f849ca0c38077f06ce

data/lib/solargraph/api_map/source.rb

@@ -210,7 +210,7 @@ module Solargraph
             fqn = tree.join('::')
             @namespace_nodes[fqn] ||= []
             @namespace_nodes[fqn].push node
-            namespace_pins.push Solargraph::Pin::Namespace.new(self, node, tree[0..-2].join('::') || '')
+            namespace_pins.push Solargraph::Pin::Namespace.new(self, node, tree[0..-2].join('::') || '', :public)
             if node.type == :class and !node.children[1].nil?
               sc = unpack_name(node.children[1])
               superclasses[fqn] = sc
@@ -264,17 +264,46 @@ module Solargraph
               elsif c.type == :sym
                 symbol_pins.push Solargraph::Pin::Symbol.new(self, c, fqn)
               elsif c.type == :casgn
-                constant_pins.push Solargraph::Pin::Constant.new(self, c, fqn)
+                constant_pins.push Solargraph::Pin::Constant.new(self, c, fqn, :public)
               else
                 if c.kind_of?(AST::Node)
                   if c.type == :def and c.children[0].to_s[0].match(/[a-z]/i)
                     method_pins.push Solargraph::Pin::Method.new(source, c, fqn || '', scope, visibility)
                   elsif c.type == :defs
-                    method_pins.push Solargraph::Pin::Method.new(source, c, fqn || '', :class, :public)
-                    inner_map_node c, tree, :public, :class, fqn, stack
+                    s_visi = visibility
+                    s_visi = :public if scope != :class
+                    method_pins.push Solargraph::Pin::Method.new(source, c, fqn || '', :class, s_visi)
+                    inner_map_node c, tree, scope, :class, fqn, stack
                     next
                   elsif c.type == :send and [:public, :protected, :private].include?(c.children[1])
                     visibility = c.children[1]
+                  elsif c.type == :send and [:private_class_method].include?(c.children[1]) and c.children[2].kind_of?(AST::Node)
+                    if c.children[2].type == :sym or c.children[2].type == :str
+                      ref = method_pins.select{|p| p.name == c.children[2].children[0].to_s}.first
+                      unless ref.nil?
+                        source.method_pins.delete ref
+                        source.method_pins.push Solargraph::Pin::Method.new(ref.source, ref.node, ref.namespace, ref.scope, :private)
+                      end
+                    else
+                      inner_map_node c, tree, :private, :class, fqn, stack
+                      next
+                    end
+                  elsif c.type == :send and [:private_constant].include?(c.children[1]) and c.children[2].kind_of?(AST::Node)
+                    if c.children[2].type == :sym or c.children[2].type == :str
+                      cn = c.children[2].children[0].to_s
+                      ref = constant_pins.select{|p| p.name == cn}.first
+                      if ref.nil?
+                        ref = namespace_pins.select{|p| p.name == cn}.first
+                        unless ref.nil?
+                          source.namespace_pins.delete ref
+                          source.namespace_pins.push Solargraph::Pin::Namespace.new(ref.source, ref.node, ref.namespace, :private)
+                        end
+                      else
+                        source.constant_pins.delete ref
+                        source.constant_pins.push Solargraph::Pin::Constant.new(ref.source, ref.node, ref.namespace, :private)
+                      end
+                    end
+                    next
                   elsif c.type == :send and c.children[1] == :include #and node.type == :class
                     namespace_includes[fqn] ||= []
                     c.children[2..-1].each do |i|

data/lib/solargraph/api_map/source_to_yard.rb

@@ -2,6 +2,8 @@ module Solargraph
   class ApiMap
     module SourceToYard
 
+      private
+
       # Get the YARD CodeObject at the specified path.
       #
       # @return [YARD::CodeObjects::Base]
@@ -13,22 +15,25 @@ module Solargraph
         code_object_map.keys
       end
 
-      private
-
       def code_object_map
         @code_object_map ||= {}
       end
 
+      def root_code_object
+        @root_code_object ||= YARD::CodeObjects::RootObject.new(nil, 'root')
+      end
+
       def rake_yard sources
         code_object_map.clear
         sources.each do |s|
           s.namespace_pins.each do |pin|
-            if pin.kind == :class
-              code_object_map[pin.path] ||= YARD::CodeObjects::ClassObject.new(code_object_at(pin.namespace), pin.name)
+            if pin.kind == Solargraph::Suggestion::CLASS
+              code_object_map[pin.path] ||= YARD::CodeObjects::ClassObject.new(root_code_object, pin.path)
             else
-              code_object_map[pin.path] ||= YARD::CodeObjects::ModuleObject.new(code_object_at(pin.namespace), pin.name)
+              code_object_map[pin.path] ||= YARD::CodeObjects::ModuleObject.new(root_code_object, pin.path)
             end
             code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
+            code_object_map[pin.path].files.push pin.source.filename
           end
           s.namespace_includes.each_pair do |n, i|
             code_object_map[n].mixins.push code_object_map[i] unless code_object_map[i].nil?
@@ -36,11 +41,13 @@ module Solargraph
           s.attribute_pins.each do |pin|
             code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, :instance)
             code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
+            code_object_map[pin.path].files.push pin.source.filename
             #code_object_map[pin.path].parameters = []
           end
           s.method_pins.each do |pin|
             code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, pin.scope)
             code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
+            code_object_map[pin.path].files.push pin.source.filename
             code_object_map[pin.path].parameters = pin.parameters.map do |p|
               n = p.match(/^[a-z0-9\-]*?:?/i)[0]
               v = nil

data/lib/solargraph/api_map.rb

@@ -181,12 +181,14 @@ module Solargraph
       skip = []
       fqns = find_fully_qualified_namespace(namespace, root)
       if fqns.empty?
-        result.concat inner_get_constants('', skip, false)
+        result.concat inner_get_constants('', skip, false, :public)
       else
         parts = fqns.split('::')
         resolved = find_namespace_pins(parts.join('::'))
         resolved.each do |pin|
-          result.concat inner_get_constants(pin.path, skip, true)
+          visi = :public
+          visi = :private if root != '' and pin.path == fqns
+          result.concat inner_get_constants(pin.path, skip, true, visi)
         end
       end
       result.concat yard_map.get_constants(fqns)
@@ -346,29 +348,14 @@ module Solargraph
 
     # @return [String]
     def infer_assignment_node_type node, namespace
-      type = cache.get_assignment_node_type(node, namespace)
+      name_i = (node.type == :casgn ? 1 : 0) 
+      sig_i = (node.type == :casgn ? 2 : 1)
+      type = infer_literal_node_type(node.children[sig_i])
       if type.nil?
-        cmnt = get_docstring_for(node)
-        if cmnt.nil?
-          name_i = (node.type == :casgn ? 1 : 0) 
-          sig_i = (node.type == :casgn ? 2 : 1)
-          type = infer_literal_node_type(node.children[sig_i])
-          if type.nil?
-            sig = resolve_node_signature(node.children[sig_i])
-            # Avoid infinite loops from variable assignments that reference themselves
-            return nil if node.children[name_i].to_s == sig.split('.').first
-            type = infer_signature_type(sig, namespace)
-          end
-        else
-          t = cmnt.tag(:type)
-          if t.nil?
-            sig = resolve_node_signature(node.children[1])
-            type = infer_signature_type(sig, namespace)
-          else
-            type = t.types[0]
-          end
-        end
-        cache.set_assignment_node_type(node, namespace, type)
+        sig = resolve_node_signature(node.children[sig_i])
+        # Avoid infinite loops from variable assignments that reference themselves
+        return nil if node.children[name_i].to_s == sig.split('.').first
+        type = infer_signature_type(sig, namespace)
       end
       type
     end
@@ -859,29 +846,31 @@ module Solargraph
       type
     end
 
-    def inner_get_constants here, skip = [], deep = true
+    def inner_get_constants here, skip = [], deep = true, visibility
       return [] if skip.include?(here)
       skip.push here
       result = []
       cp = @const_pins[here]
       unless cp.nil?
         cp.each do |pin|
-          result.push pin_to_suggestion(pin)
+          result.push pin_to_suggestion(pin) if pin.visibility == :public or visibility == :private
         end
       end
       np = @namespace_pins[here]
       unless np.nil?
         np.each do |pin|
-          result.push pin_to_suggestion(pin)
-          if deep
-            get_include_strings_from(pin.node).each do |i|
-              result.concat inner_get_constants(i, skip, false)
+          if pin.visibility == :public || visibility == :private
+            result.push pin_to_suggestion(pin)
+            if deep
+              get_include_strings_from(pin.node).each do |i|
+                result.concat inner_get_constants(i, skip, false, :public)
+              end
             end
           end
         end
       end
       get_include_strings_from(*get_namespace_nodes(here)).each do |i|
-        result.concat inner_get_constants(i, skip, false)
+        result.concat inner_get_constants(i, skip, false, :public)
       end
       result
     end

data/lib/solargraph/code_map.rb

@@ -246,7 +246,8 @@ module Solargraph
         result.concat api_map.get_instance_methods(type) unless (type == '' and signature.include?('.'))
       end
       result = reduce_starting_with(result, word_at(index)) if filtered
-      result.uniq{|s| s.path}.sort{|a,b| a.label <=> b.label}
+      # Use a stable sort to keep the class order (e.g., local methods before superclass methods)
+      result.uniq(&:path).sort_by.with_index{ |x, idx| [x.label, idx] }
     end
 
     def signatures_at index

data/lib/solargraph/pin/constant.rb

@@ -1,6 +1,12 @@
 module Solargraph
   module Pin
     class Constant < BaseVariable
+      attr_reader :visibility
+
+      def initialize source, node, namespace, visibility
+        super(source, node, namespace)
+        @visibility = visibility
+      end
 
       def name
         @name ||= node.children[1].to_s

data/lib/solargraph/pin/namespace.rb

@@ -3,6 +3,13 @@ module Solargraph
     class Namespace < Pin::Base
       include Solargraph::NodeMethods
 
+      attr_reader :visibility
+
+      def initialize source, node, namespace, visibility
+        super(source, node, namespace)
+        @visibility = visibility
+      end
+
       def name
         @name ||= pack_name(node.children[0]).last.to_s
       end

data/lib/solargraph/server.rb

@@ -133,10 +133,6 @@ module Solargraph
       erb :document
     end
 
-    post '/shutdown' do
-      exit
-    end
-
     # @return [Solargraph::ApiMap]
     def self.get_api_map workspace
       api_map = nil

data/lib/solargraph/suggestion.rb

@@ -1,16 +1,17 @@
 require 'json'
 
 module Solargraph
-
+  # Information about a class, module, method, or variable.
+  #
   class Suggestion
-    CLASS =    'Class'
+    CLASS    = 'Class'
     CONSTANT = 'Constant'
-    FIELD =    'Field'
-    KEYWORD =  'Keyword'
-    METHOD =   'Method'
-    MODULE =   'Module'
+    FIELD    = 'Field'
+    KEYWORD  = 'Keyword'
+    METHOD   = 'Method'
+    MODULE   = 'Module'
     PROPERTY = 'Property'
-    SNIPPET =  'Snippet'
+    SNIPPET  = 'Snippet'
     VARIABLE = 'Variable'
 
     # @return [String]
@@ -51,6 +52,14 @@ module Solargraph
       @path = path
     end
 
+    # The full path of the suggestion.
+    #
+    # Examples:
+    # - MyClass
+    # - MyModule::MyClass
+    # - MyClass#instance_method
+    # - MyModule.singleton_method
+    #
     # @return [String]
     def path
       @path ||= (code_object.nil? ? label : code_object.path)
@@ -99,7 +108,13 @@ module Solargraph
       @params
     end
 
-    def inject_detail
+    # True if the suggestion has documentation.
+    # Useful for determining whether a client should resolve a suggestion's
+    # path to retrieve more information about it.
+    #
+    # @return [Boolean]
+    def has_doc?
+      !documentation.empty?
     end
 
     def as_json args = {}
@@ -112,7 +127,8 @@ module Solargraph
         location: (@location.nil? ? nil : @location.to_s),
         arguments: @arguments,
         params: params,
-        return_type: return_type
+        return_type: return_type,
+        has_doc: has_doc?
       }
       result[:documentation] = documentation if args[:all]
       result
@@ -122,10 +138,11 @@ module Solargraph
       as_json.to_json(args)
     end
 
+    # Generate a suggestion from a pin.
+    #
     # @param pin [Solargraph::Pin::Base]
     def self.pull pin, return_type = nil
       Suggestion.new(pin.name, insert: pin.name.gsub(/=/, ' = '), kind: pin.kind, docstring: pin.docstring, detail: pin.namespace, arguments: pin.parameters, path: pin.path, return_type: return_type || pin.return_type, location: pin.location)
     end
   end
-
 end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.15.2'
+  VERSION = '0.15.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser