solargraph 0.32.1 → 0.32.2

data/lib/solargraph/source_map/node_processor/defs_node.rb

@@ -1,21 +1,21 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class DefsNode < DefNode
-        def process
-          s_visi = region.visibility
-          s_visi = :public if s_visi == :module_function || region.scope != :class
-          if node.children[0].is_a?(AST::Node) && node.children[0].type == :self
-            dfqn = region.namespace
-          else
-            dfqn = unpack_name(node.children[0])
-          end
-          unless dfqn.nil?
-            pins.push Solargraph::Pin::Method.new(get_node_location(node), dfqn, "#{node.children[1]}", comments_for(node), :class, s_visi, method_args, node)
-            process_children region.update(namespace: dfqn)
-          end
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class DefsNode < DefNode
+        def process
+          s_visi = region.visibility
+          s_visi = :public if s_visi == :module_function || region.scope != :class
+          if node.children[0].is_a?(AST::Node) && node.children[0].type == :self
+            dfqn = region.namespace
+          else
+            dfqn = unpack_name(node.children[0])
+          end
+          unless dfqn.nil?
+            pins.push Solargraph::Pin::Method.new(get_node_location(node), dfqn, "#{node.children[1]}", comments_for(node), :class, s_visi, method_args, node)
+            process_children region.update(namespace: dfqn)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/node_processor/gvasgn_node.rb

@@ -1,12 +1,12 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class GvasgnNode < Base
-        def process
-          pins.push Solargraph::Pin::GlobalVariable.new(get_node_location(node), region.namespace, node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), pins.first.context)
-          process_children
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class GvasgnNode < Base
+        def process
+          pins.push Solargraph::Pin::GlobalVariable.new(get_node_location(node), region.namespace, node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), pins.first.context)
+          process_children
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/node_processor/ivasgn_node.rb

@@ -1,18 +1,18 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class IvasgnNode < Base
-        def process
-          here = get_node_start_position(node)
-          named_path = named_path_pin(here)
-          pins.push Solargraph::Pin::InstanceVariable.new(get_node_location(node), region.namespace,node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), named_path.context)
-          if region.visibility == :module_function and named_path.kind == Pin::METHOD
-            other = ComplexType.try_parse("Module<#{named_path.context.namespace}>")
-            pins.push Solargraph::Pin::InstanceVariable.new(get_node_location(node), region.namespace,node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), other)
-          end
-          process_children
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class IvasgnNode < Base
+        def process
+          here = get_node_start_position(node)
+          named_path = named_path_pin(here)
+          pins.push Solargraph::Pin::InstanceVariable.new(get_node_location(node), region.namespace,node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), named_path.context)
+          if region.visibility == :module_function and named_path.kind == Pin::METHOD
+            other = ComplexType.try_parse("Module<#{named_path.context.namespace}>")
+            pins.push Solargraph::Pin::InstanceVariable.new(get_node_location(node), region.namespace,node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), other)
+          end
+          process_children
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/node_processor/lvasgn_node.rb

@@ -1,16 +1,16 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class LvasgnNode < Base
-        def process
-          here = get_node_start_position(node)
-          context = named_path_pin(here)
-          block = block_pin(here)
-          presence = Range.new(here, block.location.range.ending)
-          pins.push Solargraph::Pin::LocalVariable.new(get_node_location(node), region.namespace, node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), context.context, block, presence)
-          process_children
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class LvasgnNode < Base
+        def process
+          here = get_node_start_position(node)
+          context = named_path_pin(here)
+          block = block_pin(here)
+          presence = Range.new(here, block.location.range.ending)
+          pins.push Solargraph::Pin::LocalVariable.new(get_node_location(node), region.namespace, node.children[0].to_s, comments_for(node), node.children[1], infer_literal_node_type(node.children[1]), context.context, block, presence)
+          process_children
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/node_processor/namespace_node.rb

@@ -1,26 +1,26 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class NamespaceNode < Base
-        def process
-          visibility = :public
-          if node.children[0].kind_of?(AST::Node) and node.children[0].children[0].kind_of?(AST::Node) and node.children[0].children[0].type == :cbase
-            tree = pack_name(node.children[0])
-            tree.shift if tree.first.empty?
-          else
-            tree = region.namespace.empty? ? [] : [region.namespace]
-            tree.concat pack_name(node.children[0])
-          end
-          fqn = tree.join('::')
-          sc = nil
-          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)
-          pins.push Pin::Reference::Superclass.new(pins.last.location, pins.last.path, sc) unless sc.nil?
-          process_children region.update(namespace: fqn, scope: :instance, visibility: :public)
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class NamespaceNode < Base
+        def process
+          visibility = :public
+          if node.children[0].kind_of?(AST::Node) and node.children[0].children[0].kind_of?(AST::Node) and node.children[0].children[0].type == :cbase
+            tree = pack_name(node.children[0])
+            tree.shift if tree.first.empty?
+          else
+            tree = region.namespace.empty? ? [] : [region.namespace]
+            tree.concat pack_name(node.children[0])
+          end
+          fqn = tree.join('::')
+          sc = nil
+          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)
+          pins.push Pin::Reference::Superclass.new(pins.last.location, pins.last.path, sc) unless sc.nil?
+          process_children region.update(namespace: fqn, scope: :instance, visibility: :public)
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/node_processor/orasgn_node.rb

@@ -1,12 +1,12 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class OrasgnNode < Base
-        def process
-          new_node = node.updated(node.children[0].type, node.children[0].children + [node.children[1]])
-          NodeProcessor.process(new_node, region, pins)
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class OrasgnNode < Base
+        def process
+          new_node = node.updated(node.children[0].type, node.children[0].children + [node.children[1]])
+          NodeProcessor.process(new_node, region, pins)
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/node_processor/sclass_node.rb

@@ -1,11 +1,11 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class SclassNode < Base
-        def process
-          process_children region.update(visibility: :public, scope: :class)
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class SclassNode < Base
+        def process
+          process_children region.update(visibility: :public, scope: :class)
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map/node_processor/send_node.rb

@@ -1,162 +1,162 @@
-module Solargraph
-  class SourceMap
-    module NodeProcessor
-      class SendNode < Base
-        def process
-          if node.children[0].nil?
-            if [:private, :public, :protected].include?(node.children[1])
-              if (node.children.length > 2)
-                node.children[2..-1].each do |child|
-                  next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
-                  name = child.children[0].to_s
-                  matches = pins.select{ |pin| [Pin::METHOD, Pin::ATTRIBUTE].include?(pin.kind) && pin.name == name && pin.namespace == region.namespace && pin.context.scope == region.scope }
-                  matches.each do |pin|
-                    # @todo Smelly instance variable access
-                    pin.instance_variable_set(:@visibility, node.children[1])
-                  end
-                end
-              else
-                # @todo Smelly instance variable access
-                region.instance_variable_set(:@visibility, node.children[1])
-              end
-            elsif node.children[1] == :module_function
-              process_module_function
-            elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[1])
-              process_attribute
-            elsif node.children[1] == :include
-              process_include
-            elsif node.children[1] == :extend
-              process_extend
-            elsif node.children[1] == :require 
-              process_require
-            elsif node.children[1] == :private_constant
-              process_private_constant
-            elsif node.children[1] == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
-              process_alias_method
-            elsif node.children[1] == :private_class_method && node.children[2].kind_of?(AST::Node)
-              # Processing a private class can potentially handle children on its own
-              return if process_private_class_method
-            end
-          end
-          process_children
-        end
-
-        private
-
-        def process_attribute
-          node.children[2..-1].each do |a|
-            if node.children[1] == :attr_reader || node.children[1] == :attr_accessor
-              pins.push Solargraph::Pin::Attribute.new(get_node_location(node), region.namespace, "#{a.children[0]}", comments_for(node), :reader, region.scope, region.visibility)
-            end
-            if node.children[1] == :attr_writer || node.children[1] == :attr_accessor
-              pins.push Solargraph::Pin::Attribute.new(get_node_location(node), region.namespace, "#{a.children[0]}=", comments_for(node), :writer, region.scope, region.visibility)
-            end
-          end
-        end
-
-        def process_include
-          if node.children[2].kind_of?(AST::Node) && node.children[2].type == :const
-            node.children[2..-1].each do |i|
-              nspin = pins.select{|pin| pin.kind == Pin::NAMESPACE and pin.path == region.namespace}.last
-              unless nspin.nil?
-                pins.push Pin::Reference::Include.new(get_node_location(node), nspin.path, unpack_name(i))
-              end
-            end
-          end
-        end
-
-        def process_extend
-          node.children[2..-1].each do |i|
-            nspin = pins.select{|pin| pin.kind == Pin::NAMESPACE and pin.path == region.namespace}.last
-            unless nspin.nil?
-              ref = nil
-              if i.type == :self
-                ref = Pin::Reference::Extend.new(get_node_location(node), nspin.path, nspin.path)
-              elsif i.type == :const
-                ref = Pin::Reference::Extend.new(get_node_location(node), nspin.path, unpack_name(i))
-              end
-              pins.push ref unless ref.nil?
-            end
-          end
-        end
-
-        def process_require
-          if node.children[2].kind_of?(AST::Node) && node.children[2].type == :str
-            pins.push Pin::Reference::Require.new(get_node_location(node), node.children[2].children[0].to_s)
-          end
-        end
-
-        def process_module_function
-          if node.children[2].nil?
-            # @todo Smelly instance variable access
-            region.instance_variable_set(:@visibility, :module_function)
-          elsif node.children[2].type == :sym || node.children[2].type == :str
-            # @todo What to do about references?
-            node.children[2..-1].each do |x|
-              cn = x.children[0].to_s
-              ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.namespace && p.name == cn}.first
-              unless ref.nil?
-                pins.delete ref
-                mm = Solargraph::Pin::Method.new(ref.location, ref.namespace, ref.name, ref.comments, :class, :public, ref.parameters, ref.node)
-                cm = Solargraph::Pin::Method.new(ref.location, ref.namespace, ref.name, ref.comments, :instance, :private, ref.parameters, ref.node)
-                pins.push mm, cm
-                pins.select{|pin| pin.kind == Pin::INSTANCE_VARIABLE and pin.context == ref.context}.each do |ivar|
-                  pins.delete ivar
-                  pins.push Solargraph::Pin::InstanceVariable.new(ivar.location, ivar.namespace, ivar.name, ivar.comments, ivar.signature, ivar.instance_variable_get(:@literal), mm)
-                  pins.push Solargraph::Pin::InstanceVariable.new(ivar.location, ivar.namespace, ivar.name, ivar.comments, ivar.signature, ivar.instance_variable_get(:@literal), cm)
-                end
-              end
-            end
-          elsif node.children[2].type == :def
-            NodeProcessor.process node.children[2], region.update(visibility: :module_function), pins
-          end
-        end
-
-        def process_private_constant
-          if node.children[2] && (node.children[2].type == :sym || node.children[2].type == :str)
-            # @todo What to do about references?
-            cn = node.children[2].children[0].to_s
-            ref = pins.select{|p| [Solargraph::Pin::Namespace, Solargraph::Pin::Constant].include?(p.class) && p.namespace == region.namespace && p.name == cn}.first
-            unless ref.nil?
-              pins.delete ref
-              # Might be either a namespace or constant
-              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)
-              end
-            end
-          end
-        end
-
-        def process_alias_method
-          pin = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.name == node.children[3].children[0].to_s && p.namespace == region.namespace && p.scope == region.scope}.first
-          if pin.nil?
-            pins.push Solargraph::Pin::MethodAlias.new(get_node_location(node), region.namespace, node.children[2].children[0].to_s, region.scope, node.children[3].children[0].to_s)
-          else
-            if pin.is_a?(Solargraph::Pin::Method)
-              pins.push Solargraph::Pin::Method.new(get_node_location(node), pin.namespace, node.children[2].children[0].to_s, comments_for(node) || pin.comments, pin.scope, pin.visibility, pin.parameters, pin.node)
-            elsif pin.is_a?(Solargraph::Pin::Attribute)
-              pins.push Solargraph::Pin::Attribute.new(get_node_location(node), pin.namespace, node.children[2].children[0].to_s, comments_for(node) || pin.comments, pin.access, pin.scope, pin.visibility)
-            end
-          end
-        end
-
-        def process_private_class_method
-          if node.children[2].type == :sym || node.children[2].type == :str
-            ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.namespace && p.name == node.children[2].children[0].to_s}.first
-            unless ref.nil?
-              # HACK: Smelly instance variable access
-              ref.instance_variable_set(:@visibility, :private)
-            end
-            false
-          else
-            process_children region.update(scope: :class, visibility: :private)
-            true
-          end
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  class SourceMap
+    module NodeProcessor
+      class SendNode < Base
+        def process
+          if node.children[0].nil?
+            if [:private, :public, :protected].include?(node.children[1])
+              if (node.children.length > 2)
+                node.children[2..-1].each do |child|
+                  next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
+                  name = child.children[0].to_s
+                  matches = pins.select{ |pin| [Pin::METHOD, Pin::ATTRIBUTE].include?(pin.kind) && pin.name == name && pin.namespace == region.namespace && pin.context.scope == region.scope }
+                  matches.each do |pin|
+                    # @todo Smelly instance variable access
+                    pin.instance_variable_set(:@visibility, node.children[1])
+                  end
+                end
+              else
+                # @todo Smelly instance variable access
+                region.instance_variable_set(:@visibility, node.children[1])
+              end
+            elsif node.children[1] == :module_function
+              process_module_function
+            elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[1])
+              process_attribute
+            elsif node.children[1] == :include
+              process_include
+            elsif node.children[1] == :extend
+              process_extend
+            elsif node.children[1] == :require 
+              process_require
+            elsif node.children[1] == :private_constant
+              process_private_constant
+            elsif node.children[1] == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
+              process_alias_method
+            elsif node.children[1] == :private_class_method && node.children[2].kind_of?(AST::Node)
+              # Processing a private class can potentially handle children on its own
+              return if process_private_class_method
+            end
+          end
+          process_children
+        end
+
+        private
+
+        def process_attribute
+          node.children[2..-1].each do |a|
+            if node.children[1] == :attr_reader || node.children[1] == :attr_accessor
+              pins.push Solargraph::Pin::Attribute.new(get_node_location(node), region.namespace, "#{a.children[0]}", comments_for(node), :reader, region.scope, region.visibility)
+            end
+            if node.children[1] == :attr_writer || node.children[1] == :attr_accessor
+              pins.push Solargraph::Pin::Attribute.new(get_node_location(node), region.namespace, "#{a.children[0]}=", comments_for(node), :writer, region.scope, region.visibility)
+            end
+          end
+        end
+
+        def process_include
+          if node.children[2].kind_of?(AST::Node) && node.children[2].type == :const
+            node.children[2..-1].each do |i|
+              nspin = pins.select{|pin| pin.kind == Pin::NAMESPACE and pin.path == region.namespace}.last
+              unless nspin.nil?
+                pins.push Pin::Reference::Include.new(get_node_location(node), nspin.path, unpack_name(i))
+              end
+            end
+          end
+        end
+
+        def process_extend
+          node.children[2..-1].each do |i|
+            nspin = pins.select{|pin| pin.kind == Pin::NAMESPACE and pin.path == region.namespace}.last
+            unless nspin.nil?
+              ref = nil
+              if i.type == :self
+                ref = Pin::Reference::Extend.new(get_node_location(node), nspin.path, nspin.path)
+              elsif i.type == :const
+                ref = Pin::Reference::Extend.new(get_node_location(node), nspin.path, unpack_name(i))
+              end
+              pins.push ref unless ref.nil?
+            end
+          end
+        end
+
+        def process_require
+          if node.children[2].kind_of?(AST::Node) && node.children[2].type == :str
+            pins.push Pin::Reference::Require.new(get_node_location(node), node.children[2].children[0].to_s)
+          end
+        end
+
+        def process_module_function
+          if node.children[2].nil?
+            # @todo Smelly instance variable access
+            region.instance_variable_set(:@visibility, :module_function)
+          elsif node.children[2].type == :sym || node.children[2].type == :str
+            # @todo What to do about references?
+            node.children[2..-1].each do |x|
+              cn = x.children[0].to_s
+              ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.namespace && p.name == cn}.first
+              unless ref.nil?
+                pins.delete ref
+                mm = Solargraph::Pin::Method.new(ref.location, ref.namespace, ref.name, ref.comments, :class, :public, ref.parameters, ref.node)
+                cm = Solargraph::Pin::Method.new(ref.location, ref.namespace, ref.name, ref.comments, :instance, :private, ref.parameters, ref.node)
+                pins.push mm, cm
+                pins.select{|pin| pin.kind == Pin::INSTANCE_VARIABLE and pin.context == ref.context}.each do |ivar|
+                  pins.delete ivar
+                  pins.push Solargraph::Pin::InstanceVariable.new(ivar.location, ivar.namespace, ivar.name, ivar.comments, ivar.signature, ivar.instance_variable_get(:@literal), mm)
+                  pins.push Solargraph::Pin::InstanceVariable.new(ivar.location, ivar.namespace, ivar.name, ivar.comments, ivar.signature, ivar.instance_variable_get(:@literal), cm)
+                end
+              end
+            end
+          elsif node.children[2].type == :def
+            NodeProcessor.process node.children[2], region.update(visibility: :module_function), pins
+          end
+        end
+
+        def process_private_constant
+          if node.children[2] && (node.children[2].type == :sym || node.children[2].type == :str)
+            # @todo What to do about references?
+            cn = node.children[2].children[0].to_s
+            ref = pins.select{|p| [Solargraph::Pin::Namespace, Solargraph::Pin::Constant].include?(p.class) && p.namespace == region.namespace && p.name == cn}.first
+            unless ref.nil?
+              pins.delete ref
+              # Might be either a namespace or constant
+              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)
+              end
+            end
+          end
+        end
+
+        def process_alias_method
+          pin = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.name == node.children[3].children[0].to_s && p.namespace == region.namespace && p.scope == region.scope}.first
+          if pin.nil?
+            pins.push Solargraph::Pin::MethodAlias.new(get_node_location(node), region.namespace, node.children[2].children[0].to_s, region.scope, node.children[3].children[0].to_s)
+          else
+            if pin.is_a?(Solargraph::Pin::Method)
+              pins.push Solargraph::Pin::Method.new(get_node_location(node), pin.namespace, node.children[2].children[0].to_s, comments_for(node) || pin.comments, pin.scope, pin.visibility, pin.parameters, pin.node)
+            elsif pin.is_a?(Solargraph::Pin::Attribute)
+              pins.push Solargraph::Pin::Attribute.new(get_node_location(node), pin.namespace, node.children[2].children[0].to_s, comments_for(node) || pin.comments, pin.access, pin.scope, pin.visibility)
+            end
+          end
+        end
+
+        def process_private_class_method
+          if node.children[2].type == :sym || node.children[2].type == :str
+            ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.namespace && p.name == node.children[2].children[0].to_s}.first
+            unless ref.nil?
+              # HACK: Smelly instance variable access
+              ref.instance_variable_set(:@visibility, :private)
+            end
+            false
+          else
+            process_children region.update(scope: :class, visibility: :private)
+            true
+          end
+        end
+      end
+    end
+  end
+end