solargraph 0.60.4 → 0.62.0

data/lib/solargraph/yardoc.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'open3'
+require 'fileutils'
 
 module Solargraph
   # Methods for caching and loading YARD documentation for gems.
@@ -8,83 +9,65 @@ module Solargraph
   module Yardoc
     module_function
 
-    # Build and cache a gem's yardoc and return the path. If the cache already
-    # exists, do nothing and return the path.
-    #
-    # @param yard_plugins [Array<String>] The names of YARD plugins to use.
-    # @param gemspec [Gem::Specification]
-    # @return [String] The path to the cached yardoc.
-    def cache yard_plugins, gemspec
-      path = PinCache.yardoc_path gemspec
-      return path if cached?(gemspec)
+    def path_for metagem
+      File.join(CacheDir.yard_dir, "#{metagem.cache_name}.yardoc")
+    end
+
+    # @param metagem [Metagem]
+    # @param force [Boolean]
+    # @return [void]
+    def cache metagem, force: false
+      return unless force || !cached?(metagem)
 
-      unless Dir.exist? gemspec.gem_dir
-        # Can happen in at least some (old?) RubyGems versions when we
-        # have a gemspec describing a standard library like bundler.
-        #
-        # https://github.com/apiology/solargraph/actions/runs/17650140201/job/50158676842?pr=10
-        Solargraph.logger.info { "Bad info from gemspec - #{gemspec.gem_dir} does not exist" }
-        return path
-      end
+      Solargraph.logger.info "Caching yardoc for #{metagem.cache_name}"
+      path = path_for(metagem)
+      FileUtils.mkdir_p File.dirname(path)
+      cmd = ['yardoc', '--db', path, '--no-output', '--plugin', 'solargraph', '--plugin', 'activesupport-concern']
+      Solargraph.logger.debug "Running: #{cmd.inspect}"
+      output, status = Open3.capture2e(*cmd, chdir: metagem.full_path)
+      return if status.success?
 
-      Solargraph.logger.info "Caching yardoc for #{gemspec.name} #{gemspec.version}"
-      cmd = "yardoc --db #{path} --no-output --plugin solargraph"
-      yard_plugins.each { |plugin| cmd << " --plugin #{plugin}" }
-      Solargraph.logger.debug { "Running: #{cmd}" }
-      # @todo set these up to run in parallel
-      # @todo Is the chdir argument being used here?
-      # @sg-ignore Unrecognized keyword argument chdir to Open3.capture2e
-      stdout_and_stderr_str, status = Open3.capture2e(current_bundle_env_tweaks, cmd, chdir: gemspec.gem_dir)
-      unless status.success?
-        Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }
-        Solargraph.logger.info stdout_and_stderr_str
-      end
-      path
+      Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{metagem.full_path}" }
+      Solargraph.logger.info output
+    # @todo Ignore missing metagems for now. We need to figure out why this
+    #   happens in GitHub actions.
+    rescue Errno::ENOENT => _e
+      Solargraph.logger.warn "Gem #{metagem.name} #{metagem.version} not found at #{metagem.full_path}"
     end
 
-    # True if the gem yardoc is cached.
-    #
-    # @param gemspec [Gem::Specification]
-    def cached? gemspec
-      yardoc = File.join(PinCache.yardoc_path(gemspec), 'complete')
+    # @param metagem [Metagem]
+    # @return [void]
+    def uncache metagem
+      FileUtils.rm_rf path_for(metagem)
+    end
+
+    # @param metagem [Metagem]
+    def cached? metagem
+      yardoc = File.join(path_for(metagem), 'complete')
       File.exist?(yardoc)
     end
+    alias exist? cached?
 
     # True if another process is currently building the yardoc cache.
     #
-    # @param gemspec [Gem::Specification]
-    def processing? gemspec
-      yardoc = File.join(PinCache.yardoc_path(gemspec), 'processing')
+    # @param metagem [Metagem]
+    def processing? metagem
+      yardoc = File.join(path_for(metagem), 'processing')
       File.exist?(yardoc)
     end
 
-    # Load a gem's yardoc and return its code objects.
+    # Load a gem's yardoc cache and return its code objects.
     #
     # @note This method modifies the global YARD registry.
     #
-    # @param gemspec [Gem::Specification]
+    # @param metagem [Metagem]
     # @return [Array<YARD::CodeObjects::Base>]
-    def load! gemspec
-      YARD::Registry.load! PinCache.yardoc_path gemspec
-      YARD::Registry.all
-    end
+    def load! metagem
+      cache metagem
+      return [] unless cached?(metagem)
 
-    # If the BUNDLE_GEMFILE environment variable is set, we need to
-    # make sure it's an absolute path, as we'll be changing
-    # directories.
-    #
-    # 'bundle exec' sets an absolute path here, but at least the
-    # overcommit gem does not, breaking on-the-fly documention with a
-    # spawned yardoc command from our current bundle
-    #
-    # @return [Hash{String => String}] a hash of environment variables to override
-    def current_bundle_env_tweaks
-      tweaks = {}
-      # @sg-ignore Unresolved call to empty? on String, nil
-      if ENV['BUNDLE_GEMFILE'] && !ENV['BUNDLE_GEMFILE'].empty?
-        tweaks['BUNDLE_GEMFILE'] = File.expand_path(ENV['BUNDLE_GEMFILE'])
-      end
-      tweaks
+      YARD::Registry.load! path_for(metagem)
+      YARD::Registry.all
     end
   end
 end

data/lib/solargraph.rb

@@ -4,6 +4,7 @@ Encoding.default_external = 'UTF-8'
 
 require 'bundler'
 require 'set'
+require 'yard-activesupport-concern'
 require 'yard-solargraph'
 require 'solargraph/yard_tags'
 require 'solargraph/version'
@@ -31,7 +32,10 @@ module Solargraph
   autoload :Yardoc,           'solargraph/yardoc'
   autoload :YardMap,          'solargraph/yard_map'
   autoload :Pin,              'solargraph/pin'
-  autoload :DocMap,           'solargraph/doc_map'
+  autoload :Metagem,          'solargraph/metagem'
+  autoload :Repo,             'solargraph/repo'
+  autoload :External,         'solargraph/external'
+  autoload :Collection,       'solargraph/collection'
   autoload :ServerMethods,    'solargraph/server_methods'
   autoload :LanguageServer,   'solargraph/language_server'
   autoload :Workspace,        'solargraph/workspace'
@@ -47,9 +51,10 @@ module Solargraph
   autoload :Convention,       'solargraph/convention'
   autoload :Parser,           'solargraph/parser'
   autoload :RbsMap,           'solargraph/rbs_map'
-  autoload :GemPins,          'solargraph/gem_pins'
-  autoload :PinCache,         'solargraph/pin_cache'
+  autoload :CacheDir,         'solargraph/cache_dir'
   autoload :RbsTranslator,    'solargraph/rbs_translator'
+  autoload :RbsCollection,    'solargraph/rbs_collection'
+  autoload :Plugin,           'solargraph/plugin'
 
   dir = File.dirname(__FILE__)
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')

data/rbs/fills/boolean/0/boolean.rbs

@@ -0,0 +1,12 @@
+# Boolean is Solargraph's name for the RBS `bool` type. Store#get_superclass
+# already gives TrueClass and FalseClass `Boolean` as their superclass, but
+# nothing defined it, so it had no pin and carried only Object's methods.
+#
+# The members are the ones TrueClass and FalseClass share beyond Object.
+class Boolean
+  def &: (untyped obj) -> bool
+
+  def ^: (untyped obj) -> bool
+
+  def |: (untyped obj) -> bool
+end

data/solargraph.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ostruct', '~> 0.6'
   s.add_dependency 'parser', '~> 3.0'
   s.add_dependency 'prism', '~> 1.4'
-  s.add_dependency 'rbs', '>= 3.10.0'
+  s.add_dependency 'rbs', '>= 3.10.4'
   s.add_dependency 'rdoc', '~> 7.0'
   s.add_dependency 'reverse_markdown', '~> 3.0'
   s.add_dependency 'rubocop', '~> 1.76'
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
   # even more specific on RuboCop itself, which is written into _todo
   # file.
   s.add_development_dependency 'overcommit', '~> 0.71.0'
-  s.add_development_dependency 'rubocop', '~> 1.80.0.0'
+  s.add_development_dependency 'rubocop', '~> 1.80'
   s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
   s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
   s.add_development_dependency 'rubocop-yard', '~> 1.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.60.4
+  version: 0.62.0
 platform: ruby
 authors:
 - Fred Snyder
@@ -217,14 +217,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.10.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -433,14 +433,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.80.0.0
+        version: '1.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.80.0.0
+        version: '1.80'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -588,22 +588,21 @@ files:
 - lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/api_map/store.rb
 - lib/solargraph/bench.rb
+- lib/solargraph/cache_dir.rb
+- lib/solargraph/collection.rb
+- lib/solargraph/collection/base.rb
+- lib/solargraph/collection/core.rb
+- lib/solargraph/collection/gem.rb
+- lib/solargraph/collection/stdlib.rb
 - lib/solargraph/complex_type.rb
 - lib/solargraph/complex_type/conformance.rb
 - lib/solargraph/complex_type/type_methods.rb
 - lib/solargraph/complex_type/unique_type.rb
 - lib/solargraph/convention.rb
-- lib/solargraph/convention/active_support_concern.rb
 - lib/solargraph/convention/base.rb
-- lib/solargraph/convention/data_definition.rb
-- lib/solargraph/convention/data_definition/data_assignment_node.rb
-- lib/solargraph/convention/data_definition/data_definition_node.rb
 - lib/solargraph/convention/gemfile.rb
 - lib/solargraph/convention/gemspec.rb
 - lib/solargraph/convention/rakefile.rb
-- lib/solargraph/convention/struct_definition.rb
-- lib/solargraph/convention/struct_definition/struct_assignment_node.rb
-- lib/solargraph/convention/struct_definition/struct_definition_node.rb
 - lib/solargraph/converters/dd.rb
 - lib/solargraph/converters/dl.rb
 - lib/solargraph/converters/dt.rb
@@ -616,10 +615,9 @@ files:
 - lib/solargraph/diagnostics/severities.rb
 - lib/solargraph/diagnostics/type_check.rb
 - lib/solargraph/diagnostics/update_errors.rb
-- lib/solargraph/doc_map.rb
 - lib/solargraph/environ.rb
 - lib/solargraph/equality.rb
-- lib/solargraph/gem_pins.rb
+- lib/solargraph/external.rb
 - lib/solargraph/language_server.rb
 - lib/solargraph/language_server/completion_item_kinds.rb
 - lib/solargraph/language_server/error_codes.rb
@@ -684,6 +682,7 @@ files:
 - lib/solargraph/library.rb
 - lib/solargraph/location.rb
 - lib/solargraph/logging.rb
+- lib/solargraph/metagem.rb
 - lib/solargraph/page.rb
 - lib/solargraph/parser.rb
 - lib/solargraph/parser/comment_ripper.rb
@@ -702,7 +701,12 @@ files:
 - lib/solargraph/parser/parser_gem/node_processors/begin_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/block_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/casgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/class_definition.rb
+- lib/solargraph/parser/parser_gem/node_processors/class_definition/class_assignment_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/cvasgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/data_definition.rb
+- lib/solargraph/parser/parser_gem/node_processors/data_definition/data_assignment_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/data_definition/data_definition_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/def_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/defs_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/gvasgn_node.rb
@@ -717,6 +721,9 @@ files:
 - lib/solargraph/parser/parser_gem/node_processors/resbody_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/send_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/struct_definition.rb
+- lib/solargraph/parser/parser_gem/node_processors/struct_definition/struct_assignment_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/struct_definition/struct_definition_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/sym_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/until_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/when_node.rb
@@ -738,6 +745,7 @@ files:
 - lib/solargraph/pin/delegated_method.rb
 - lib/solargraph/pin/documenting.rb
 - lib/solargraph/pin/duck_method.rb
+- lib/solargraph/pin/factory_parameter.rb
 - lib/solargraph/pin/global_variable.rb
 - lib/solargraph/pin/instance_variable.rb
 - lib/solargraph/pin/keyword.rb
@@ -751,6 +759,7 @@ files:
 - lib/solargraph/pin/reference.rb
 - lib/solargraph/pin/reference/extend.rb
 - lib/solargraph/pin/reference/include.rb
+- lib/solargraph/pin/reference/included_mixin.rb
 - lib/solargraph/pin/reference/override.rb
 - lib/solargraph/pin/reference/prepend.rb
 - lib/solargraph/pin/reference/require.rb
@@ -762,15 +771,25 @@ files:
 - lib/solargraph/pin/symbol.rb
 - lib/solargraph/pin/until.rb
 - lib/solargraph/pin/while.rb
-- lib/solargraph/pin_cache.rb
+- lib/solargraph/plugin.rb
+- lib/solargraph/plugin/active_support.rb
+- lib/solargraph/plugin/addon.rb
+- lib/solargraph/plugin/base.rb
+- lib/solargraph/plugin/panel.rb
 - lib/solargraph/position.rb
 - lib/solargraph/range.rb
+- lib/solargraph/rbs_collection.rb
 - lib/solargraph/rbs_map.rb
+- lib/solargraph/rbs_map/base.rb
 - lib/solargraph/rbs_map/conversions.rb
+- lib/solargraph/rbs_map/core.rb
 - lib/solargraph/rbs_map/core_fills.rb
-- lib/solargraph/rbs_map/core_map.rb
-- lib/solargraph/rbs_map/stdlib_map.rb
+- lib/solargraph/rbs_map/gem.rb
+- lib/solargraph/rbs_map/helpers.rb
+- lib/solargraph/rbs_map/path.rb
+- lib/solargraph/rbs_map/stdlib.rb
 - lib/solargraph/rbs_translator.rb
+- lib/solargraph/repo.rb
 - lib/solargraph/server_methods.rb
 - lib/solargraph/shell.rb
 - lib/solargraph/source.rb
@@ -789,15 +808,18 @@ files:
 - lib/solargraph/source/chain/link.rb
 - lib/solargraph/source/chain/literal.rb
 - lib/solargraph/source/chain/or.rb
+- lib/solargraph/source/chain/parameter.rb
 - lib/solargraph/source/chain/q_call.rb
 - lib/solargraph/source/chain/variable.rb
 - lib/solargraph/source/chain/z_super.rb
 - lib/solargraph/source/change.rb
 - lib/solargraph/source/cursor.rb
 - lib/solargraph/source/encoding_fixes.rb
+- lib/solargraph/source/node_map.rb
 - lib/solargraph/source/source_chainer.rb
 - lib/solargraph/source/updater.rb
 - lib/solargraph/source_map.rb
+- lib/solargraph/source_map/call.rb
 - lib/solargraph/source_map/clip.rb
 - lib/solargraph/source_map/completion.rb
 - lib/solargraph/source_map/data.rb
@@ -815,7 +837,6 @@ files:
 - lib/solargraph/views/search.erb
 - lib/solargraph/workspace.rb
 - lib/solargraph/workspace/config.rb
-- lib/solargraph/workspace/gemspecs.rb
 - lib/solargraph/workspace/require_paths.rb
 - lib/solargraph/yard_map.rb
 - lib/solargraph/yard_map/cache.rb
@@ -825,6 +846,7 @@ files:
 - lib/solargraph/yard_map/directives/method_directive.rb
 - lib/solargraph/yard_map/directives/override_directive.rb
 - lib/solargraph/yard_map/directives/parse_directive.rb
+- lib/solargraph/yard_map/directives/scope_directive.rb
 - lib/solargraph/yard_map/directives/visibility_directive.rb
 - lib/solargraph/yard_map/helpers.rb
 - lib/solargraph/yard_map/macro.rb
@@ -834,6 +856,7 @@ files:
 - lib/solargraph/yard_map/mapper/to_namespace.rb
 - lib/solargraph/yard_tags.rb
 - lib/solargraph/yardoc.rb
+- rbs/fills/boolean/0/boolean.rbs
 - rbs/fills/bundler/0/bundler.rbs
 - rbs/fills/open3/0/open3.rbs
 - rbs/fills/rubygems/0/basic_specification.rbs

data/lib/solargraph/convention/active_support_concern.rb

@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Convention
-    # ActiveSupport::Concern is syntactic sugar for a common
-    # pattern to include class methods while mixing-in a Module
-    # See https://api.rubyonrails.org/classes/ActiveSupport/Concern.html
-    class ActiveSupportConcern < Base
-      include Logging
-
-      # @return [Array<Pin::Base>]
-      attr_reader :pins
-
-      # @param api_map [ApiMap]
-      # @param rooted_tag [String]
-      # @param scope [Symbol] :class or :instance
-      # @param visibility [Array<Symbol>] :public, :protected, and/or :private
-      # @param deep [Boolean] whether to include methods from included modules
-      # @param skip [Set<String>]
-      # @param _no_core [Boolean]n whether to skip core methods
-      def object api_map, rooted_tag, scope, visibility, deep, skip, _no_core
-        moo = ObjectProcessor.new(api_map, rooted_tag, scope, visibility, deep, skip)
-        moo.environ
-      end
-
-      # yard-activesupport-concern pulls methods inside
-      # 'class_methods' blocks into main class visible from YARD
-      #
-      # @param _doc_map [DocMap]
-      def global _doc_map
-        Environ.new(yard_plugins: ['activesupport-concern'])
-      end
-
-      # Process an object to add any class methods brought in via
-      # ActiveSupport::Concern
-      class ObjectProcessor
-        include Logging
-
-        attr_reader :environ
-
-        # @param api_map [ApiMap]
-        # @param rooted_tag [String] the tag of the class or module being processed
-        # @param scope [Symbol] :class or :instance
-        # @param visibility [Array<Symbol>] :public, :protected, and/or :private
-        # @param deep [Boolean] whether to include methods from included modules
-        # @param skip [Set<String>] a set of tags to skip
-        def initialize api_map, rooted_tag, scope, visibility, deep, skip
-          @api_map = api_map
-          @rooted_tag = rooted_tag
-          @scope = scope
-          @visibility = visibility
-          @deep = deep
-          @skip = skip
-
-          @environ = Environ.new
-          return unless scope == :class
-
-          @rooted_type = ComplexType.parse(rooted_tag).force_rooted
-          @fqns = rooted_type.namespace
-          @namespace_pin = api_map.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
-
-          api_map.get_includes(fqns).reverse.each do |include_tag|
-            process_include include_tag
-          end
-        end
-
-        private
-
-        attr_reader :api_map, :rooted_tag, :rooted_type, :scope,
-                    :visibility, :deep, :skip, :namespace_pin,
-                    :fqns
-
-        # @param include_tag [Pin::Reference::Include] the include reference pin
-        #
-        # @return [void]
-        def process_include include_tag
-          rooted_include_tag = api_map.dereference(include_tag)
-          return if rooted_include_tag.nil?
-          logger.debug do
-            "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
-              "Handling class include include_tag=#{include_tag}"
-          end
-          module_extends = api_map.get_extends(rooted_include_tag).map(&:type).map(&:to_s)
-          logger.debug do
-            "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
-              "found module extends of #{rooted_include_tag}: #{module_extends}"
-          end
-          return unless module_extends.include? 'ActiveSupport::Concern'
-          included_class_pins = api_map.inner_get_methods_from_reference(rooted_include_tag, namespace_pin, rooted_type,
-                                                                         :class, visibility, deep, skip, true)
-          logger.debug do
-            "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
-              "Found #{included_class_pins.length} inluded class methods for #{rooted_include_tag}"
-          end
-          environ.pins.concat included_class_pins
-          # another pattern is to put class methods inside a submodule
-          classmethods_include_tag = "#{rooted_include_tag}::ClassMethods"
-          included_classmethods_pins =
-            api_map.inner_get_methods_from_reference(classmethods_include_tag, namespace_pin, rooted_type,
-                                                     :instance, visibility, deep, skip, true)
-          logger.debug do
-            "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
-              "Found #{included_classmethods_pins.length} included classmethod " \
-              "class methods for #{classmethods_include_tag}"
-          end
-          environ.pins.concat included_classmethods_pins
-        end
-      end
-    end
-  end
-end

data/lib/solargraph/convention/data_definition/data_assignment_node.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Convention
-    module DataDefinition
-      # A node wrapper for a Data definition via const assignment.
-      # @example
-      #   MyData = Data.new(:bar, :baz) do
-      #     def foo
-      #     end
-      #   end
-      class DataAssignmentNode < DataDefintionNode
-        class << self
-          # @example
-          # s(:casgn, nil, :Foo,
-          #   s(:block,
-          #     s(:send,
-          #       s(:const, nil, :Data), :define,
-          #       s(:sym, :bar),
-          #       s(:sym, :baz)),
-          #     s(:args),
-          #     s(:def, :foo,
-          #       s(:args),
-          #       s(:send, nil, :bar))))
-          # @param node [::Parser::AST::Node]
-          def match? node
-            return false unless node&.type == :casgn
-            return false if node.children[2].nil?
-
-            data_node = if node.children[2].type == :block
-                          node.children[2].children[0]
-                        else
-                          node.children[2]
-                        end
-
-            data_definition_node?(data_node)
-          end
-        end
-
-        def class_name
-          if node.children[0]
-            Parser::NodeMethods.unpack_name(node.children[0]) + "::#{node.children[1]}"
-          else
-            node.children[1].to_s
-          end
-        end
-
-        private
-
-        # @return [Parser::AST::Node]
-        def data_node
-          if node.children[2].type == :block
-            node.children[2].children[0]
-          else
-            node.children[2]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/solargraph/convention/data_definition/data_definition_node.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Convention
-    module DataDefinition
-      # A node wrapper for a Data definition via inheritance.
-      # @example
-      #   class MyData < Data.new(:bar, :baz)
-      #     def foo
-      #     end
-      #   end
-      class DataDefintionNode
-        class << self
-          # @example
-          #   s(:class,
-          #     s(:const, nil, :Foo),
-          #     s(:send,
-          #       s(:const, nil, :Data), :define,
-          #       s(:sym, :bar),
-          #       s(:sym, :baz)),
-          #       s(:hash,
-          #         s(:pair,
-          #           s(:sym, :keyword_init),
-          #           s(:true)))),
-          #     s(:def, :foo,
-          #       s(:args),
-          #       s(:send, nil, :bar)))
-          #
-          # @param node [Parser::AST::Node]
-          def match? node
-            return false unless node&.type == :class
-
-            data_definition_node?(node.children[1])
-          end
-
-          private
-
-          # @param data_node [Parser::AST::Node]
-          # @return [Boolean]
-          def data_definition_node? data_node
-            return false unless data_node.is_a?(::Parser::AST::Node)
-            return false unless data_node&.type == :send
-            return false unless data_node.children[0]&.type == :const
-            return false unless data_node.children[0].children[1] == :Data
-            return false unless data_node.children[1] == :define
-
-            true
-          end
-        end
-
-        # @param node [Parser::AST::Node]
-        def initialize node
-          @node = node
-        end
-
-        # @return [String]
-        def class_name
-          Parser::NodeMethods.unpack_name(node)
-        end
-
-        # @return [Array<Array(Parser::AST::Node, String)>]
-        def attributes
-          data_attribute_nodes.map do |data_def_param|
-            next unless data_def_param.type == :sym
-            [data_def_param, data_def_param.children[0].to_s]
-          end.compact
-        end
-
-        # @return [Parser::AST::Node, nil]
-        def body_node
-          node.children[2]
-        end
-
-        private
-
-        # @return [Parser::AST::Node]
-        attr_reader :node
-
-        # @return [Parser::AST::Node, nil]
-        def data_node
-          node.children[1]
-        end
-
-        # @sg-ignore Need to add nil check here
-        # @return [Array<Parser::AST::Node>]
-        def data_attribute_nodes
-          # @sg-ignore Need to add nil check here
-          data_node.children[2..]
-        end
-      end
-    end
-  end
-end