solargraph 0.58.0 → 0.59.0

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

@@ -1,19 +1,19 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module ParserGem
-      # A custom builder for source parsers that ignores character encoding
-      # issues in literal strings.
-      #
-      class FlawedBuilder < ::Parser::Builders::Default
-        # @param token [::Parser::AST::Node]
-        # @return [String]
-        # @sg-ignore
-        def string_value(token)
-          value(token)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      # A custom builder for source parsers that ignores character encoding
+      # issues in literal strings.
+      #
+      class FlawedBuilder < ::Parser::Builders::Default
+        # @param token [::Parser::AST::Node]
+        # @return [String]
+        # @sg-ignore
+        def string_value token
+          value(token)
+        end
+      end
+    end
+  end
+end

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

@@ -1,166 +1,191 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module ParserGem
-      # A factory for generating chains from nodes.
-      #
-      class NodeChainer
-        include NodeMethods
-
-        Chain = Source::Chain
-
-        # @param node [Parser::AST::Node]
-        # @param filename [String, nil]
-        # @param parent [Parser::AST::Node, nil]
-        def initialize node, filename = nil, parent = nil
-          @node = node
-          @filename = filename
-          @parent = parent
-        end
-
-        # @return [Source::Chain]
-        def chain
-          links = generate_links(@node)
-          Chain.new(links, @node, (Parser.is_ast_node?(@node) && @node.type == :splat))
-        end
-
-        class << self
-          # @param node [Parser::AST::Node]
-          # @param filename [String, nil]
-          # @param parent [Parser::AST::Node, nil]
-          # @return [Source::Chain]
-          def chain node, filename = nil, parent = nil
-            NodeChainer.new(node, filename, parent).chain
-          end
-
-          # @param code [String]
-          # @return [Source::Chain]
-          def load_string(code)
-            node = Parser.parse(code.sub(/\.$/, ''))
-            chain = NodeChainer.new(node).chain
-            chain.links.push(Chain::Link.new) if code.end_with?('.')
-            chain
-          end
-        end
-
-        private
-
-        # @param n [Parser::AST::Node]
-        # @return [Array<Chain::Link>]
-        def generate_links n
-          return [] unless n.is_a?(::Parser::AST::Node)
-          return generate_links(n.children[0]) if n.type == :splat
-          # @type [Array<Chain::Link>]
-          result = []
-          if n.type == :block
-            result.concat NodeChainer.chain(n.children[0], @filename, n).links
-          elsif n.type == :send
-            if n.children[0].is_a?(::Parser::AST::Node)
-              result.concat generate_links(n.children[0])
-              result.push Chain::Call.new(n.children[1].to_s, Location.from_node(n), node_args(n), passed_block(n))
-            elsif n.children[0].nil?
-              args = []
-              n.children[2..-1].each do |c|
-                args.push NodeChainer.chain(c, @filename, n)
-              end
-              result.push Chain::Call.new(n.children[1].to_s, Location.from_node(n), node_args(n), passed_block(n))
-            else
-              raise "No idea what to do with #{n}"
-            end
-          elsif n.type == :csend
-            if n.children[0].is_a?(::Parser::AST::Node)
-              result.concat generate_links(n.children[0])
-              result.push Chain::QCall.new(n.children[1].to_s, Location.from_node(n), node_args(n))
-            elsif n.children[0].nil?
-              result.push Chain::QCall.new(n.children[1].to_s, Location.from_node(n), node_args(n))
-            else
-              raise "No idea what to do with #{n}"
-            end
-          elsif n.type == :self
-            result.push Chain::Head.new('self')
-          elsif n.type == :zsuper
-            result.push Chain::ZSuper.new('super')
-          elsif n.type == :super
-            args = n.children.map { |c| NodeChainer.chain(c, @filename, n) }
-            result.push Chain::Call.new('super', Location.from_node(n), args)
-          elsif n.type == :yield
-            args = n.children.map { |c| NodeChainer.chain(c, @filename, n) }
-            result.push Chain::Call.new('yield', Location.from_node(n), args)
-          elsif n.type == :const
-            const = unpack_name(n)
-            result.push Chain::Constant.new(const)
-          elsif [:lvar, :lvasgn].include?(n.type)
-            result.push Chain::Call.new(n.children[0].to_s, Location.from_node(n))
-          elsif [:ivar, :ivasgn].include?(n.type)
-            result.push Chain::InstanceVariable.new(n.children[0].to_s)
-          elsif [:cvar, :cvasgn].include?(n.type)
-            result.push Chain::ClassVariable.new(n.children[0].to_s)
-          elsif [:gvar, :gvasgn].include?(n.type)
-            result.push Chain::GlobalVariable.new(n.children[0].to_s)
-          elsif n.type == :or_asgn
-            new_node = n.updated(n.children[0].type, n.children[0].children + [n.children[1]])
-            result.concat generate_links new_node
-          elsif [:class, :module, :def, :defs].include?(n.type)
-            # @todo Undefined or what?
-            result.push Chain::UNDEFINED_CALL
-          elsif n.type == :and
-            result.concat generate_links(n.children.last)
-          elsif n.type == :or
-            result.push Chain::Or.new([NodeChainer.chain(n.children[0], @filename), NodeChainer.chain(n.children[1], @filename, n)])
-          elsif n.type == :if
-            result.push Chain::If.new([NodeChainer.chain(n.children[1], @filename), NodeChainer.chain(n.children[2], @filename, n)])
-          elsif [:begin, :kwbegin].include?(n.type)
-            result.concat generate_links(n.children.last)
-          elsif n.type == :block_pass
-            block_variable_name_node = n.children[0]
-            if block_variable_name_node.nil?
-              # anonymous block forwarding (e.g., "&")
-              # added in Ruby 3.1 - https://bugs.ruby-lang.org/issues/11256
-              result.push Chain::BlockVariable.new(nil)
-            else
-              if block_variable_name_node.type == :sym
-                result.push Chain::BlockSymbol.new("#{block_variable_name_node.children[0].to_s}")
-              else
-                result.push Chain::BlockVariable.new("&#{block_variable_name_node.children[0].to_s}")
-              end
-            end
-          elsif n.type == :hash
-            result.push Chain::Hash.new('::Hash', n, hash_is_splatted?(n))
-          elsif n.type == :array
-            chained_children = n.children.map { |c| NodeChainer.chain(c) }
-            result.push Source::Chain::Array.new(chained_children, n)
-          else
-            lit = infer_literal_node_type(n)
-            result.push (lit ? Chain::Literal.new(lit, n) : Chain::Link.new)
-          end
-          result
-        end
-
-        # @param node [Parser::AST::Node]
-        def hash_is_splatted? node
-          return false unless Parser.is_ast_node?(node) && node.type == :hash
-          return false unless Parser.is_ast_node?(node.children.last) && node.children.last.type == :kwsplat
-          return false if Parser.is_ast_node?(node.children.last.children[0]) && node.children.last.children[0].type == :hash
-          true
-        end
-
-        # @param node [Parser::AST::Node]
-        # @return [Source::Chain, nil]
-        def passed_block node
-          return unless node == @node && @parent&.type == :block
-
-          NodeChainer.chain(@parent.children[2], @filename)
-        end
-
-        # @param node [Parser::AST::Node]
-        # @return [Array<Source::Chain>]
-        def node_args node
-          node.children[2..-1].map do |child|
-            NodeChainer.chain(child, @filename, node)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      # A factory for generating chains from nodes.
+      #
+      class NodeChainer
+        include NodeMethods
+
+        Chain = Source::Chain
+
+        # @param node [Parser::AST::Node]
+        # @param filename [String, nil]
+        # @param parent [Parser::AST::Node, nil]
+        def initialize node, filename = nil, parent = nil
+          @node = node
+          @filename = filename
+          @parent = parent
+        end
+
+        # @return [Source::Chain]
+        def chain
+          links = generate_links(@node)
+          Chain.new(links, @node, Parser.is_ast_node?(@node) && @node.type == :splat)
+        end
+
+        class << self
+          # @param node [Parser::AST::Node]
+          # @param filename [String, nil]
+          # @param parent [Parser::AST::Node, nil]
+          # @return [Source::Chain]
+          def chain node, filename = nil, parent = nil
+            NodeChainer.new(node, filename, parent).chain
+          end
+
+          # @param code [String]
+          # @param filename [String]
+          # @param starting_line [Integer]
+          #
+          # @return [Source::Chain]
+          def load_string code, filename, starting_line
+            node = Parser.parse(code.sub(/\.$/, ''), filename, starting_line)
+            chain = NodeChainer.new(node).chain
+            chain.links.push(Chain::Link.new) if code.end_with?('.')
+            chain
+          end
+        end
+
+        private
+
+        # @param n [Parser::AST::Node]
+        # @return [Array<Chain::Link>]
+        def generate_links n
+          return [] unless n.is_a?(::Parser::AST::Node)
+          return generate_links(n.children[0]) if n.type == :splat
+          # @type [Array<Chain::Link>]
+          result = []
+          if n.type == :block
+            result.concat NodeChainer.chain(n.children[0], @filename, n).links
+          elsif n.type == :send
+            if n.children[0].is_a?(::Parser::AST::Node)
+              result.concat generate_links(n.children[0])
+              result.push Chain::Call.new(n.children[1].to_s, Location.from_node(n), node_args(n), passed_block(n))
+            elsif n.children[0].nil?
+              # @sg-ignore Need to add nil check here
+              n.children[2..].map do |c|
+                NodeChainer.chain(c, @filename, n)
+              end
+              result.push Chain::Call.new(n.children[1].to_s, Location.from_node(n), node_args(n), passed_block(n))
+            else
+              raise "No idea what to do with #{n}"
+            end
+          elsif n.type == :csend
+            if n.children[0].is_a?(::Parser::AST::Node)
+              result.concat generate_links(n.children[0])
+              result.push Chain::QCall.new(n.children[1].to_s, Location.from_node(n), node_args(n))
+            elsif n.children[0].nil?
+              result.push Chain::QCall.new(n.children[1].to_s, Location.from_node(n), node_args(n))
+            else
+              raise "No idea what to do with #{n}"
+            end
+          elsif n.type == :self
+            result.push Chain::Head.new('self')
+          elsif n.type == :zsuper
+            result.push Chain::ZSuper.new('super')
+          elsif n.type == :super
+            args = n.children.map { |c| NodeChainer.chain(c, @filename, n) }
+            result.push Chain::Call.new('super', Location.from_node(n), args)
+          elsif n.type == :yield
+            args = n.children.map { |c| NodeChainer.chain(c, @filename, n) }
+            result.push Chain::Call.new('yield', Location.from_node(n), args)
+          elsif n.type == :const
+            const = unpack_name(n)
+            result.push Chain::Constant.new(const)
+          elsif %i[lvar lvasgn].include?(n.type)
+            result.push Chain::Call.new(n.children[0].to_s, Location.from_node(n))
+          elsif %i[ivar ivasgn].include?(n.type)
+            result.push Chain::InstanceVariable.new(n.children[0].to_s, n, Location.from_node(n))
+          elsif %i[cvar cvasgn].include?(n.type)
+            result.push Chain::ClassVariable.new(n.children[0].to_s)
+          elsif %i[gvar gvasgn].include?(n.type)
+            result.push Chain::GlobalVariable.new(n.children[0].to_s)
+          elsif n.type == :or_asgn
+            # @bar ||= 123 translates to:
+            #
+            # s(:or_asgn,
+            #   s(:ivasgn, :@bar),
+            #   s(:int, 123))
+            lhs_chain = NodeChainer.chain n.children[0] # s(:ivasgn, :@bar)
+            rhs_chain = NodeChainer.chain n.children[1] # s(:int, 123)
+            or_link = Chain::Or.new([lhs_chain, rhs_chain])
+            # this is just for a call chain, so we don't need to record the assignment
+            result.push(or_link)
+          elsif %i[class module def defs].include?(n.type)
+            # @todo Undefined or what?
+            result.push Chain::UNDEFINED_CALL
+          elsif n.type == :and
+            result.concat generate_links(n.children.last)
+          elsif n.type == :or
+            result.push Chain::Or.new([NodeChainer.chain(n.children[0], @filename),
+                                       NodeChainer.chain(n.children[1], @filename, n)])
+          elsif n.type == :if
+            then_clause = if n.children[1]
+                            NodeChainer.chain(n.children[1], @filename, n)
+                          else
+                            Source::Chain.new([Source::Chain::Literal.new('nil', nil)], n)
+                          end
+            else_clause = if n.children[2]
+                            NodeChainer.chain(n.children[2], @filename, n)
+                          else
+                            Source::Chain.new([Source::Chain::Literal.new('nil', nil)], n)
+                          end
+            result.push Chain::If.new([then_clause, else_clause])
+          elsif %i[begin kwbegin].include?(n.type)
+            result.concat generate_links(n.children.last)
+          elsif n.type == :block_pass
+            block_variable_name_node = n.children[0]
+            if block_variable_name_node.nil?
+              # anonymous block forwarding (e.g., "&")
+              # added in Ruby 3.1 - https://bugs.ruby-lang.org/issues/11256
+              result.push Chain::BlockVariable.new(nil)
+            elsif block_variable_name_node.type == :sym
+              result.push Chain::BlockSymbol.new(block_variable_name_node.children[0].to_s)
+            else
+              result.push Chain::BlockVariable.new("&#{block_variable_name_node.children[0]}")
+            end
+          elsif n.type == :hash
+            result.push Chain::Hash.new('::Hash', n, hash_is_splatted?(n))
+          elsif n.type == :array
+            chained_children = n.children.map { |c| NodeChainer.chain(c) }
+            result.push Source::Chain::Array.new(chained_children, n)
+          else
+            lit = infer_literal_node_type(n)
+            result.push(lit ? Chain::Literal.new(lit, n) : Chain::Link.new)
+          end
+          result
+        end
+
+        # @param node [Parser::AST::Node]
+        def hash_is_splatted? node
+          return false unless Parser.is_ast_node?(node) && node.type == :hash
+          return false unless Parser.is_ast_node?(node.children.last) && node.children.last.type == :kwsplat
+          if Parser.is_ast_node?(node.children.last.children[0]) && node.children.last.children[0].type == :hash
+            return false
+          end
+          true
+        end
+
+        # @param node [Parser::AST::Node]
+        # @return [Source::Chain, nil]
+        def passed_block node
+          return unless node == @node && @parent&.type == :block
+
+          # @sg-ignore Need to add nil check here
+          NodeChainer.chain(@parent.children[2], @filename)
+        end
+
+        # @param node [Parser::AST::Node]
+        # @sg-ignore Need to add nil check here
+        # @return [Array<Source::Chain>]
+        def node_args node
+          # @sg-ignore Need to add nil check here
+          node.children[2..].map do |child|
+            NodeChainer.chain(child, @filename, node)
+          end
+        end
+      end
+    end
+  end
+end