solargraph 0.61.0 → 0.62.0

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

@@ -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.61.0
+  version: 0.62.0
 platform: ruby
 authors:
 - Fred Snyder
@@ -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
@@ -593,24 +593,16 @@ files:
 - lib/solargraph/collection/base.rb
 - lib/solargraph/collection/core.rb
 - lib/solargraph/collection/gem.rb
-- lib/solargraph/collection/rbs.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
@@ -709,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
@@ -724,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
@@ -759,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
@@ -770,8 +771,14 @@ files:
 - lib/solargraph/pin/symbol.rb
 - lib/solargraph/pin/until.rb
 - lib/solargraph/pin/while.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
@@ -808,9 +815,11 @@ files:
 - 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
@@ -847,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/collection/rbs.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'digest'
-
-module Solargraph
-  module Collection
-    # Cacheable pins from an RBS collection directory.
-    #
-    class Rbs < Base
-      # @return [String]
-      attr_reader :path
-
-      # @param path [String]
-      # @return [Array<Pin::Base>]
-      def self.load path
-        new(path).load
-      end
-
-      # @param path [String]
-      def initialize path
-        super()
-        @path = path
-      end
-
-      # @return [Array<Pin::Base>]
-      def pins
-        @pins ||= RbsMap::Path.pins(path)
-      end
-
-      # @return [String]
-      def cache_file
-        File.join CacheDir.rbs_dir, "#{key}.ser"
-      end
-
-      private
-
-      # A collection is rewritten in place by `rbs collection install`, so the
-      # newest signature mtime distinguishes one installation from the next.
-      #
-      # @return [String]
-      def key
-        @key ||= begin
-          stamp = Dir.glob(File.join(path, '**', '*.rbs')).map { |file| File.mtime(file).to_i }.max
-          format('%.32s', Digest::SHA256.hexdigest("#{File.expand_path(path)}:#{stamp}"))
-        end
-      end
-    end
-  end
-end

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

data/lib/solargraph/convention/data_definition.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Convention
-    module DataDefinition
-      autoload :DataDefintionNode, 'solargraph/convention/data_definition/data_definition_node'
-      autoload :DataAssignmentNode, 'solargraph/convention/data_definition/data_assignment_node'
-
-      module NodeProcessors
-        class DataNode < Parser::NodeProcessor::Base
-          # @return [Boolean] continue processing the next processor of the same node.
-          def process
-            return true if data_definition_node.nil?
-
-            loc = get_node_location(node)
-            nspin = Solargraph::Pin::Namespace.new(
-              type: :class,
-              location: loc,
-              closure: region.closure,
-              # @sg-ignore flow sensitive typing needs to handle attrs
-              name: data_definition_node.class_name,
-              comments: comments_for(node),
-              visibility: :public,
-              gates: region.closure.gates.freeze
-            )
-            pins.push nspin
-
-            # define initialize method
-            initialize_method_pin = Pin::Method.new(
-              name: 'initialize',
-              parameters: [],
-              scope: :instance,
-              location: get_node_location(node),
-              closure: nspin,
-              visibility: :private,
-              comments: comments_for(node)
-            )
-
-            # @todo Support both arg and kwarg initializers for Data.define
-            # Solargraph::SourceMap::Clip#complete_keyword_parameters does not seem to currently take into account [Pin::Method#signatures] hence we only one for :kwarg
-            pins.push initialize_method_pin
-
-            # @sg-ignore flow sensitive typing needs to handle attrs
-            data_definition_node.attributes.map do |attribute_node, attribute_name|
-              initialize_method_pin.parameters.push(
-                Pin::Parameter.new(
-                  name: attribute_name,
-                  decl: :kwarg,
-                  location: get_node_location(attribute_node),
-                  closure: initialize_method_pin
-                )
-              )
-            end
-
-            # define attribute readers and instance variables
-            # @sg-ignore flow sensitive typing needs to handle attrs
-            data_definition_node.attributes.each do |attribute_node, attribute_name|
-              name = attribute_name.to_s
-              method_pin = Pin::Method.new(
-                name: name,
-                parameters: [],
-                scope: :instance,
-                location: get_node_location(attribute_node),
-                closure: nspin,
-                comments: attribute_comments(attribute_node, attribute_name),
-                visibility: :public
-              )
-
-              pins.push method_pin
-
-              pins.push Pin::InstanceVariable.new(name: "@#{attribute_name}",
-                                                  closure: method_pin,
-                                                  location: get_node_location(attribute_node),
-                                                  comments: attribute_comments(attribute_node, attribute_name))
-            end
-
-            process_children region.update(closure: nspin, visibility: :public)
-
-            false
-          end
-
-          private
-
-          # @return [DataDefinition::DataDefintionNode, DataDefinition::DataAssignmentNode, nil]
-          def data_definition_node
-            @data_definition_node ||= if DataDefintionNode.match?(node)
-                                        DataDefintionNode.new(node)
-                                      elsif DataAssignmentNode.match?(node)
-                                        DataAssignmentNode.new(node)
-                                      end
-          end
-
-          # @param attribute_node [Parser::AST::Node]
-          # @param attribute_name [String]
-          # @return [String, nil]
-          def attribute_comments attribute_node, attribute_name
-            data_comments = comments_for(attribute_node)
-            return if data_comments.nil? || data_comments.empty?
-
-            data_comments.split("\n").find do |row|
-              row.include?(attribute_name)
-            end&.gsub('@param', '@return')&.gsub(attribute_name, '')
-          end
-        end
-      end
-    end
-  end
-end

data/lib/solargraph/convention/struct_definition/struct_assignment_node.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Convention
-    module StructDefinition
-      # A node wrapper for a Struct definition via const assignment.
-      # @example
-      #   MyStruct = Struct.new(:bar, :baz) do
-      #     def foo
-      #     end
-      #   end
-      class StructAssignmentNode < StructDefintionNode
-        class << self
-          # @example
-          # s(:casgn, nil, :Foo,
-          #   s(:block,
-          #     s(:send,
-          #       s(:const, nil, :Struct), :new,
-          #       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?
-
-            struct_node = if node.children[2].type == :block
-                            node.children[2].children[0]
-                          else
-                            node.children[2]
-                          end
-
-            struct_definition_node?(struct_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 struct_node
-          if node.children[2].type == :block
-            node.children[2].children[0]
-          else
-            node.children[2]
-          end
-        end
-      end
-    end
-  end
-end