solargraph 0.58.3 → 0.59.0.dev.1

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

@@ -9,7 +9,7 @@ module Solargraph
 
           def process
             loc = get_node_location(node)
-            pins.push Solargraph::Pin::InstanceVariable.new(
+            ivars.push Solargraph::Pin::InstanceVariable.new(
               location: loc,
               closure: region.closure,
               name: node.children[0].to_s,
@@ -19,9 +19,10 @@ module Solargraph
             )
             if region.visibility == :module_function
               here = get_node_start_position(node)
+              # @type [Pin::Closure, nil]
               named_path = named_path_pin(here)
               if named_path.is_a?(Pin::Method)
-                pins.push Solargraph::Pin::InstanceVariable.new(
+                ivars.push Solargraph::Pin::InstanceVariable.new(
                   location: loc,
                   closure: Pin::Namespace.new(type: :module, closure: region.closure.closure, name: region.closure.name),
                   name: node.children[0].to_s,

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

@@ -9,6 +9,7 @@ module Solargraph
 
           def process
             here = get_node_start_position(node)
+            # @sg-ignore Need to add nil check here
             presence = Range.new(here, region.closure.location.range.ending)
             loc = get_node_location(node)
             locals.push Solargraph::Pin::LocalVariable.new(

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

@@ -37,8 +37,10 @@ module Solargraph
               pin = if lhs.type == :lvasgn
                       # lvasgn is a local variable
                       locals.find { |l| l.location == location }
+                    elsif lhs.type == :ivasgn
+                      # ivasgn is an instance variable assignment
+                      ivars.find { |iv| iv.location == location }
                     else
-                      # e.g., ivasgn is an instance variable, etc
                       pins.find { |iv| iv.location == location && iv.is_a?(Pin::BaseVariable) }
                     end
               # @todo in line below, nothing in typechecking alerts

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

@@ -57,7 +57,7 @@ module Solargraph
                                     [callee,
                                      asgn_method,
                                      node.updated(:send, [call, operator, argument])])
-            NodeProcessor.process(new_send, region, pins, locals)
+            NodeProcessor.process(new_send, region, pins, locals, ivars)
           end
 
           # @param asgn [Parser::AST::Node] the target of the assignment
@@ -89,7 +89,7 @@ module Solargraph
             ]
             send_node = node.updated(:send, send_children)
             new_asgn = node.updated(asgn.type, [variable_name,  send_node])
-            NodeProcessor.process(new_asgn, region, pins, locals)
+            NodeProcessor.process(new_asgn, region, pins, locals, ivars)
           end
         end
       end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class OrNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            process_children
+
+            FlowSensitiveTyping.new(locals,
+                                    ivars,
+                                    enclosing_breakable_pin,
+                                    enclosing_compound_statement_pin).process_or(node)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Solargraph
           # @return [void]
           def process
             new_node = node.updated(node.children[0].type, node.children[0].children + [node.children[1]])
-            NodeProcessor.process(new_node, region, pins, locals)
+            NodeProcessor.process(new_node, region, pins, locals, ivars)
           end
         end
       end

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

@@ -11,6 +11,7 @@ module Solargraph
           def process
             if node.children[1] # Exception local variable name
               here = get_node_start_position(node.children[1])
+              # @sg-ignore Need to add nil check here
               presence = Range.new(here, region.closure.location.range.ending)
               loc = get_node_location(node.children[1])
               types = if node.children[0].nil?
@@ -29,7 +30,7 @@ module Solargraph
                 source: :parser
               )
             end
-            NodeProcessor.process(node.children[2], region, pins, locals)
+            NodeProcessor.process(node.children[2], region, pins, locals, ivars)
           end
         end
       end

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

@@ -5,6 +5,7 @@ module Solargraph
     module ParserGem
       module NodeProcessors
         class SclassNode < Parser::NodeProcessor::Base
+          # @sg-ignore @override is adding, not overriding
           def process
             sclass = node.children[0]
             # @todo Changing Parser::AST::Node to AST::Node below will

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

@@ -7,6 +7,7 @@ module Solargraph
         class SendNode < Parser::NodeProcessor::Base
           include ParserGem::NodeMethods
 
+          # @sg-ignore @override is adding, not overriding
           def process
             # @sg-ignore Variable type could not be inferred for method_name
             # @type [Symbol]
@@ -53,6 +54,7 @@ module Solargraph
           # @return [void]
           def process_visibility
             if (node.children.length > 2)
+              # @sg-ignore Need to add nil check here
               node.children[2..-1].each do |child|
                 # @sg-ignore Variable type could not be inferred for method_name
                 # @type [Symbol]
@@ -82,6 +84,7 @@ module Solargraph
 
           # @return [void]
           def process_attribute
+            # @sg-ignore Need to add nil check here
             node.children[2..-1].each do |a|
               loc = get_node_location(node)
               clos = region.closure
@@ -122,6 +125,7 @@ module Solargraph
           def process_include
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :const
               cp = region.closure
+              # @sg-ignore Need to add nil check here
               node.children[2..-1].each do |i|
                 type = region.scope == :class ? Pin::Reference::Extend : Pin::Reference::Include
                 pins.push type.new(
@@ -138,6 +142,7 @@ module Solargraph
           def process_prepend
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :const
               cp = region.closure
+              # @sg-ignore Need to add nil check here
               node.children[2..-1].each do |i|
                 pins.push Pin::Reference::Prepend.new(
                   location: get_node_location(i),
@@ -151,6 +156,7 @@ module Solargraph
 
           # @return [void]
           def process_extend
+            # @sg-ignore Need to add nil check here
             node.children[2..-1].each do |i|
               loc = get_node_location(node)
               if i.type == :self
@@ -193,6 +199,7 @@ module Solargraph
               # @todo Smelly instance variable access
               region.instance_variable_set(:@visibility, :module_function)
             elsif node.children[2].type == :sym || node.children[2].type == :str
+              # @sg-ignore Need to add nil check here
               node.children[2..-1].each do |x|
                 cn = x.children[0].to_s
                 # @type [Pin::Method, nil]
@@ -221,23 +228,21 @@ module Solargraph
                     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
-                    pins.push Solargraph::Pin::InstanceVariable.new(
+                  ivars.select{|pin| pin.is_a?(Pin::InstanceVariable) && pin.closure.path == ref.path}.each do |ivar|
+                    ivars.delete ivar
+                    ivars.push Solargraph::Pin::InstanceVariable.new(
                       location: ivar.location,
                       closure: cm,
                       name: ivar.name,
                       comments: ivar.comments,
-                      # @sg-ignore https://github.com/castwide/solargraph/pull/1114
                       assignment: ivar.assignment,
                       source: :parser
                     )
-                    pins.push Solargraph::Pin::InstanceVariable.new(
+                    ivars.push Solargraph::Pin::InstanceVariable.new(
                       location: ivar.location,
                       closure: mm,
                       name: ivar.name,
                       comments: ivar.comments,
-                      # @sg-ignore https://github.com/castwide/solargraph/pull/1114
                       assignment: ivar.assignment,
                       source: :parser
                     )
@@ -245,7 +250,7 @@ module Solargraph
                 end
               end
             elsif node.children[2].type == :def
-              NodeProcessor.process node.children[2], region.update(visibility: :module_function), pins, locals
+              NodeProcessor.process node.children[2], region.update(visibility: :module_function), pins, locals, ivars
             end
           end
 

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

@@ -1,29 +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
+# 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/when_node.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class WhenNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            pins.push Solargraph::Pin::CompoundStatement.new(
+              location: get_node_location(node),
+              closure: region.closure,
+              node: node,
+              source: :parser,
+            )
+            process_children
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,11 @@ module Solargraph
           include ParserGem::NodeMethods
 
           def process
-            location = get_node_location(node)
+            FlowSensitiveTyping.new(locals,
+                                    ivars,
+                                    enclosing_breakable_pin,
+                                    enclosing_compound_statement_pin).process_while(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

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

@@ -27,8 +27,10 @@ module Solargraph
         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 :WhenNode,      'solargraph/parser/parser_gem/node_processors/when_node'
         autoload :WhileNode,     'solargraph/parser/parser_gem/node_processors/while_node'
         autoload :AndNode,       'solargraph/parser/parser_gem/node_processors/and_node'
+        autoload :OrNode,        'solargraph/parser/parser_gem/node_processors/or_node'
       end
     end
 
@@ -63,8 +65,10 @@ module Solargraph
       register :op_asgn,      ParserGem::NodeProcessors::OpasgnNode
       register :sym,          ParserGem::NodeProcessors::SymNode
       register :until,        ParserGem::NodeProcessors::UntilNode
+      register :when,         ParserGem::NodeProcessors::WhenNode
       register :while,        ParserGem::NodeProcessors::WhileNode
       register :and,          ParserGem::NodeProcessors::AndNode
+      register :or,           ParserGem::NodeProcessors::OrNode
     end
   end
 end

data/lib/solargraph/parser/parser_gem.rb

@@ -1,12 +1,12 @@
-module Solargraph
-  module Parser
-    module ParserGem
-      autoload :FlawedBuilder, 'solargraph/parser/parser_gem/flawed_builder'
-      autoload :ClassMethods, 'solargraph/parser/parser_gem/class_methods'
-      autoload :NodeMethods, 'solargraph/parser/parser_gem/node_methods'
-      autoload :NodeChainer, 'solargraph/parser/parser_gem/node_chainer'
-    end
-  end
-end
-
-require 'solargraph/parser/parser_gem/node_processors'
+module Solargraph
+  module Parser
+    module ParserGem
+      autoload :FlawedBuilder, 'solargraph/parser/parser_gem/flawed_builder'
+      autoload :ClassMethods, 'solargraph/parser/parser_gem/class_methods'
+      autoload :NodeMethods, 'solargraph/parser/parser_gem/node_methods'
+      autoload :NodeChainer, 'solargraph/parser/parser_gem/node_chainer'
+    end
+  end
+end
+
+require 'solargraph/parser/parser_gem/node_processors'

data/lib/solargraph/parser/region.rb

@@ -22,7 +22,6 @@ module Solargraph
       attr_reader :lvars
 
       # @param source [Source]
-      # @param namespace [String]
       # @param closure [Pin::Closure, nil]
       # @param scope [Symbol, nil]
       # @param visibility [Symbol]
@@ -30,18 +29,25 @@ module Solargraph
       def initialize source: Solargraph::Source.load_string(''), closure: nil,
                      scope: nil, visibility: :public, lvars: []
         @source = source
-        # @closure = closure
         @closure = closure || Pin::Namespace.new(name: '', location: source.location, source: :parser)
         @scope = scope
         @visibility = visibility
         @lvars = lvars
       end
 
-      # @return [String]
+      # @return [String, nil]
       def filename
         source.filename
       end
 
+      # @return [Pin::Namespace, nil]
+      def namespace_pin
+        ns = closure
+        # @sg-ignore flow sensitive typing needs to handle while
+        ns = ns.closure while ns && !ns.is_a?(Pin::Namespace)
+        ns
+      end
+
       # Generate a new Region with the provided attribute changes.
       #
       # @param closure [Pin::Closure, nil]

data/lib/solargraph/parser/snippet.rb

@@ -1,7 +1,7 @@
 module Solargraph
   module Parser
     class Snippet
-      # @return [Range]
+      # @return [Solargraph::Range]
       attr_reader :range
       # @return [String]
       attr_reader :text

data/lib/solargraph/parser.rb

@@ -1,23 +1,23 @@
-module Solargraph
-  module Parser
-    autoload :CommentRipper, 'solargraph/parser/comment_ripper'
-    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
-    end
-
-    # @deprecated
-    Legacy = ParserGem
-
-    ClassMethods = ParserGem::ClassMethods
-    # @todo should be able to just 'extend ClassMethods' here and
-    #   typecheck things off it in strict mode
-    extend ParserGem::ClassMethods
-
-    NodeMethods = ParserGem::NodeMethods
-  end
-end
+module Solargraph
+  module Parser
+    autoload :CommentRipper, 'solargraph/parser/comment_ripper'
+    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
+    end
+
+    # @deprecated
+    Legacy = ParserGem
+
+    ClassMethods = ParserGem::ClassMethods
+    # @todo should be able to just 'extend ClassMethods' here and
+    #   typecheck things off it in strict mode
+    extend ParserGem::ClassMethods
+
+    NodeMethods = ParserGem::NodeMethods
+  end
+end