solargraph 0.54.1 → 0.56.0

data/lib/solargraph/parser/parser_gem/node_processors/lvasgn_node.rb

@@ -8,8 +8,8 @@ module Solargraph
           include ParserGem::NodeMethods
 
           def process
-            # variable not visible until next statement
-            presence = Range.new(get_node_end_position(node), region.closure.location.range.ending)
+            here = get_node_start_position(node)
+            presence = Range.new(here, region.closure.location.range.ending)
             loc = get_node_location(node)
             locals.push Solargraph::Pin::LocalVariable.new(
               location: loc,
@@ -17,7 +17,8 @@ module Solargraph
               name: node.children[0].to_s,
               assignment: node.children[1],
               comments: comments_for(node),
-              presence: presence
+              presence: presence,
+              source: :parser
             )
             process_children
           end

data/lib/solargraph/parser/parser_gem/node_processors/namespace_node.rb

@@ -8,10 +8,20 @@ module Solargraph
           include ParserGem::NodeMethods
 
           def process
-            sc = nil
-            if node.type == :class and !node.children[1].nil?
-              sc = unpack_name(node.children[1])
+            superclass_name = nil
+            superclass_name = unpack_name(node.children[1]) if node.type == :class && node.children[1]&.type == :const
+
+            if Convention::StructDefinition::StructDefintionNode.valid?(node)
+              process_struct_definition
+            else
+              process_namespace(superclass_name)
             end
+          end
+
+          private
+
+          # @param superclass_name [String, nil]
+          def process_namespace(superclass_name)
             loc = get_node_location(node)
             nspin = Solargraph::Pin::Namespace.new(
               type: node.type,
@@ -20,18 +30,31 @@ module Solargraph
               name: unpack_name(node.children[0]),
               comments: comments_for(node),
               visibility: :public,
-              gates: region.closure.gates.freeze
+              gates: region.closure.gates.freeze,
+              source: :parser
             )
             pins.push nspin
-            unless sc.nil?
+            unless superclass_name.nil?
               pins.push Pin::Reference::Superclass.new(
                 location: loc,
                 closure: pins.last,
-                name: sc
+                name: superclass_name,
+                source: :parser
               )
             end
             process_children region.update(closure: nspin, visibility: :public)
           end
+
+          # @todo Move this out of [NamespaceNode] once [Solargraph::Parser::NodeProcessor] supports
+          #   multiple processors.
+          def process_struct_definition
+            processor_klass = Convention::StructDefinition::NodeProcessors::StructNode
+            processor = processor_klass.new(node, region, pins, locals)
+            processor.process
+
+            @pins = processor.pins
+            @locals = processor.locals
+          end
         end
       end
     end

data/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'parser'
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class OpasgnNode < Parser::NodeProcessor::Base
+          def process
+            # Parser::CurrentRuby.parse("a += 2")
+            # => s(:op_asgn,
+            #      s(:lvasgn, :a), :+,
+            #      s(:int, 2))
+            asgn = node.children[0]
+            variable_name = asgn.children[0]
+            operator = node.children[1]
+            argument = node.children[2]
+            # for lvasgn, gvasgn, cvasgn, convert to lvar, gvar, cvar
+            # [6] pry(main)> Parser::CurrentRuby.parse("a = a + 1")
+            # => s(:lvasgn, :a,
+            #   s(:send,
+            #     s(:lvar, :a), :+,
+            #     s(:int, 1)))
+            # [7] pry(main)>
+            variable_reference_type = asgn.type.to_s.sub(/vasgn$/, 'var').to_sym
+            variable_reference = node.updated(variable_reference_type, asgn.children)
+            send_children = [
+              variable_reference,
+              operator,
+              argument
+            ]
+            send_node = node.updated(:send, send_children)
+            new_asgn = node.updated(asgn.type, [variable_name,  send_node])
+            NodeProcessor.process(new_asgn, region, pins, locals)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/parser_gem/node_processors/resbody_node.rb

@@ -24,7 +24,8 @@ module Solargraph
                 closure: region.closure,
                 name: node.children[1].children[0].to_s,
                 comments: "@type [#{types.join(',')}]",
-                presence: presence
+                presence: presence,
+                source: :parser
               )
             end
             NodeProcessor.process(node.children[2], region, pins, locals)

data/lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb

@@ -17,7 +17,7 @@ module Solargraph
                 names.concat [NodeMethods.unpack_name(sclass.children[0]), sclass.children[1].to_s]
               end
               name = names.reject(&:empty?).join('::')
-              closure = Solargraph::Pin::Namespace.new(name: name, location: region.closure.location)
+              closure = Solargraph::Pin::Namespace.new(name: name, location: region.closure.location, source: :parser)
             elsif sclass.is_a?(AST::Node) && sclass.type == :const
               names = [region.closure.namespace, region.closure.name]
               also = NodeMethods.unpack_name(sclass)
@@ -25,13 +25,14 @@ module Solargraph
                 names << also
               end
               name = names.reject(&:empty?).join('::')
-              closure = Solargraph::Pin::Namespace.new(name: name, location: region.closure.location)
+              closure = Solargraph::Pin::Namespace.new(name: name, location: region.closure.location, source: :parser)
             else
               return
             end
             pins.push Solargraph::Pin::Singleton.new(
               location: get_node_location(node),
-              closure: closure
+              closure: closure,
+              source: :parser,
             )
             process_children region.update(visibility: :public, scope: :class, closure: pins.last)
           end

data/lib/solargraph/parser/parser_gem/node_processors/send_node.rb

@@ -34,7 +34,7 @@ module Solargraph
                 return if process_private_class_method
               end
             elsif node.children[1] == :require && node.children[0].to_s == '(const nil :Bundler)'
-              pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require')
+              pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require', source: :parser)
             end
             process_children
           end
@@ -76,7 +76,8 @@ module Solargraph
                   comments: cmnt,
                   scope: region.scope || :instance,
                   visibility: region.visibility,
-                  attribute: true
+                  attribute: true,
+                  source: :parser
                 )
               end
               if node.children[1] == :attr_writer || node.children[1] == :attr_accessor
@@ -87,10 +88,11 @@ module Solargraph
                   comments: cmnt,
                   scope: region.scope || :instance,
                   visibility: region.visibility,
-                  attribute: true
+                  attribute: true,
+                  source: :parser
                 )
                 pins.push method_pin
-                method_pin.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
+                method_pin.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last, source: :parser)
                 if method_pin.return_type.defined?
                   pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.items.map(&:rooted_tags), 'value')
                 end
@@ -107,7 +109,8 @@ module Solargraph
                 pins.push type.new(
                   location: get_node_location(i),
                   closure: cp,
-                  name: unpack_name(i)
+                  name: unpack_name(i),
+                  source: :parser
                 )
               end
             end
@@ -121,7 +124,8 @@ module Solargraph
                 pins.push Pin::Reference::Prepend.new(
                   location: get_node_location(i),
                   closure: cp,
-                  name: unpack_name(i)
+                  name: unpack_name(i),
+                  source: :parser
                 )
               end
             end
@@ -135,13 +139,15 @@ module Solargraph
                 pins.push Pin::Reference::Extend.new(
                   location: loc,
                   closure: region.closure,
-                  name: region.closure.full_context.namespace
+                  name: region.closure.full_context.namespace,
+                  source: :parser
                 )
               else
                 pins.push Pin::Reference::Extend.new(
                   location: loc,
                   closure: region.closure,
-                  name: unpack_name(i)
+                  name: unpack_name(i),
+                  source: :parser
                 )
               end
             end
@@ -151,7 +157,7 @@ module Solargraph
           def process_require
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :str
               path = node.children[2].children[0].to_s
-              pins.push Pin::Reference::Require.new(get_node_location(node), path)
+              pins.push Pin::Reference::Require.new(get_node_location(node), path, source: :parser)
             end
           end
 
@@ -159,7 +165,7 @@ module Solargraph
           def process_autoload
             if node.children[3].is_a?(AST::Node) && node.children[3].type == :str
               path = node.children[3].children[0].to_s
-              pins.push Pin::Reference::Require.new(get_node_location(node), path)
+              pins.push Pin::Reference::Require.new(get_node_location(node), path, source: :parser)
             end
           end
 
@@ -171,7 +177,8 @@ module Solargraph
             elsif node.children[2].type == :sym || node.children[2].type == :str
               node.children[2..-1].each do |x|
                 cn = x.children[0].to_s
-                ref = pins.select{ |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == cn }.first
+                # @type [Pin::Method]
+                ref = pins.find { |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == cn }
                 unless ref.nil?
                   pins.delete ref
                   mm = Solargraph::Pin::Method.new(
@@ -182,7 +189,8 @@ module Solargraph
                     comments: ref.comments,
                     scope: :class,
                     visibility: :public,
-                    node: ref.node
+                    node: ref.node,
+                    source: :parser
                   )
                   cm = Solargraph::Pin::Method.new(
                     location: ref.location,
@@ -192,7 +200,8 @@ module Solargraph
                     comments: ref.comments,
                     scope: :instance,
                     visibility: :private,
-                    node: ref.node)
+                    node: ref.node,
+                    source: :parser)
                   pins.push mm, cm
                   pins.select{|pin| pin.is_a?(Pin::InstanceVariable) && pin.closure.path == ref.path}.each do |ivar|
                     pins.delete ivar
@@ -201,14 +210,16 @@ module Solargraph
                       closure: cm,
                       name: ivar.name,
                       comments: ivar.comments,
-                      assignment: ivar.assignment
+                      assignment: ivar.assignment,
+                      source: :parser
                     )
                     pins.push Solargraph::Pin::InstanceVariable.new(
                       location: ivar.location,
                       closure: mm,
                       name: ivar.name,
                       comments: ivar.comments,
-                      assignment: ivar.assignment
+                      assignment: ivar.assignment,
+                      source: :parser
                     )
                   end
                 end
@@ -236,7 +247,8 @@ module Solargraph
               closure: region.closure,
               name: node.children[2].children[0].to_s,
               original: node.children[3].children[0].to_s,
-              scope: region.scope || :instance
+              scope: region.scope || :instance,
+              source: :parser
             )
           end
 

data/lib/solargraph/parser/parser_gem/node_processors/sym_node.rb

@@ -8,7 +8,8 @@ module Solargraph
           def process
             pins.push Solargraph::Pin::Symbol.new(
               get_node_location(node),
-              ":#{node.children[0]}"
+              ":#{node.children[0]}",
+              source: :parser
             )
           end
         end

data/lib/solargraph/parser/parser_gem/node_processors/until_node.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class UntilNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            location = get_node_location(node)
+            # Note - this should not be considered a block, as the
+            # until statement doesn't create a closure - e.g.,
+            # variables created inside can be seen from outside as
+            # well
+            pins.push Solargraph::Pin::Until.new(
+              location: location,
+              closure: region.closure,
+              node: node,
+              comments: comments_for(node),
+              source: :parser,
+            )
+            process_children region
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/parser_gem/node_processors/while_node.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class WhileNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            location = get_node_location(node)
+            # Note - this should not be considered a block, as the
+            # while statement doesn't create a closure - e.g.,
+            # variables created inside can be seen from outside as
+            # well
+            pins.push Solargraph::Pin::While.new(
+              location: location,
+              closure: region.closure,
+              node: node,
+              comments: comments_for(node),
+              source: :parser,
+            )
+            process_children region
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/parser_gem/node_processors.rb

@@ -13,6 +13,7 @@ module Solargraph
         autoload :NamespaceNode, 'solargraph/parser/parser_gem/node_processors/namespace_node'
         autoload :SclassNode,    'solargraph/parser/parser_gem/node_processors/sclass_node'
         autoload :IvasgnNode,    'solargraph/parser/parser_gem/node_processors/ivasgn_node'
+        autoload :IfNode,        'solargraph/parser/parser_gem/node_processors/if_node'
         autoload :CvasgnNode,    'solargraph/parser/parser_gem/node_processors/cvasgn_node'
         autoload :LvasgnNode,    'solargraph/parser/parser_gem/node_processors/lvasgn_node'
         autoload :GvasgnNode,    'solargraph/parser/parser_gem/node_processors/gvasgn_node'
@@ -22,8 +23,12 @@ module Solargraph
         autoload :ArgsNode,      'solargraph/parser/parser_gem/node_processors/args_node'
         autoload :BlockNode,     'solargraph/parser/parser_gem/node_processors/block_node'
         autoload :OrasgnNode,    'solargraph/parser/parser_gem/node_processors/orasgn_node'
+        autoload :OpasgnNode,    'solargraph/parser/parser_gem/node_processors/opasgn_node'
         autoload :SymNode,       'solargraph/parser/parser_gem/node_processors/sym_node'
         autoload :ResbodyNode,   'solargraph/parser/parser_gem/node_processors/resbody_node'
+        autoload :UntilNode,     'solargraph/parser/parser_gem/node_processors/until_node'
+        autoload :WhileNode,     'solargraph/parser/parser_gem/node_processors/while_node'
+        autoload :AndNode,       'solargraph/parser/parser_gem/node_processors/and_node'
       end
     end
 
@@ -35,6 +40,7 @@ module Solargraph
       register :resbody,      ParserGem::NodeProcessors::ResbodyNode
       register :def,          ParserGem::NodeProcessors::DefNode
       register :defs,         ParserGem::NodeProcessors::DefsNode
+      register :if,           ParserGem::NodeProcessors::IfNode
       register :send,         ParserGem::NodeProcessors::SendNode
       register :class,        ParserGem::NodeProcessors::NamespaceNode
       register :module,       ParserGem::NodeProcessors::NamespaceNode
@@ -50,7 +56,11 @@ module Solargraph
       register :forward_args, ParserGem::NodeProcessors::ArgsNode
       register :block,        ParserGem::NodeProcessors::BlockNode
       register :or_asgn,      ParserGem::NodeProcessors::OrasgnNode
+      register :op_asgn,      ParserGem::NodeProcessors::OpasgnNode
       register :sym,          ParserGem::NodeProcessors::SymNode
+      register :until,        ParserGem::NodeProcessors::UntilNode
+      register :while,        ParserGem::NodeProcessors::WhileNode
+      register :and,          ParserGem::NodeProcessors::AndNode
     end
   end
 end

data/lib/solargraph/parser/region.rb

@@ -29,7 +29,7 @@ module Solargraph
                      scope: nil, visibility: :public, lvars: []
         @source = source
         # @closure = closure
-        @closure = closure || Pin::Namespace.new(name: '', location: source.location)
+        @closure = closure || Pin::Namespace.new(name: '', location: source.location, source: :parser)
         @scope = scope
         @visibility = visibility
         @lvars = lvars

data/lib/solargraph/parser.rb

@@ -4,6 +4,7 @@ module Solargraph
     autoload :ParserGem, 'solargraph/parser/parser_gem'
     autoload :Region, 'solargraph/parser/region'
     autoload :NodeProcessor, 'solargraph/parser/node_processor'
+    autoload :FlowSensitiveTyping, 'solargraph/parser/flow_sensitive_typing'
     autoload :Snippet, 'solargraph/parser/snippet'
 
     class SyntaxError < StandardError