solargraph 0.46.0 → 0.54.5

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/block_node.rb

@@ -1,42 +1,43 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class BlockNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
-
-          def process
-            location = get_node_location(node)
-            parent = if other_class_eval?
-              Solargraph::Pin::Namespace.new(
-                location: location,
-                type: :class,
-                name: unpack_name(node.children[0].children[0])
-              )
-            else
-              region.closure
-            end
-            pins.push Solargraph::Pin::Block.new(
-              location: location,
-              closure: parent,
-              receiver: node.children[0],
-              comments: comments_for(node),
-              scope: region.scope || region.closure.context.scope
-            )
-            process_children region.update(closure: pins.last)
-          end
-
-          private
-
-          def other_class_eval?
-            node.children[0].type == :send &&
-              node.children[0].children[1] == :class_eval &&
-              [:cbase, :const].include?(node.children[0].children[0]&.type)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class BlockNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            location = get_node_location(node)
+            parent = if other_class_eval?
+              Solargraph::Pin::Namespace.new(
+                location: location,
+                type: :class,
+                name: unpack_name(node.children[0].children[0])
+              )
+            else
+              region.closure
+            end
+            pins.push Solargraph::Pin::Block.new(
+              location: location,
+              closure: parent,
+              node: node,
+              receiver: node.children[0],
+              comments: comments_for(node),
+              scope: region.scope || region.closure.context.scope
+            )
+            process_children region.update(closure: pins.last)
+          end
+
+          private
+
+          def other_class_eval?
+            node.children[0].type == :send &&
+              node.children[0].children[1] == :class_eval &&
+              [:cbase, :const].include?(node.children[0].children[0]&.type)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/casgn_node.rb

@@ -1,25 +1,35 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class CasgnNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
-
-          def process
-            here = get_node_start_position(node)
-            pins.push Solargraph::Pin::Constant.new(
-              location: get_node_location(node),
-              closure: region.closure,
-              name: node.children[1].to_s,
-              comments: comments_for(node),
-              assignment: node.children[2]
-            )
-            process_children
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class CasgnNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            pins.push Solargraph::Pin::Constant.new(
+              location: get_node_location(node),
+              closure: region.closure,
+              name: const_name,
+              comments: comments_for(node),
+              assignment: node.children[2]
+            )
+            process_children
+          end
+
+          private
+
+          # @return [String]
+          def const_name
+            if node.children[0]
+              Parser::NodeMethods.unpack_name(node.children[0]) + "::#{node.children[1]}"
+            else
+              node.children[1].to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/cvasgn_node.rb

@@ -1,23 +1,23 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class CvasgnNode < Parser::NodeProcessor::Base
-          def process
-            loc = get_node_location(node)
-            pins.push Solargraph::Pin::ClassVariable.new(
-              location: loc,
-              closure: region.closure,
-              name: node.children[0].to_s,
-              comments: comments_for(node),
-              assignment: node.children[1]
-            )
-            process_children
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class CvasgnNode < Parser::NodeProcessor::Base
+          def process
+            loc = get_node_location(node)
+            pins.push Solargraph::Pin::ClassVariable.new(
+              location: loc,
+              closure: region.closure,
+              name: node.children[0].to_s,
+              comments: comments_for(node),
+              assignment: node.children[1]
+            )
+            process_children
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{rubyvm → parser_gem}/node_processors/def_node.rb

@@ -1,63 +1,50 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Rubyvm
-      module NodeProcessors
-        class DefNode < Parser::NodeProcessor::Base
-          def process
-            methpin = Solargraph::Pin::Method.new(
-              location: get_node_location(node),
-              closure: region.closure,
-              name: node.children[0].to_s,
-              comments: comments_for(node),
-              scope: region.scope || (region.closure.is_a?(Pin::Singleton) ? :class : :instance),
-              visibility: region.visibility,
-              node: node
-            )
-            if methpin.name == 'initialize' and methpin.scope == :instance
-              pins.push Solargraph::Pin::Method.new(
-                location: methpin.location,
-                closure: methpin.closure,
-                name: 'new',
-                comments: methpin.comments,
-                scope: :class,
-                parameters: methpin.parameters
-              )
-              # @todo Smelly instance variable access.
-              pins.last.instance_variable_set(:@return_type, ComplexType::SELF)
-              pins.push methpin
-              # @todo Smelly instance variable access.
-              methpin.instance_variable_set(:@visibility, :private)
-              methpin.instance_variable_set(:@return_type, ComplexType::VOID)
-            elsif region.visibility == :module_function
-              pins.push Solargraph::Pin::Method.new(
-                location: methpin.location,
-                closure: methpin.closure,
-                name: methpin.name,
-                comments: methpin.comments,
-                scope: :class,
-                visibility: :public,
-                parameters: methpin.parameters,
-                node: methpin.node
-              )
-              pins.push Solargraph::Pin::Method.new(
-                location: methpin.location,
-                closure: methpin.closure,
-                name: methpin.name,
-                comments: methpin.comments,
-                scope: :instance,
-                visibility: :private,
-                parameters: methpin.parameters,
-                node: methpin.node
-              )
-            else
-              pins.push methpin
-            end
-            process_children region.update(closure: methpin, scope: methpin.scope)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class DefNode < Parser::NodeProcessor::Base
+          def process
+            name = node.children[0].to_s
+            scope = region.scope || (region.closure.is_a?(Pin::Singleton) ? :class : :instance)
+            methpin = Solargraph::Pin::Method.new(
+              location: get_node_location(node),
+              closure: region.closure,
+              name: name,
+              comments: comments_for(node),
+              scope: scope,
+              visibility: scope == :instance && name == 'initialize' ? :private : region.visibility,
+              node: node
+            )
+            if region.visibility == :module_function
+              pins.push Solargraph::Pin::Method.new(
+                location: methpin.location,
+                closure: methpin.closure,
+                name: methpin.name,
+                comments: methpin.comments,
+                scope: :class,
+                visibility: :public,
+                parameters: methpin.parameters,
+                node: methpin.node
+              )
+              pins.push Solargraph::Pin::Method.new(
+                location: methpin.location,
+                closure: methpin.closure,
+                name: methpin.name,
+                comments: methpin.comments,
+                scope: :instance,
+                visibility: :private,
+                parameters: methpin.parameters,
+                node: methpin.node
+              )
+            else
+              pins.push methpin
+            end
+            process_children region.update(closure: methpin, scope: methpin.scope)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/defs_node.rb

@@ -1,36 +1,36 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class DefsNode < DefNode
-          include Legacy::NodeMethods
-
-          def process
-            s_visi = region.visibility
-            s_visi = :public if s_visi == :module_function || region.scope != :class
-            loc = get_node_location(node)
-            if node.children[0].is_a?(AST::Node) && node.children[0].type == :self
-              closure = region.closure
-            else
-              closure = Solargraph::Pin::Namespace.new(
-                name: unpack_name(node.children[0])
-              )
-            end
-            pins.push Solargraph::Pin::Method.new(
-              location: loc,
-              closure: closure,
-              name: node.children[1].to_s,
-              comments: comments_for(node),
-              scope: :class,
-              visibility: s_visi,
-              node: node
-            )
-            process_children region.update(closure: pins.last, scope: :class)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class DefsNode < DefNode
+          include ParserGem::NodeMethods
+
+          def process
+            s_visi = region.visibility
+            s_visi = :public if s_visi == :module_function || region.scope != :class
+            loc = get_node_location(node)
+            if node.children[0].is_a?(AST::Node) && node.children[0].type == :self
+              closure = region.closure
+            else
+              closure = Solargraph::Pin::Namespace.new(
+                name: unpack_name(node.children[0])
+              )
+            end
+            pins.push Solargraph::Pin::Method.new(
+              location: loc,
+              closure: closure,
+              name: node.children[1].to_s,
+              comments: comments_for(node),
+              scope: :class,
+              visibility: s_visi,
+              node: node
+            )
+            process_children region.update(closure: pins.last, scope: :class)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/gvasgn_node.rb

@@ -1,23 +1,23 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class GvasgnNode < Parser::NodeProcessor::Base
-          def process
-            loc = get_node_location(node)
-            pins.push Solargraph::Pin::GlobalVariable.new(
-              location: loc,
-              closure: region.closure,
-              name: node.children[0].to_s,
-              comments: comments_for(node),
-              assignment: node.children[1]
-            )
-            process_children
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class GvasgnNode < Parser::NodeProcessor::Base
+          def process
+            loc = get_node_location(node)
+            pins.push Solargraph::Pin::GlobalVariable.new(
+              location: loc,
+              closure: region.closure,
+              name: node.children[0].to_s,
+              comments: comments_for(node),
+              assignment: node.children[1]
+            )
+            process_children
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/ivasgn_node.rb

@@ -1,38 +1,38 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class IvasgnNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
-
-          def process
-            loc = get_node_location(node)
-            pins.push Solargraph::Pin::InstanceVariable.new(
-              location: loc,
-              closure: region.closure,
-              name: node.children[0].to_s,
-              comments: comments_for(node),
-              assignment: node.children[1]
-            )
-            if region.visibility == :module_function
-              here = get_node_start_position(node)
-              named_path = named_path_pin(here)
-              if named_path.is_a?(Pin::Method)
-                pins.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,
-                  comments: comments_for(node),
-                  assignment: node.children[1]
-                )
-              end
-            end
-            process_children
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class IvasgnNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            loc = get_node_location(node)
+            pins.push Solargraph::Pin::InstanceVariable.new(
+              location: loc,
+              closure: region.closure,
+              name: node.children[0].to_s,
+              comments: comments_for(node),
+              assignment: node.children[1]
+            )
+            if region.visibility == :module_function
+              here = get_node_start_position(node)
+              named_path = named_path_pin(here)
+              if named_path.is_a?(Pin::Method)
+                pins.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,
+                  comments: comments_for(node),
+                  assignment: node.children[1]
+                )
+              end
+            end
+            process_children
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/lvasgn_node.rb

@@ -1,28 +1,28 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class LvasgnNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
-
-          def process
-            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,
-              closure: region.closure,
-              name: node.children[0].to_s,
-              assignment: node.children[1],
-              comments: comments_for(node),
-              presence: presence
-            )
-            process_children
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class LvasgnNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            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,
+              closure: region.closure,
+              name: node.children[0].to_s,
+              assignment: node.children[1],
+              comments: comments_for(node),
+              presence: presence
+            )
+            process_children
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class MasgnNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            # Example:
+            #
+            # s(:masgn,
+            #   s(:mlhs,
+            #     s(:send,
+            #       s(:send, nil, :a), :b=),
+            #     s(:lvasgn, :b),
+            #     s(:ivasgn, :@c)),
+            #   s(:array,
+            #     s(:int, 1),
+            #     s(:int, 2),
+            #     s(:int, 3)))
+            masgn = node
+            mlhs = masgn.children.fetch(0)
+            lhs_arr = mlhs.children
+            mass_rhs = node.children.fetch(1)
+
+            # Get pins created for the mlhs node
+            process_children
+
+            lhs_arr.each_with_index do |lhs, i|
+              location = get_node_location(lhs)
+              pin = if lhs.type == :lvasgn
+                      # lvasgn is a local variable
+                      locals.find { |l| l.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
+              #   when a non-existant method is called on 'l'
+              if pin.nil?
+                Solargraph.logger.debug { "Could not find local for masgn= value in location #{location.inspect} in #{lhs_arr} - masgn = #{masgn}, lhs.type = #{lhs.type}" }
+                next
+              end
+              pin.mass_assignment = [mass_rhs, i]
+            end
+          end
+        end
+      end
+    end
+  end
+end