solargraph 0.58.1 → 0.59.0.dev.1

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

@@ -1,29 +1,33 @@
-# 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
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class WhileNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            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
+            # 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

@@ -1,70 +1,74 @@
-# frozen_string_literal: true
-
-require 'solargraph/parser/node_processor'
-
-module Solargraph
-  module Parser
-    module ParserGem
-      module NodeProcessors
-        autoload :BeginNode,     'solargraph/parser/parser_gem/node_processors/begin_node'
-        autoload :DefNode,       'solargraph/parser/parser_gem/node_processors/def_node'
-        autoload :DefsNode,      'solargraph/parser/parser_gem/node_processors/defs_node'
-        autoload :SendNode,      'solargraph/parser/parser_gem/node_processors/send_node'
-        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'
-        autoload :CasgnNode,     'solargraph/parser/parser_gem/node_processors/casgn_node'
-        autoload :MasgnNode,     'solargraph/parser/parser_gem/node_processors/masgn_node'
-        autoload :AliasNode,     'solargraph/parser/parser_gem/node_processors/alias_node'
-        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
-
-    module NodeProcessor
-      register :source,       ParserGem::NodeProcessors::BeginNode
-      register :begin,        ParserGem::NodeProcessors::BeginNode
-      register :kwbegin,      ParserGem::NodeProcessors::BeginNode
-      register :rescue,       ParserGem::NodeProcessors::BeginNode
-      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,        Convention::StructDefinition::NodeProcessors::StructNode
-      register :class,        Convention::DataDefinition::NodeProcessors::DataNode
-      register :class,        ParserGem::NodeProcessors::NamespaceNode
-      register :module,       ParserGem::NodeProcessors::NamespaceNode
-      register :sclass,       ParserGem::NodeProcessors::SclassNode
-      register :ivasgn,       ParserGem::NodeProcessors::IvasgnNode
-      register :cvasgn,       ParserGem::NodeProcessors::CvasgnNode
-      register :lvasgn,       ParserGem::NodeProcessors::LvasgnNode
-      register :gvasgn,       ParserGem::NodeProcessors::GvasgnNode
-      register :casgn,        Convention::StructDefinition::NodeProcessors::StructNode
-      register :casgn,        Convention::DataDefinition::NodeProcessors::DataNode
-      register :casgn,        ParserGem::NodeProcessors::CasgnNode
-      register :masgn,        ParserGem::NodeProcessors::MasgnNode
-      register :alias,        ParserGem::NodeProcessors::AliasNode
-      register :args,         ParserGem::NodeProcessors::ArgsNode
-      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
+# frozen_string_literal: true
+
+require 'solargraph/parser/node_processor'
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        autoload :BeginNode,     'solargraph/parser/parser_gem/node_processors/begin_node'
+        autoload :DefNode,       'solargraph/parser/parser_gem/node_processors/def_node'
+        autoload :DefsNode,      'solargraph/parser/parser_gem/node_processors/defs_node'
+        autoload :SendNode,      'solargraph/parser/parser_gem/node_processors/send_node'
+        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'
+        autoload :CasgnNode,     'solargraph/parser/parser_gem/node_processors/casgn_node'
+        autoload :MasgnNode,     'solargraph/parser/parser_gem/node_processors/masgn_node'
+        autoload :AliasNode,     'solargraph/parser/parser_gem/node_processors/alias_node'
+        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 :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
+
+    module NodeProcessor
+      register :source,       ParserGem::NodeProcessors::BeginNode
+      register :begin,        ParserGem::NodeProcessors::BeginNode
+      register :kwbegin,      ParserGem::NodeProcessors::BeginNode
+      register :rescue,       ParserGem::NodeProcessors::BeginNode
+      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,        Convention::StructDefinition::NodeProcessors::StructNode
+      register :class,        Convention::DataDefinition::NodeProcessors::DataNode
+      register :class,        ParserGem::NodeProcessors::NamespaceNode
+      register :module,       ParserGem::NodeProcessors::NamespaceNode
+      register :sclass,       ParserGem::NodeProcessors::SclassNode
+      register :ivasgn,       ParserGem::NodeProcessors::IvasgnNode
+      register :cvasgn,       ParserGem::NodeProcessors::CvasgnNode
+      register :lvasgn,       ParserGem::NodeProcessors::LvasgnNode
+      register :gvasgn,       ParserGem::NodeProcessors::GvasgnNode
+      register :casgn,        Convention::StructDefinition::NodeProcessors::StructNode
+      register :casgn,        Convention::DataDefinition::NodeProcessors::DataNode
+      register :casgn,        ParserGem::NodeProcessors::CasgnNode
+      register :masgn,        ParserGem::NodeProcessors::MasgnNode
+      register :alias,        ParserGem::NodeProcessors::AliasNode
+      register :args,         ParserGem::NodeProcessors::ArgsNode
+      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 :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/region.rb

@@ -1,69 +1,75 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    # Data used by the parser to track context at various locations in a
-    # source.
-    #
-    class Region
-      # @return [Pin::Closure]
-      attr_reader :closure
-
-      # @return [Symbol]
-      attr_reader :scope
-
-      # @return [Symbol]
-      attr_reader :visibility
-
-      # @return [Solargraph::Source]
-      attr_reader :source
-
-      # @return [Array<Symbol>]
-      attr_reader :lvars
-
-      # @param source [Source]
-      # @param namespace [String]
-      # @param closure [Pin::Closure, nil]
-      # @param scope [Symbol, nil]
-      # @param visibility [Symbol]
-      # @param lvars [Array<Symbol>]
-      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]
-      def filename
-        source.filename
-      end
-
-      # Generate a new Region with the provided attribute changes.
-      #
-      # @param closure [Pin::Closure, nil]
-      # @param scope [Symbol, nil]
-      # @param visibility [Symbol, nil]
-      # @param lvars [Array<Symbol>, nil]
-      # @return [Region]
-      def update closure: nil, scope: nil, visibility: nil, lvars: nil
-        Region.new(
-          source: source,
-          closure: closure || self.closure,
-          scope: scope || self.scope,
-          visibility: visibility || self.visibility,
-          lvars: lvars || self.lvars
-        )
-      end
-
-      # @param node [Parser::AST::Node]
-      # @return [String]
-      def code_for node
-        source.code_for(node)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    # Data used by the parser to track context at various locations in a
+    # source.
+    #
+    class Region
+      # @return [Pin::Closure]
+      attr_reader :closure
+
+      # @return [Symbol]
+      attr_reader :scope
+
+      # @return [Symbol]
+      attr_reader :visibility
+
+      # @return [Solargraph::Source]
+      attr_reader :source
+
+      # @return [Array<Symbol>]
+      attr_reader :lvars
+
+      # @param source [Source]
+      # @param closure [Pin::Closure, nil]
+      # @param scope [Symbol, nil]
+      # @param visibility [Symbol]
+      # @param lvars [Array<Symbol>]
+      def initialize source: Solargraph::Source.load_string(''), closure: nil,
+                     scope: nil, visibility: :public, lvars: []
+        @source = source
+        @closure = closure || Pin::Namespace.new(name: '', location: source.location, source: :parser)
+        @scope = scope
+        @visibility = visibility
+        @lvars = lvars
+      end
+
+      # @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]
+      # @param scope [Symbol, nil]
+      # @param visibility [Symbol, nil]
+      # @param lvars [Array<Symbol>, nil]
+      # @return [Region]
+      def update closure: nil, scope: nil, visibility: nil, lvars: nil
+        Region.new(
+          source: source,
+          closure: closure || self.closure,
+          scope: scope || self.scope,
+          visibility: visibility || self.visibility,
+          lvars: lvars || self.lvars
+        )
+      end
+
+      # @param node [Parser::AST::Node]
+      # @return [String]
+      def code_for node
+        source.code_for(node)
+      end
+    end
+  end
+end

data/lib/solargraph/parser/snippet.rb

@@ -1,17 +1,17 @@
-module Solargraph
-  module Parser
-    class Snippet
-      # @return [Range]
-      attr_reader :range
-      # @return [String]
-      attr_reader :text
-
-      # @param range [Solargraph::Range]
-      # @param text [String]
-      def initialize range, text
-        @range = range
-        @text = text
-      end
-    end
-  end
-end
+module Solargraph
+  module Parser
+    class Snippet
+      # @return [Solargraph::Range]
+      attr_reader :range
+      # @return [String]
+      attr_reader :text
+
+      # @param range [Solargraph::Range]
+      # @param text [String]
+      def initialize range, text
+        @range = range
+        @text = text
+      end
+    end
+  end
+end