solargraph 0.46.0 → 0.54.5

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

@@ -1,39 +1,39 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class NamespaceNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
-
-          def process
-            sc = nil
-            if node.type == :class and !node.children[1].nil?
-              sc = unpack_name(node.children[1])
-            end
-            loc = get_node_location(node)
-            nspin = Solargraph::Pin::Namespace.new(
-              type: node.type,
-              location: loc,
-              closure: region.closure,
-              name: unpack_name(node.children[0]),
-              comments: comments_for(node),
-              visibility: :public,
-              gates: region.closure.gates.freeze
-            )
-            pins.push nspin
-            unless sc.nil?
-              pins.push Pin::Reference::Superclass.new(
-                location: loc,
-                closure: pins.last,
-                name: sc
-              )
-            end
-            process_children region.update(closure: nspin, visibility: :public)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class NamespaceNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            sc = nil
+            if node.type == :class and !node.children[1].nil?
+              sc = unpack_name(node.children[1])
+            end
+            loc = get_node_location(node)
+            nspin = Solargraph::Pin::Namespace.new(
+              type: node.type,
+              location: loc,
+              closure: region.closure,
+              name: unpack_name(node.children[0]),
+              comments: comments_for(node),
+              visibility: :public,
+              gates: region.closure.gates.freeze
+            )
+            pins.push nspin
+            unless sc.nil?
+              pins.push Pin::Reference::Superclass.new(
+                location: loc,
+                closure: pins.last,
+                name: sc
+              )
+            end
+            process_children region.update(closure: nspin, visibility: :public)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,16 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class OrasgnNode < Parser::NodeProcessor::Base
-          def process
-            new_node = node.updated(node.children[0].type, node.children[0].children + [node.children[1]])
-            NodeProcessor.process(new_node, region, pins, locals)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class OrasgnNode < Parser::NodeProcessor::Base
+          def process
+            new_node = node.updated(node.children[0].type, node.children[0].children + [node.children[1]])
+            NodeProcessor.process(new_node, region, pins, locals)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,36 +1,36 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module Legacy
-      module NodeProcessors
-        class ResbodyNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
-
-          def process
-            if node.children[1]
-              here = get_node_start_position(node.children[1])
-              presence = Range.new(here, region.closure.location.range.ending)
-              loc = get_node_location(node.children[1])
-              types = if node.children[0].nil?
-                        ['Exception']
-                      else
-                        node.children[0].children.map do |child|
-                          unpack_name(child)
-                        end
-                      end
-              locals.push Solargraph::Pin::LocalVariable.new(
-                location: loc,
-                closure: region.closure,
-                name: node.children[1].children[0].to_s,
-                comments: "@type [#{types.join(',')}]",
-                presence: presence
-              )
-            end
-            NodeProcessor.process(node.children[2], region, pins, locals)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class ResbodyNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            if node.children[1] # Exception local variable name
+              here = get_node_start_position(node.children[1])
+              presence = Range.new(here, region.closure.location.range.ending)
+              loc = get_node_location(node.children[1])
+              types = if node.children[0].nil?
+                        ['Exception']
+                      else
+                        node.children[0].children.map do |child|
+                          unpack_name(child)
+                        end
+                      end
+              locals.push Solargraph::Pin::LocalVariable.new(
+                location: loc,
+                closure: region.closure,
+                name: node.children[1].children[0].to_s,
+                comments: "@type [#{types.join(',')}]",
+                presence: presence
+              )
+            end
+            NodeProcessor.process(node.children[2], region, pins, locals)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class SclassNode < Parser::NodeProcessor::Base
+          def process
+            sclass = node.children[0]
+            if sclass.is_a?(AST::Node) && sclass.type == :self
+              closure = region.closure
+            elsif sclass.is_a?(AST::Node) && sclass.type == :casgn
+              names = [region.closure.namespace, region.closure.name]
+              if sclass.children[0].nil? && names.last != sclass.children[1].to_s
+                names << sclass.children[1].to_s
+              else
+                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)
+            elsif sclass.is_a?(AST::Node) && sclass.type == :const
+              names = [region.closure.namespace, region.closure.name]
+              also = NodeMethods.unpack_name(sclass)
+              if also != region.closure.name
+                names << also
+              end
+              name = names.reject(&:empty?).join('::')
+              closure = Solargraph::Pin::Namespace.new(name: name, location: region.closure.location)
+            else
+              return
+            end
+            pins.push Solargraph::Pin::Singleton.new(
+              location: get_node_location(node),
+              closure: closure
+            )
+            process_children region.update(visibility: :public, scope: :class, closure: pins.last)
+          end
+        end
+      end
+    end
+  end
+end