solargraph 0.27.1 → 0.28.0

data/lib/solargraph/source_map/mapper.rb

@@ -25,8 +25,6 @@ module Solargraph
         end
         @node_comments = associate_comments(node, comments)
         @pins = []
-        @requires = []
-        @symbols = []
         @locals = []
         @strings = []
 
@@ -34,17 +32,17 @@ module Solargraph
         root = AST::Node.new(:source, [filename])
         root = root.append node
         # @todo Is the root namespace a class or a module? Assuming class for now.
-        @pins.push Pin::Namespace.new(get_node_location(nil), '', '', nil, :class, :public, nil)
+        @pins.push Pin::Namespace.new(get_node_location(nil), '', '', nil, :class, :public)
         process root
         process_comment_directives
-        [@pins, @locals, @requires, @symbols]
+        [@pins, @locals]
       end
 
       def unmap filename, code
         s = Position.new(0, 0)
         e = Position.from_offset(code, code.length)
         location = Location.new(filename, Range.new(s, e))
-        [[Pin::Namespace.new(location, '', '', '', :class, :public, nil)], [], [], []]
+        [[Pin::Namespace.new(location, '', '', '', :class, :public)], []]
       end
 
       class << self
@@ -99,7 +97,8 @@ module Solargraph
             if node.type == :class and !node.children[1].nil?
               sc = unpack_name(node.children[1])
             end
-            pins.push Solargraph::Pin::Namespace.new(get_node_location(node), tree[0..-2].join('::') || '', pack_name(node.children[0]).last.to_s, comments_for(node), node.type, visibility, sc)
+            pins.push Solargraph::Pin::Namespace.new(get_node_location(node), tree[0..-2].join('::') || '', pack_name(node.children[0]).last.to_s, comments_for(node), node.type, visibility)
+            pins.push Pin::Reference::Superclass.new(pins.last.location, pins.last.path, sc) unless sc.nil?
           end
           file = filename
           node.children.each do |c|
@@ -131,10 +130,10 @@ module Solargraph
                   ora = find_parent(stack, :or_asgn)
                   unless ora.nil?
                     u = c.updated(:cvasgn, c.children + ora.children[1..-1], nil)
-                    pins.push Solargraph::Pin::ClassVariable.new(get_node_location(u), fqn || '', c.children[0].to_s, comments_for(u), u.children[1], infer_literal_node_type(u.children[1]), context)
+                    pins.push Solargraph::Pin::ClassVariable.new(get_node_location(u), fqn || '', c.children[0].to_s, comments_for(u), u.children[1], infer_literal_node_type(u.children[1]), context.context)
                   end
                 else
-                  pins.push Solargraph::Pin::ClassVariable.new(get_node_location(c), fqn || '', c.children[0].to_s, comments_for(c), c.children[1], infer_literal_node_type(c.children[1]), context)
+                  pins.push Solargraph::Pin::ClassVariable.new(get_node_location(c), fqn || '', c.children[0].to_s, comments_for(c), c.children[1], infer_literal_node_type(c.children[1]), context.context)
                 end
               elsif c.type == :lvasgn
                 here = get_node_start_position(c)
@@ -145,27 +144,27 @@ module Solargraph
                   ora = find_parent(stack, :or_asgn)
                   unless ora.nil?
                     u = c.updated(:lvasgn, c.children + ora.children[1..-1], nil)
-                    @locals.push Solargraph::Pin::LocalVariable.new(get_node_location(u), fqn, u.children[0].to_s, comments_for(ora), u.children[1], infer_literal_node_type(c.children[1]), context, block, presence)
+                    @locals.push Solargraph::Pin::LocalVariable.new(get_node_location(u), fqn, u.children[0].to_s, comments_for(ora), u.children[1], infer_literal_node_type(c.children[1]), context.context, block, presence)
                   end
                 else
-                  @locals.push Solargraph::Pin::LocalVariable.new(get_node_location(c), fqn, c.children[0].to_s, comments_for(c), c.children[1], infer_literal_node_type(c.children[1]), context, block, presence)
+                  @locals.push Solargraph::Pin::LocalVariable.new(get_node_location(c), fqn, c.children[0].to_s, comments_for(c), c.children[1], infer_literal_node_type(c.children[1]), context.context, block, presence)
                 end
               elsif c.type == :gvasgn
                 if c.children[1].nil?
                   ora = find_parent(stack, :or_asgn)
                   unless ora.nil?
                     u = c.updated(:gvasgn, c.children + ora.children[1..-1], nil)
-                    pins.push Solargraph::Pin::GlobalVariable.new(get_node_location(c), fqn, u.children[0].to_s, comments_for(c), u.children[1], infer_literal_node_type(c.children[1]), @pins.first)
+                    pins.push Solargraph::Pin::GlobalVariable.new(get_node_location(c), fqn, u.children[0].to_s, comments_for(c), u.children[1], infer_literal_node_type(c.children[1]), @pins.first.context)
                   end
                 else
-                  pins.push Solargraph::Pin::GlobalVariable.new(get_node_location(c), fqn, c.children[0].to_s, comments_for(c), c.children[1], infer_literal_node_type(c.children[1]), @pins.first)
+                  pins.push Solargraph::Pin::GlobalVariable.new(get_node_location(c), fqn, c.children[0].to_s, comments_for(c), c.children[1], infer_literal_node_type(c.children[1]), @pins.first.context)
                 end
               elsif c.type == :sym
-                @symbols.push Solargraph::Pin::Symbol.new(get_node_location(c), ":#{c.children[0]}")
+                pins.push Solargraph::Pin::Symbol.new(get_node_location(c), ":#{c.children[0]}")
               elsif c.type == :casgn
                 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, comments_for(c), c.children[2], infer_literal_node_type(c.children[2]), block, :public)
+                pins.push Solargraph::Pin::Constant.new(get_node_location(c), fqn, c.children[1].to_s, comments_for(c), c.children[2], infer_literal_node_type(c.children[2]), block.context, :public)
               elsif c.type == :def
                 methpin = Solargraph::Pin::Method.new(get_node_location(c), fqn || '', c.children[(c.type == :def ? 0 : 1)].to_s, comments_for(c), scope, visibility, get_method_args(c))
                 if methpin.name == 'initialize' and methpin.scope == :instance
@@ -216,7 +215,8 @@ module Solargraph
                     if ref.kind == Pin::CONSTANT
                       pins.push ref.class.new(ref.location, ref.namespace, ref.name, ref.comments, ref.signature, ref.return_type, ref.context, :private)
                     else
-                      pins.push ref.class.new(ref.location, ref.namespace, ref.name, ref.comments, ref.type, :private, (ref.superclass_reference.nil? ? nil : ref.superclass_reference.name))
+                      # pins.push ref.class.new(ref.location, ref.namespace, ref.name, ref.comments, ref.type, :private, (ref.superclass_reference.nil? ? nil : ref.superclass_reference.name))
+                      pins.push ref.class.new(ref.location, ref.namespace, ref.name, ref.comments, ref.type, :private)
                     end
                   end
                 end
@@ -253,8 +253,9 @@ module Solargraph
                     c.children[2..-1].each do |i|
                       nspin = @pins.select{|pin| pin.kind == Pin::NAMESPACE and pin.path == fqn}.last
                       unless nspin.nil?
-                        iref = Pin::Reference.new(get_node_location(c), nspin.path, unpack_name(i))
-                        nspin.include_references.push(iref)
+                        # iref = Pin::Reference.new(get_node_location(c), nspin.path, unpack_name(i))
+                        # nspin.include_references.push(iref)
+                        pins.push Pin::Reference::Include.new(get_node_location(c), nspin.path, unpack_name(i))
                       end
                     end
                   end
@@ -267,11 +268,14 @@ module Solargraph
                     unless nspin.nil?
                       ref = nil
                       if i.type == :self
-                        ref = Pin::Reference.new(get_node_location(c), nspin.path, nspin.path)
+                        # ref = Pin::Reference.new(get_node_location(c), nspin.path, nspin.path)
+                        ref = Pin::Reference::Extend.new(get_node_location(c), nspin.path, nspin.path)
                       elsif i.type == :const
-                        ref = Pin::Reference.new(get_node_location(c), nspin.path, unpack_name(i))
+                        # ref = Pin::Reference.new(get_node_location(c), nspin.path, unpack_name(i))
+                        ref = Pin::Reference::Extend.new(get_node_location(c), nspin.path, unpack_name(i))
                       end
-                      nspin.extend_references.push(ref) unless ref.nil?
+                      # nspin.extend_references.push(ref) unless ref.nil?
+                      pins.push ref unless ref.nil?
                     end
                   end
                 end
@@ -289,7 +293,8 @@ module Solargraph
                 next
               elsif c.type == :send and c.children[1] == :require
                 if c.children[2].kind_of?(AST::Node) and c.children[2].type == :str
-                  @requires.push Solargraph::Pin::Reference.new(get_node_location(c), fqn, c.children[2].children[0].to_s)
+                  # @requires.push Solargraph::Pin::Reference.new(get_node_location(c), fqn, c.children[2].children[0].to_s)
+                  pins.push Pin::Reference::Require.new(get_node_location(c), c.children[2].children[0].to_s)
                 end
               elsif c.type == :args
                 if @node_stack.first.type == :block

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.27.1'
+  VERSION = '0.28.0'
 end

data/lib/solargraph/workspace.rb

@@ -130,8 +130,7 @@ module Solargraph
       source_hash.clear
       unless directory.nil?
         size = config.calculated.length
-        raise WorkspaceTooLargeError.new(size, config.max_files) if config.max_files > 0 and size > config.max_files
-
+        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|
           source_hash[filename] = Solargraph::Source.load(filename)
         end

data/lib/solargraph/workspace/config.rb

@@ -2,6 +2,8 @@ require 'yaml'
 
 module Solargraph
   class Workspace
+    # Configuration data for a workspace.
+    #
     class Config
       # The maximum number of files that can be added to a workspace.
       # The workspace's .solargraph.yml can override this value.
@@ -21,10 +23,9 @@ module Solargraph
         unless @workspace.nil?
           sfile = File.join(@workspace, '.solargraph.yml')
           if File.file?(sfile)
-            @raw_data = YAML.load(File.read(sfile))
-            conf = YAML.load(File.read(sfile))
-            include_globs = conf['include'] || include_globs
-            exclude_globs = conf['exclude'] || []
+            @raw_data = YAML.safe_load(File.read(sfile))
+            include_globs = @raw_data['include'] || include_globs
+            exclude_globs = @raw_data['exclude'] || []
           end
         end
         @raw_data ||= {}
@@ -34,6 +35,7 @@ module Solargraph
         @raw_data['domains'] ||= []
         @raw_data['reporters'] ||= %w[rubocop require_not_found]
         @raw_data['plugins'] ||= []
+        @raw_data['require_paths'] ||= []
         @raw_data['max_files'] ||= MAX_FILES
         included
         excluded
@@ -78,6 +80,9 @@ module Solargraph
         raw_data['require']
       end
 
+      # An array of load paths for required paths.
+      #
+      # @return [Array<String>]
       def require_paths
         raw_data['require_paths'] || []
       end
@@ -146,7 +151,7 @@ module Solargraph
       # @param glob [String]
       # @return [Boolean]
       def glob_is_directory? glob
-        File.directory?(glob) or File.directory?(glob_to_directory(glob))
+        File.directory?(glob) || File.directory?(glob_to_directory(glob))
       end
 
       # Translate a glob to a base directory if applicable

data/lib/solargraph/yard_map.rb

@@ -140,8 +140,10 @@ module Solargraph
       pins.clear
       unresolved_requires.clear
       stdnames = {}
+      done = []
       required.each do |r|
-        next if r.nil? or r.empty?
+        next if r.nil? || r.empty? || done.include?(r)
+        done.push r
         cached = cache.get_path_pins(r)
         unless cached.nil?
           pins.concat cached

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -330,6 +330,10 @@ files:
 - lib/solargraph/pin/plugin/method.rb
 - lib/solargraph/pin/proxy_type.rb
 - lib/solargraph/pin/reference.rb
+- lib/solargraph/pin/reference/extend.rb
+- lib/solargraph/pin/reference/include.rb
+- lib/solargraph/pin/reference/require.rb
+- lib/solargraph/pin/reference/superclass.rb
 - lib/solargraph/pin/symbol.rb
 - lib/solargraph/pin/yard_pin.rb
 - lib/solargraph/pin/yard_pin/constant.rb
@@ -350,7 +354,6 @@ files:
 - lib/solargraph/source/chain/call.rb
 - lib/solargraph/source/chain/class_variable.rb
 - lib/solargraph/source/chain/constant.rb
-- lib/solargraph/source/chain/definition.rb
 - lib/solargraph/source/chain/global_variable.rb
 - lib/solargraph/source/chain/head.rb
 - lib/solargraph/source/chain/instance_variable.rb

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

@@ -1,20 +0,0 @@
-module Solargraph
-  class Source
-    class Chain
-      class Definition < Link
-        # @param location [Solargraph::Location]
-        def initialize location
-          @location = location
-        end
-
-        # @param api_map [ApiMap]
-        def resolve api_map, name_pin, locals
-          result = api_map.locate_pin(@location)
-          # result = api_map.source_map(@location.filename).locate_named_path_pin(@location.range.start.line, @location.range.start.column)
-          return [] if result.nil?
-          [result]
-        end
-      end
-    end
-  end
-end