solargraph 0.21.1 → 0.22.0

data/lib/solargraph/source/node_methods.rb

@@ -0,0 +1,111 @@
+module Solargraph
+  class Source
+    module NodeMethods
+      module_function
+
+      # @return [String]
+      def unpack_name(node)
+        pack_name(node).join("::")
+      end
+
+      # @return [Array<String>]
+      def pack_name(node)
+        parts = []
+        if node.kind_of?(AST::Node)
+          node.children.each { |n|
+            if n.kind_of?(AST::Node)
+              if n.type == :cbase
+                parts = pack_name(n)
+              else
+                parts += pack_name(n)
+              end
+            else
+              parts.push n unless n.nil?
+            end
+          }
+        end
+        parts
+      end
+
+      # @return [String]
+      def const_from node
+        if node.kind_of?(AST::Node) and node.type == :const
+          result = ''
+          unless node.children[0].nil?
+            result = const_from(node.children[0])
+          end
+          if result == ''
+            result = node.children[1].to_s
+          else
+            result = result + '::' + node.children[1].to_s
+          end
+          result
+        else
+          nil
+        end
+      end
+
+      # @return [String]
+      def infer_literal_node_type node
+        return nil unless node.kind_of?(AST::Node)
+        if node.type == :str or node.type == :dstr
+          return 'String'
+        elsif node.type == :array
+          return 'Array'
+        elsif node.type == :hash
+          return 'Hash'
+        elsif node.type == :int
+          return 'Integer'
+        elsif node.type == :float
+          return 'Float'
+        elsif node.type == :sym
+          return 'Symbol'
+        # @todo Maybe ignore nils
+        # elsif node.type == :nil
+        #   return 'NilClass'
+        end
+        nil
+      end
+
+      # Get a call signature from a node.
+      # The result should be a string in the form of a method path, e.g.,
+      # String.new or variable.method.
+      #
+      # @return [String]
+      def resolve_node_signature node
+        result = drill_signature node, ''
+        return nil if result.empty?
+        result
+      end
+
+      def get_node_start_position(node)
+        Position.new(node.loc.line - 1, node.loc.column)
+      end
+
+      def get_node_end_position(node)
+        Position.new(node.loc.last_line - 1, node.loc.last_column)
+      end
+
+      def drill_signature node, signature
+        return signature unless node.kind_of?(AST::Node)
+        if node.type == :const or node.type == :cbase
+          unless node.children[0].nil?
+            signature += drill_signature(node.children[0], signature)
+          end
+          signature += '::' unless signature.empty?
+          signature += node.children[1].to_s
+        elsif node.type == :lvar or node.type == :ivar or node.type == :cvar
+          signature += '.' unless signature.empty?
+          signature += node.children[0].to_s
+        elsif node.type == :send
+          unless node.children[0].nil?
+            signature += drill_signature(node.children[0], signature)
+          end
+          signature += '.' unless signature.empty?
+          signature += node.children[1].to_s
+        end
+        signature
+      end
+    end
+  end
+end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.21.1'
+  VERSION = '0.22.0'
 end

data/lib/solargraph/workspace.rb

@@ -132,15 +132,21 @@ module Solargraph
 
     def generate_require_paths
       return [] if directory.nil?
-      return [File.join(directory, 'lib')] unless gemspec?
+      return configured_require_paths unless gemspec?
       result = []
       gemspecs.each do |file|
         spec = Gem::Specification.load(file)
         base = File.dirname(file)
         result.concat spec.require_paths.map{ |path| File.join(base, path) } unless spec.nil?
       end
+      result.concat config.require_paths
       result.push File.join(directory, 'lib') if result.empty?
       result
     end
+
+    def configured_require_paths
+      return [File.join(directory, 'lib')] if config.require_paths.empty?
+      config.require_paths.map{|p| File.join(directory, p)}
+    end
   end
 end

data/lib/solargraph/workspace/config.rb

@@ -13,7 +13,7 @@ module Solargraph
       def initialize workspace = nil
         @workspace = workspace
         include_globs = ['**/*.rb']
-        exclude_globs = ['spec/**/*', 'test/**/*', 'vendor/**/*']
+        exclude_globs = ['spec/**/*', 'test/**/*', 'vendor/**/*', '.bundle/**/*']
         unless @workspace.nil?
           sfile = File.join(@workspace, '.solargraph.yml')
           if File.file?(sfile)
@@ -44,7 +44,7 @@ module Solargraph
       end
 
       # An array of files excluded from the workspace.
-      # 
+      #
       # @return [Array<String>]
       def excluded
         return [] if workspace.nil?
@@ -67,6 +67,10 @@ module Solargraph
         raw_data['require']
       end
 
+      def require_paths
+        raw_data['require_paths'] || []
+      end
+
       def plugins
         raw_data['plugins']
       end

data/lib/solargraph/yard_map.rb

@@ -152,9 +152,20 @@ module Solargraph
             ns = nil
             ns = find_first_resolved_object(yard, namespace, scope)
             unless ns.nil?
+              has_new = false
               ns.meths(scope: :class, visibility: visibility).each { |m|
+                has_new = true if m.name == 'new'
                 meths.push Pin::YardObject.new(m, object_location(m))
               }
+              # HACK: Convert #initialize to .new
+              if visibility.include?(:public) and !has_new
+                init = ns.meths(scope: :instance).select{|m| m.to_s.split(/[\.#]/).last == 'initialize'}.first
+                unless init.nil?
+                  ip = Solargraph::Pin::YardObject.new(init, object_location(init))
+                  np = Solargraph::Pin::Method.new(ip.location, ip.namespace, 'new', ip.docstring, :class, :public, ip.parameters)
+                  meths.push np
+                end
+              end
               # Collect superclass methods
               if ns.kind_of?(YARD::CodeObjects::ClassObject) and !ns.superclass.nil?
                 meths += get_methods ns.superclass.to_s, '', visibility: [:public, :protected] unless ['Object', 'BasicObject', ''].include?(ns.superclass.to_s)
@@ -286,12 +297,12 @@ module Solargraph
       unresolved_requires.clear
       required.each do |r|
         next if r.nil?
+        next if !workspace.nil? and workspace.would_require?(r)
         begin
           spec = Gem::Specification.find_by_path(r) || Gem::Specification.find_by_name(r.split('/').first)
           ver = spec.version.to_s
           ver = ">= 0" if ver.empty?
           add_gem_dependencies spec
-          next if !workspace.nil? and workspace.would_require?(r)
           yd = YARD::Registry.yardoc_file_for_gem(spec.name, ver)
           @gem_paths[spec.name] = spec.full_gem_path
           unresolved_requires.push r if yd.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -102,16 +102,16 @@ dependencies:
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +208,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
 description: IDE tools for code completion and inline documentation
 email: admin@castwide.com
 executables:
@@ -249,6 +263,7 @@ files:
 - lib/solargraph/language_server/message/extended/check_gem_version.rb
 - lib/solargraph/language_server/message/extended/document.rb
 - lib/solargraph/language_server/message/extended/document_gems.rb
+- lib/solargraph/language_server/message/extended/download_core.rb
 - lib/solargraph/language_server/message/extended/search.rb
 - lib/solargraph/language_server/message/initialize.rb
 - lib/solargraph/language_server/message/initialized.rb
@@ -267,6 +282,8 @@ files:
 - lib/solargraph/language_server/message/text_document/formatting.rb
 - lib/solargraph/language_server/message/text_document/hover.rb
 - lib/solargraph/language_server/message/text_document/on_type_formatting.rb
+- lib/solargraph/language_server/message/text_document/references.rb
+- lib/solargraph/language_server/message/text_document/rename.rb
 - lib/solargraph/language_server/message/text_document/signature_help.rb
 - lib/solargraph/language_server/message/workspace.rb
 - lib/solargraph/language_server/message/workspace/did_change_configuration.rb
@@ -282,7 +299,6 @@ files:
 - lib/solargraph/library.rb
 - lib/solargraph/live_map.rb
 - lib/solargraph/live_map/cache.rb
-- lib/solargraph/node_methods.rb
 - lib/solargraph/page.rb
 - lib/solargraph/pin.rb
 - lib/solargraph/pin/attribute.rb
@@ -304,6 +320,7 @@ files:
 - lib/solargraph/pin/method_parameter.rb
 - lib/solargraph/pin/namespace.rb
 - lib/solargraph/pin/plugin/method.rb
+- lib/solargraph/pin/proxy_method.rb
 - lib/solargraph/pin/reference.rb
 - lib/solargraph/pin/symbol.rb
 - lib/solargraph/pin/yard_object.rb
@@ -320,6 +337,7 @@ files:
 - lib/solargraph/source/fragment.rb
 - lib/solargraph/source/location.rb
 - lib/solargraph/source/mapper.rb
+- lib/solargraph/source/node_methods.rb
 - lib/solargraph/source/position.rb
 - lib/solargraph/source/range.rb
 - lib/solargraph/source/updater.rb

data/lib/solargraph/node_methods.rb

@@ -1,101 +0,0 @@
-module Solargraph
-  module NodeMethods
-    # @return [String]
-    def unpack_name(node)
-      pack_name(node).join("::")
-    end
-
-    # @return [Array<String>]
-    def pack_name(node)
-      parts = []
-      if node.kind_of?(AST::Node)
-        node.children.each { |n|
-          if n.kind_of?(AST::Node)
-            if n.type == :cbase
-              parts = pack_name(n)
-            else
-              parts += pack_name(n)
-            end
-          else
-            parts.push n unless n.nil?
-          end
-        }
-      end
-      parts
-    end
-
-    # @return [String]
-    def const_from node
-      if node.kind_of?(AST::Node) and node.type == :const
-        result = ''
-        unless node.children[0].nil?
-          result = const_from(node.children[0])
-        end
-        if result == ''
-          result = node.children[1].to_s
-        else
-          result = result + '::' + node.children[1].to_s
-        end
-        result
-      else
-        nil
-      end
-    end
-
-    # @return [String]
-    def infer_literal_node_type node
-      return nil unless node.kind_of?(AST::Node)
-      if node.type == :str or node.type == :dstr
-        return 'String'
-      elsif node.type == :array
-        return 'Array'
-      elsif node.type == :hash
-        return 'Hash'
-      elsif node.type == :int
-        return 'Integer'
-      elsif node.type == :float
-        return 'Float'
-      elsif node.type == :sym
-        return 'Symbol'
-      # @todo Maybe ignore nils
-      # elsif node.type == :nil
-      #   return 'NilClass'
-      end
-      nil
-    end
-
-    # Get a call signature from a node.
-    # The result should be a string in the form of a method path, e.g.,
-    # String.new or variable.method.
-    #
-    # @return [String]
-    def resolve_node_signature node
-      result = drill_signature node, ''
-      return nil if result.empty?
-      result
-    end
-
-    private
-
-    def drill_signature node, signature
-      return signature unless node.kind_of?(AST::Node)
-      if node.type == :const or node.type == :cbase
-        unless node.children[0].nil?
-          signature += drill_signature(node.children[0], signature)
-        end
-        signature += '::' unless signature.empty?
-        signature += node.children[1].to_s
-      elsif node.type == :lvar or node.type == :ivar or node.type == :cvar
-        signature += '.' unless signature.empty?
-        signature += node.children[0].to_s
-      elsif node.type == :send
-        unless node.children[0].nil?
-          signature += drill_signature(node.children[0], signature)
-        end
-        signature += '.' unless signature.empty?
-        signature += node.children[1].to_s
-      end
-      signature
-    end
-  end
-end