solargraph 0.58.3 → 0.60.0

data/lib/solargraph/rbs_map/conversions.rb

@@ -23,7 +23,7 @@ module Solargraph
       end
 
       # @param loader [RBS::EnvironmentLoader]
-      def initialize(loader:)
+      def initialize loader:
         @loader = loader
         @pins = []
         load_environment_to_pins(loader)
@@ -37,18 +37,15 @@ module Solargraph
 
       private
 
-      # @return [Hash{String => RBS::AST::Declarations::TypeAlias}]
-      def type_aliases
-        @type_aliases ||= {}
-      end
-
       # @param loader [RBS::EnvironmentLoader]
+      #
       # @return [void]
-      def load_environment_to_pins(loader)
+      def load_environment_to_pins loader
         environment = RBS::Environment.from_loader(loader).resolve_type_names
-        cursor = pins.length
         if environment.declarations.empty?
-          Solargraph.logger.info "No RBS declarations found in environment for core_root #{loader.core_root.inspect}, libraries #{loader.libs} and directories #{loader.dirs}"
+          Solargraph.logger.info 'No RBS declarations found in environment for core_root ' \
+                                 "#{loader.core_root.inspect}, libraries #{loader.libs} and " \
+                                 "directories #{loader.dirs}"
           return
         end
         environment.declarations.each { |decl| convert_decl_to_pin(decl, Solargraph::Pin::ROOT_PIN) }
@@ -60,22 +57,61 @@ module Solargraph
       def convert_decl_to_pin decl, closure
         case decl
         when RBS::AST::Declarations::Class
+          # @sg-ignore flow sensitive typing should support case/when
+          unless closure.name == '' || decl.name.absolute?
+            Solargraph.assert_or_log(:rbs_closure, "Ignoring closure #{closure.inspect} on class #{decl.inspect}")
+          end
           class_decl_to_pin decl
         when RBS::AST::Declarations::Interface
-          # STDERR.puts "Skipping interface #{decl.name.relative!}"
-          interface_decl_to_pin decl, closure
+          # @sg-ignore flow sensitive typing should support case/when
+          unless closure.name == '' || decl.name.absolute?
+            Solargraph.assert_or_log(:rbs_closure, "Ignoring closure #{closure.inspect} on interface #{decl.inspect}")
+          end
+          interface_decl_to_pin decl
         when RBS::AST::Declarations::TypeAlias
-          # @sg-ignore https://github.com/castwide/solargraph/pull/1114
-          type_aliases[decl.name.to_s] = decl
+          # @sg-ignore flow sensitive typing should support case/when
+          unless closure.name == '' || decl.name.absolute?
+            Solargraph.assert_or_log(:rbs_closure,
+                                     # @sg-ignore flow sensitive typing should support case/when
+                                     "Ignoring closure #{closure.inspect} on alias type name #{decl.name}")
+          end
+          pins.push(
+            # @sg-ignore Wrong argument type for Solargraph::Pin::Reference::TypeAlias.new: return_type expected Solargraph::ComplexType, received Solargraph::ComplexType::UniqueType, Solargraph::ComplexType
+            Solargraph::Pin::Reference::TypeAlias.new(
+              # @sg-ignore Unresolved calls to name, type, type_location; return_type type mismatch
+              name: ComplexType.try_parse(decl.name.to_s).to_s, return_type: RbsTranslator.to_complex_type(decl.type).force_rooted, closure: closure, source: :rbs, type_location: location_decl_to_pin_location(decl.location)
+            )
+          )
         when RBS::AST::Declarations::Module
+          # @sg-ignore flow sensitive typing should support case/when
+          unless closure.name == '' || decl.name.absolute?
+            Solargraph.assert_or_log(:rbs_closure,
+                                     # @sg-ignore flow sensitive typing should support case/when
+                                     "Ignoring closure #{closure.inspect} on alias type name #{decl.name}")
+          end
           module_decl_to_pin decl
         when RBS::AST::Declarations::Constant
+          # @sg-ignore flow sensitive typing should support case/when
+          unless closure.name == '' || decl.name.absolute?
+            Solargraph.assert_or_log(:rbs_closure, "Ignoring closure #{closure.inspect} on constant #{decl.inspect}")
+          end
           constant_decl_to_pin decl
         when RBS::AST::Declarations::ClassAlias
+          # @sg-ignore flow sensitive typing should support case/when
+          unless closure.name == '' || decl.new_name.absolute?
+            Solargraph.assert_or_log(:rbs_closure, "Ignoring closure #{closure.inspect} on class alias #{decl.inspect}")
+          end
           class_alias_decl_to_pin decl
         when RBS::AST::Declarations::ModuleAlias
+          unless closure.name == ''
+            Solargraph.assert_or_log(:rbs_closure,
+                                     "Ignoring closure #{closure.inspect} on module alias #{decl.inspect}")
+          end
           module_alias_decl_to_pin decl
         when RBS::AST::Declarations::Global
+          unless closure.name == ''
+            Solargraph.assert_or_log(:rbs_closure, "Ignoring closure #{closure.inspect} on global decl #{decl.inspect}")
+          end
           global_decl_to_pin decl
         else
           Solargraph.logger.warn "Skipping declaration #{decl.class}"
@@ -86,7 +122,62 @@ module Solargraph
       # @param module_pin [Pin::Namespace]
       # @return [void]
       def convert_self_types_to_pins decl, module_pin
-        decl.self_types.each { |self_type| context = convert_self_type_to_pins(self_type, module_pin) }
+        decl.self_types.each { |self_type| convert_self_type_to_pins(self_type, module_pin) }
+      end
+
+      # @type [Hash{String => String}]
+      RBS_TO_CLASS = {
+        'bool' => 'Boolean',
+        'string' => 'String',
+        'int' => 'Integer'
+      }.freeze
+      private_constant :RBS_TO_CLASS
+
+      # rooted names (namespaces) use the prefix of :: when they are
+      # relative to the root namespace, or not if they are relative to
+      # the current namespace.
+      #
+      # @param type_name [RBS::TypeName]
+      #
+      # @return [String]
+      def rooted_name type_name
+        name = type_name.to_s
+        RBS_TO_CLASS.fetch(name, name)
+      end
+
+      # fqns names are implicitly fully qualified - they are relative
+      # to the root namespace and are not prefixed with ::
+      #
+      # @param type_name [RBS::TypeName]
+      #
+      # @return [String]
+      def fqns type_name
+        unless type_name.absolute?
+          Solargraph.assert_or_log(:rbs_fqns, "Received unexpected unqualified type name: #{type_name}")
+        end
+        ns = type_name.relative!.to_s
+        RBS_TO_CLASS.fetch(ns, ns)
+      end
+
+      # @param type_name [RBS::TypeName]
+      # @param type_args [Enumerable<RBS::Types::Bases::Base>]
+      # @return [ComplexType::UniqueType]
+      def build_type type_name, type_args = []
+        # we use .absolute? below to tell the type object what to
+        # expect
+        rbs_name = type_name.relative!.to_s
+        base = RBS_TO_CLASS.fetch(rbs_name, rbs_name)
+
+        params = type_args.map { |a| RbsTranslator.to_complex_type(a) }
+        # @todo Tuples are in flux
+        # tuples have their own class and are handled in other_type_to_type
+        if base == 'Hash' && params.length == 2
+          ComplexType::UniqueType.new(base, [params.first], [params.last], rooted: type_name.absolute?,
+                                                                           parameters_type: :hash)
+        else
+          ComplexType::UniqueType.new(base, [], params.reject(&:undefined?), rooted: type_name.absolute?,
+                                                                             parameters_type: :list)
+        end
       end
 
       # @param decl [RBS::AST::Declarations::Module::Self]
@@ -120,32 +211,44 @@ module Solargraph
       def convert_member_to_pin member, closure, context
         case member
         when RBS::AST::Members::MethodDefinition
+          # @sg-ignore flow based typing needs to understand case when class pattern
           method_def_to_pin(member, closure, context)
         when RBS::AST::Members::AttrReader
+          # @sg-ignore flow based typing needs to understand case when class pattern
           attr_reader_to_pin(member, closure, context)
         when RBS::AST::Members::AttrWriter
+          # @sg-ignore flow based typing needs to understand case when class pattern
           attr_writer_to_pin(member, closure, context)
         when RBS::AST::Members::AttrAccessor
+          # @sg-ignore flow based typing needs to understand case when class pattern
           attr_accessor_to_pin(member, closure, context)
         when RBS::AST::Members::Include
+          # @sg-ignore flow based typing needs to understand case when class pattern
           include_to_pin(member, closure)
         when RBS::AST::Members::Prepend
+          # @sg-ignore flow based typing needs to understand case when class pattern
           prepend_to_pin(member, closure)
         when RBS::AST::Members::Extend
+          # @sg-ignore flow based typing needs to understand case when class pattern
           extend_to_pin(member, closure)
         when RBS::AST::Members::Alias
+          # @sg-ignore flow based typing needs to understand case when class pattern
           alias_to_pin(member, closure)
         when RBS::AST::Members::ClassInstanceVariable
+          # @sg-ignore flow based typing needs to understand case when class pattern
           civar_to_pin(member, closure)
         when RBS::AST::Members::ClassVariable
+          # @sg-ignore flow based typing needs to understand case when class pattern
           cvar_to_pin(member, closure)
         when RBS::AST::Members::InstanceVariable
+          # @sg-ignore flow based typing needs to understand case when class pattern
           ivar_to_pin(member, closure)
         when RBS::AST::Members::Public
           return Context.new(:public)
         when RBS::AST::Members::Private
           return Context.new(:private)
         when RBS::AST::Declarations::Base
+          # @sg-ignore flow based typing needs to understand case when class pattern
           convert_decl_to_pin(member, closure)
         else
           Solargraph.logger.warn "Skipping member type #{member.class}"
@@ -153,18 +256,34 @@ module Solargraph
         context
       end
 
+      # Pull the name of type variables for a generic - not the
+      # values, the names (e.g., T, U, V).  As such, "rooting" isn't a
+      # thing, these are all in the global namespace.
+      #
+      # @param decl [RBS::AST::Declarations::Class, RBS::AST::Declarations::Interface,
+      #   RBS::AST::Declarations::Module, RBS::MethodType]
+      #
+      # @return [Array<String>]
+      def type_parameter_names decl
+        decl.type_params.map(&:name).map(&:to_s)
+      end
+
       # @param decl [RBS::AST::Declarations::Class]
       # @return [void]
       def class_decl_to_pin decl
-        generics = decl.type_params.map(&:name).map(&:to_s)
+        # @type [Hash{String => ComplexType, ComplexType::UniqueType}]
         generic_defaults = {}
         decl.type_params.each do |param|
           if param.default_type
-            tag = other_type_to_tag param.default_type
-            generic_defaults[param.name.to_s] = ComplexType.parse(tag).force_rooted
+            complex_type = RbsTranslator.to_complex_type(param.default_type).force_rooted
+            generic_defaults[param.name.to_s] = complex_type
           end
         end
-        class_name = decl.name.relative!.to_s
+
+        class_name = fqns(decl.name)
+
+        generics = type_parameter_names(decl)
+
         class_pin = Solargraph::Pin::Namespace.new(
           type: :class,
           name: class_name,
@@ -187,7 +306,7 @@ module Solargraph
             type_location: location_decl_to_pin_location(decl.super_class.location),
             closure: class_pin,
             generic_values: generic_values,
-            name: superclass_name,
+            name: type.rooted_name, # reference pins use rooted names
             source: :rbs
           )
         end
@@ -196,16 +315,15 @@ module Solargraph
       end
 
       # @param decl [RBS::AST::Declarations::Interface]
-      # @param closure [Pin::Closure]
       # @return [void]
-      def interface_decl_to_pin decl, closure
+      def interface_decl_to_pin decl
         class_pin = Solargraph::Pin::Namespace.new(
           type: :module,
           type_location: location_decl_to_pin_location(decl.location),
           name: decl.name.relative!.to_s,
           closure: Solargraph::Pin::ROOT_PIN,
           comments: decl.comment&.string,
-          generics: decl.type_params.map(&:name).map(&:to_s),
+          generics: type_parameter_names(decl),
           # HACK: Using :hidden to keep interfaces from appearing in
           # autocompletion
           visibility: :hidden,
@@ -225,41 +343,50 @@ module Solargraph
           type_location: location_decl_to_pin_location(decl.location),
           closure: Solargraph::Pin::ROOT_PIN,
           comments: decl.comment&.string,
-          generics: decl.type_params.map(&:name).map(&:to_s),
+          generics: type_parameter_names(decl),
           source: :rbs
         )
         pins.push module_pin
         convert_self_types_to_pins decl, module_pin
         convert_members_to_pins decl, module_pin
 
+        raise "Invalid type for module declaration: #{module_pin.class}" unless module_pin.is_a?(Pin::Namespace)
+
         add_mixins decl, module_pin.closure
       end
 
-      # @param name [String]
-      # @param tag [String]
-      # @param comments [String]
-      # @param decl [RBS::AST::Declarations::ClassAlias, RBS::AST::Declarations::Constant, RBS::AST::Declarations::ModuleAlias]
-      # @param base [String, nil] Optional conversion of tag to base<tag>
+      # @param fqns [String]
+      # @param type [ComplexType, ComplexType::UniqueType]
+      # @param comments [String, nil]
+      # @param decl [RBS::AST::Declarations::ClassAlias,
+      #   RBS::AST::Declarations::Constant,
+      #   RBS::AST::Declarations::ModuleAlias]
+      # @param base [String, nil] Optional conversion of tag to
+      #   base<tag> - valid values are Class and Module
       #
       # @return [Solargraph::Pin::Constant]
-      def create_constant(name, tag, comments, decl, base = nil)
-        parts = name.split('::')
+      def create_constant fqns, type, comments, decl, base = nil
+        parts = fqns.split('::')
         if parts.length > 1
-          name = parts.last
+          fqns = parts.last
+          # @sg-ignore Need to add nil check here
           closure = pins.select { |pin| pin && pin.path == parts[0..-2].join('::') }.first
         else
-          name = parts.first
+          fqns = parts.first
           closure = Solargraph::Pin::ROOT_PIN
         end
         constant_pin = Solargraph::Pin::Constant.new(
-          name: name,
+          name: fqns,
           closure: closure,
           type_location: location_decl_to_pin_location(decl.location),
           comments: comments,
           source: :rbs
         )
-        tag = "#{base}<#{tag}>" if base
-        rooted_tag = ComplexType.parse(tag).force_rooted.rooted_tags
+        rooted_tag = type.rooted_tags
+        rooted_tag = "#{base}<#{rooted_tag}>" if base
+        # @todo alt version
+        # tag = "#{base}<#{tag}>" if base
+        # rooted_tag = ComplexType.parse(tag).force_rooted.rooted_tags
         constant_pin.docstring.add_tag(YARD::Tags::Tag.new(:return, '', rooted_tag))
         constant_pin
       end
@@ -268,26 +395,25 @@ module Solargraph
       # @return [void]
       def class_alias_decl_to_pin decl
         # See https://www.rubydoc.info/gems/rbs/3.4.3/RBS/AST/Declarations/ClassAlias
-        new_name = decl.new_name.relative!.to_s
-        old_name = decl.old_name.relative!.to_s
-
-        pins.push create_constant(new_name, old_name, decl.comment&.string, decl, 'Class')
+        new_name = fqns(decl.new_name)
+        old_type = build_type(decl.old_name)
+        pins.push create_constant(new_name, old_type, decl.comment&.string, decl, '::Class')
       end
 
       # @param decl [RBS::AST::Declarations::ModuleAlias]
       # @return [void]
       def module_alias_decl_to_pin decl
         # See https://www.rubydoc.info/gems/rbs/3.4.3/RBS/AST/Declarations/ModuleAlias
-        new_name = decl.new_name.relative!.to_s
-        old_name = decl.old_name.relative!.to_s
+        new_name = fqns(decl.new_name)
+        old_type = build_type(decl.old_name)
 
-        pins.push create_constant(new_name, old_name, decl.comment&.string, decl,  'Module')
+        pins.push create_constant(new_name, old_type, decl.comment&.string, decl, '::Module')
       end
 
       # @param decl [RBS::AST::Declarations::Constant]
       # @return [void]
       def constant_decl_to_pin decl
-        tag = other_type_to_tag(decl.type)
+        tag = RbsTranslator.to_complex_type(decl.type)
         pins.push create_constant(decl.name.relative!.to_s, tag, decl.comment&.string, decl)
       end
 
@@ -303,12 +429,11 @@ module Solargraph
           type_location: location_decl_to_pin_location(decl.location),
           source: :rbs
         )
-        rooted_tag = ComplexType.parse(other_type_to_tag(decl.type)).force_rooted.rooted_tags
+        rooted_tag = RbsTranslator.to_complex_type(decl.type).force_rooted.rooted_tags
         pin.docstring.add_tag(YARD::Tags::Tag.new(:type, '', rooted_tag))
         pins.push pin
       end
 
-
       # Visibility overrides that will allow the Solargraph project
       # and plugins to pass typechecking using SOLARGRAPH_ASSERTS=on,
       # so that we can detect any regressions/issues elsewhere in the
@@ -324,42 +449,47 @@ module Solargraph
       #   allow that to be extended via .solargraph.yml
       # @type [Hash{Array(String, Symbol, String) => Symbol}
       VISIBILITY_OVERRIDE = {
-        ["Rails::Engine", :instance, "run_tasks_blocks"] => :protected,
+        ['Rails::Engine', :instance, 'run_tasks_blocks'] => :protected,
         # Should have been marked as both instance and class method in module -e.g., 'module_function'
-        ["Kernel", :instance, "pretty_inspect"] => :private,
+        ['Kernel', :instance, 'pretty_inspect'] => :private,
         # marked incorrectly in RBS
-        ["WEBrick::HTTPUtils::FormData", :instance, "next_data"] => :protected,
-        ["Rails::Command", :class, "command_type"] => :private,
-        ["Rails::Command", :class, "lookup_paths"] => :private,
-        ["Rails::Command", :class, "file_lookup_paths"] => :private,
-        ["Rails::Railtie", :instance, "run_console_blocks"] => :protected,
-        ["Rails::Railtie", :instance, "run_generators_blocks"] => :protected,
-        ["Rails::Railtie", :instance, "run_runner_blocks"] => :protected,
-        ["Rails::Railtie", :instance, "run_tasks_blocks"] => :protected,
-        ["ActionController::Base", :instance, "_protected_ivars"] => :private,
-        ["ActionView::Template", :instance, "method_name"] => :public,
-        ["Module", :instance, "ruby2_keywords"] => :private,
-        ["Nokogiri::XML::Node", :instance, "coerce"] => :protected,
-        ["Nokogiri::XML::Document", :class, "empty_doc?"] => :private,
-        ["Nokogiri::Decorators::Slop", :instance, "respond_to_missing?"] => :public,
-        ["RuboCop::Cop::RangeHelp", :instance, "source_range"] => :private,
-        ["AST::Node", :instance, "original_dup"] => :private,
-        ["Rainbow::Presenter", :instance, "wrap_with_sgr"] => :private,
-      }
-
-      # @param decl [RBS::AST::Members::MethodDefinition, RBS::AST::Members::AttrReader, RBS::AST::Members::AttrAccessor]
+        ['WEBrick::HTTPUtils::FormData', :instance, 'next_data'] => :protected,
+        ['Rails::Command', :class, 'command_type'] => :private,
+        ['Rails::Command', :class, 'lookup_paths'] => :private,
+        ['Rails::Command', :class, 'file_lookup_paths'] => :private,
+        ['Rails::Railtie', :instance, 'run_console_blocks'] => :protected,
+        ['Rails::Railtie', :instance, 'run_generators_blocks'] => :protected,
+        ['Rails::Railtie', :instance, 'run_runner_blocks'] => :protected,
+        ['Rails::Railtie', :instance, 'run_tasks_blocks'] => :protected,
+        ['ActionController::Base', :instance, '_protected_ivars'] => :private,
+        ['ActionView::Template', :instance, 'method_name'] => :public,
+        ['Module', :instance, 'ruby2_keywords'] => :private,
+        ['Nokogiri::XML::Node', :instance, 'coerce'] => :protected,
+        ['Nokogiri::XML::Document', :class, 'empty_doc?'] => :private,
+        ['Nokogiri::Decorators::Slop', :instance, 'respond_to_missing?'] => :public,
+        ['RuboCop::Cop::RangeHelp', :instance, 'source_range'] => :private,
+        ['AST::Node', :instance, 'original_dup'] => :private,
+        ['Rainbow::Presenter', :instance, 'wrap_with_sgr'] => :private
+      }.freeze
+      private_constant :VISIBILITY_OVERRIDE
+
+      # @param decl [RBS::AST::Members::MethodDefinition, RBS::AST::Members::AttrReader,
+      #   RBS::AST::Members::AttrWriter, RBS::AST::Members::AttrAccessor]
       # @param closure [Pin::Closure]
       # @param context [Context]
       # @param scope [Symbol] :instance or :class
       # @param name [String] The name of the method
-      # @sg-ignore
       # @return [Symbol]
-      def calculate_method_visibility(decl, context, closure, scope, name)
+      # @sg-ignore Declared return type ::Symbol does not match inferred type
+      #   ::Symbol, :public, :private, nil for Solargraph::RbsMap::Conversions#calculate_method_visibility
+      def calculate_method_visibility decl, context, closure, scope, name
         override_key = [closure.path, scope, name]
         visibility = VISIBILITY_OVERRIDE[override_key]
         simple_override_key = [closure.path, scope]
         visibility ||= VISIBILITY_OVERRIDE[simple_override_key]
-        visibility ||= :private if closure.path == 'Kernel' && Kernel.private_instance_methods(false).include?(decl.name)
+        if closure.path == 'Kernel' && Kernel.private_method_defined?(decl.name, false)
+          visibility ||= :private
+        end
         if decl.kind == :singleton_instance
           # this is a 'module function'
           visibility ||= :private
@@ -379,7 +509,9 @@ module Solargraph
         # having different type params / orders - we may need to match
         # this data model and have generics live in signatures to
         # handle those correctly
-        generics = decl.overloads.map(&:method_type).flat_map(&:type_params).map(&:name).map(&:to_s).uniq
+        generics = decl.overloads.map(&:method_type).map do |method_type|
+          type_parameter_names method_type
+        end
 
         if decl.instance?
           name = decl.name.to_s
@@ -427,13 +559,15 @@ module Solargraph
       # @param pin [Pin::Method]
       # @return [void]
       def method_def_to_sigs decl, pin
-        # @param overload [RBS::AST::Members::MethodDefinition::Overload]
+        # rubocop:disable Style/SafeNavigationChainLength
+        implicit_nil = decl.overloads.first&.annotations&.map(&:string)&.include?('implicitly-returns-nil') || false
+        # rubocop:enable Style/SafeNavigationChainLength        # @param overload [RBS::AST::Members::MethodDefinition::Overload]
         decl.overloads.map do |overload|
           type_location = location_decl_to_pin_location(overload.method_type.location)
           generics = overload.method_type.type_params.map(&:name).map(&:to_s)
-          signature_parameters, signature_return_type = parts_of_function(overload.method_type, pin)
+          signature_parameters, signature_return_type = parts_of_function(overload.method_type, pin, implicit_nil)
           block = if overload.method_type.block
-                    block_parameters, block_return_type = parts_of_function(overload.method_type.block, pin)
+                    block_parameters, block_return_type = parts_of_function(overload.method_type.block, pin, implicit_nil)
                     Pin::Signature.new(generics: generics, parameters: block_parameters, return_type: block_return_type, source: :rbs,
                                        type_location: type_location, closure: pin)
                   end
@@ -453,85 +587,100 @@ module Solargraph
         Location.new(location.name.to_s, range)
       end
 
-      # @param type [RBS::MethodType,RBS::Types::Block]
+      # @param type [RBS::MethodType, RBS::Types::Block]
       # @param pin [Pin::Method]
+      # @param implicit_nil [Boolean]
       # @return [Array(Array<Pin::Parameter>, ComplexType)]
-      def parts_of_function type, pin
+      def parts_of_function type, pin, implicit_nil
         type_location = pin.type_location
         if defined?(RBS::Types::UntypedFunction) && type.type.is_a?(RBS::Types::UntypedFunction)
           return [
-            [Solargraph::Pin::Parameter.new(decl: :restarg, name: 'arg', closure: pin, source: :rbs, type_location: type_location)],
-            ComplexType.try_parse(method_type_to_tag(type)).force_rooted
+            [Solargraph::Pin::Parameter.new(decl: :restarg, name: 'arg', closure: pin, source: :rbs,
+                                            type_location: type_location)],
+            method_type_to_type(type, implicit_nil)
           ]
         end
 
         parameters = []
         arg_num = -1
         type.type.required_positionals.each do |param|
-          # @sg-ignore RBS generic type understanding issue
+          # @sg-ignore Unresolved call to name
           name = param.name ? param.name.to_s : "arg_#{arg_num += 1}"
-          # @sg-ignore RBS generic type understanding issue
-          parameters.push Solargraph::Pin::Parameter.new(decl: :arg, name: name, closure: pin, return_type: ComplexType.try_parse(other_type_to_tag(param.type)).force_rooted, source: :rbs, type_location: type_location)
+          parameters.push Solargraph::Pin::Parameter.new(decl: :arg, name: name, closure: pin,
+                                                         # @sg-ignore RBS generic type understanding issue
+                                                         return_type: other_type_to_type(param.type),
+                                                         source: :rbs, type_location: type_location)
         end
         type.type.optional_positionals.each do |param|
-          # @sg-ignore RBS generic type understanding issue
+          # @sg-ignore Unresolved call to name
           name = param.name ? param.name.to_s : "arg_#{arg_num += 1}"
           parameters.push Solargraph::Pin::Parameter.new(decl: :optarg, name: name, closure: pin,
                                                          # @sg-ignore RBS generic type understanding issue
-                                                         return_type: ComplexType.try_parse(other_type_to_tag(param.type)).force_rooted,
+                                                         return_type: other_type_to_type(param.type),
                                                          type_location: type_location,
                                                          source: :rbs)
         end
         if type.type.rest_positionals
           name = type.type.rest_positionals.name ? type.type.rest_positionals.name.to_s : "arg_#{arg_num += 1}"
-          inner_rest_positional_type =
-            ComplexType.try_parse(other_type_to_tag(type.type.rest_positionals.type))
+          inner_rest_positional_type = other_type_to_type(type.type.rest_positionals.type)
           rest_positional_type = ComplexType::UniqueType.new('Array',
                                                              [],
                                                              [inner_rest_positional_type],
                                                              rooted: true, parameters_type: :list)
           parameters.push Solargraph::Pin::Parameter.new(decl: :restarg, name: name, closure: pin,
                                                          source: :rbs, type_location: type_location,
-                                                         return_type: rest_positional_type,)
+                                                         return_type: rest_positional_type)
         end
         type.type.trailing_positionals.each do |param|
-          # @sg-ignore RBS generic type understanding issue
+          # @sg-ignore Unresolved call to name
           name = param.name ? param.name.to_s : "arg_#{arg_num += 1}"
-          parameters.push Solargraph::Pin::Parameter.new(decl: :arg, name: name, closure: pin, source: :rbs, type_location: type_location)
+          parameters.push Solargraph::Pin::Parameter.new(decl: :arg, name: name, closure: pin, source: :rbs,
+                                                         type_location: type_location)
         end
         type.type.required_keywords.each do |orig, param|
-          # @sg-ignore RBS generic type understanding issue
+          # @sg-ignore Unresolved call to to_s
           name = orig ? orig.to_s : "arg_#{arg_num += 1}"
           parameters.push Solargraph::Pin::Parameter.new(decl: :kwarg, name: name, closure: pin,
                                                          # @sg-ignore RBS generic type understanding issue
-                                                         return_type: ComplexType.try_parse(other_type_to_tag(param.type)).force_rooted,
+                                                         return_type: other_type_to_type(param.type),
                                                          source: :rbs, type_location: type_location)
         end
         type.type.optional_keywords.each do |orig, param|
-          # @sg-ignore RBS generic type understanding issue
+          # @sg-ignore Unresolved call to to_s
           name = orig ? orig.to_s : "arg_#{arg_num += 1}"
           parameters.push Solargraph::Pin::Parameter.new(decl: :kwoptarg, name: name, closure: pin,
                                                          # @sg-ignore RBS generic type understanding issue
-                                                         return_type: ComplexType.try_parse(other_type_to_tag(param.type)).force_rooted,
+                                                         return_type: other_type_to_type(param.type),
                                                          type_location: type_location,
                                                          source: :rbs)
         end
         if type.type.rest_keywords
           name = type.type.rest_keywords.name ? type.type.rest_keywords.name.to_s : "arg_#{arg_num += 1}"
-          parameters.push Solargraph::Pin::Parameter.new(decl: :kwrestarg, name: type.type.rest_keywords.name.to_s, closure: pin,
+          parameters.push Solargraph::Pin::Parameter.new(decl: :kwrestarg,
+                                                         name: type.type.rest_keywords.name.to_s, closure: pin,
                                                          source: :rbs, type_location: type_location)
         end
 
-        rooted_tag = method_type_to_tag(type)
-        return_type = ComplexType.try_parse(rooted_tag).force_rooted
+        return_type = method_type_to_type(type, implicit_nil)
         [parameters, return_type]
       end
 
+      # @param type [RBS::MethodType,RBS::Types::Block]
+      # @param pin [Pin::Method]
+      # @param implicit_nil [Boolean]
+      # @return [Array(Array<Pin::Parameter>, ComplexType)]
+      def parts_of_function type, pin, implicit_nil
+        [
+          RbsTranslator.to_parameter_pins(type, pin, pin.parameter_names),
+          extract_method_type_return_type(type, implicit_nil).force_rooted
+        ]
+      end
+
       # @param decl [RBS::AST::Members::AttrReader,RBS::AST::Members::AttrAccessor]
       # @param closure [Pin::Namespace]
       # @param context [Context]
       # @return [void]
-      def attr_reader_to_pin(decl, closure, context)
+      def attr_reader_to_pin decl, closure, context
         name = decl.name.to_s
         final_scope = decl.kind == :instance ? :instance : :class
         visibility = calculate_method_visibility(decl, context, closure, final_scope, name)
@@ -545,9 +694,11 @@ module Solargraph
           visibility: visibility,
           source: :rbs
         )
-        rooted_tag = ComplexType.parse(other_type_to_tag(decl.type)).force_rooted.rooted_tags
+        rooted_tag = RbsTranslator.to_complex_type(decl.type).force_rooted.rooted_tags
         pin.docstring.add_tag(YARD::Tags::Tag.new(:return, '', rooted_tag))
-        logger.debug { "Conversions#attr_reader_to_pin(name=#{name.inspect}, visibility=#{visibility.inspect}) => #{pin.inspect}" }
+        logger.debug do
+          "Conversions#attr_reader_to_pin(name=#{name.inspect}, visibility=#{visibility.inspect}) => #{pin.inspect}"
+        end
         pins.push pin
       end
 
@@ -555,9 +706,9 @@ module Solargraph
       # @param closure [Pin::Namespace]
       # @param context [Context]
       # @return [void]
-      def attr_writer_to_pin(decl, closure, context)
+      def attr_writer_to_pin decl, closure, context
         final_scope = decl.kind == :instance ? :instance : :class
-        name = "#{decl.name.to_s}="
+        name = "#{decl.name}="
         visibility = calculate_method_visibility(decl, context, closure, final_scope, name)
         type_location = location_decl_to_pin_location(decl.location)
         pin = Solargraph::Pin::Method.new(
@@ -574,12 +725,12 @@ module Solargraph
         pin.parameters <<
           Solargraph::Pin::Parameter.new(
             name: 'value',
-            return_type: ComplexType.try_parse(other_type_to_tag(decl.type)).force_rooted,
+            return_type: RbsTranslator.to_complex_type(decl.type).force_rooted,
             source: :rbs,
             closure: pin,
             type_location: type_location
           )
-        rooted_tag = ComplexType.parse(other_type_to_tag(decl.type)).force_rooted.rooted_tags
+        rooted_tag = RbsTranslator.to_complex_type(decl.type).force_rooted.rooted_tags
         pin.docstring.add_tag(YARD::Tags::Tag.new(:return, '', rooted_tag))
         pins.push pin
       end
@@ -588,7 +739,7 @@ module Solargraph
       # @param closure [Pin::Namespace]
       # @param context [Context]
       # @return [void]
-      def attr_accessor_to_pin(decl, closure, context)
+      def attr_accessor_to_pin decl, closure, context
         attr_reader_to_pin(decl, closure, context)
         attr_writer_to_pin(decl, closure, context)
       end
@@ -596,7 +747,7 @@ module Solargraph
       # @param decl [RBS::AST::Members::InstanceVariable]
       # @param closure [Pin::Namespace]
       # @return [void]
-      def ivar_to_pin(decl, closure)
+      def ivar_to_pin decl, closure
         pin = Solargraph::Pin::InstanceVariable.new(
           name: decl.name.to_s,
           closure: closure,
@@ -604,7 +755,7 @@ module Solargraph
           comments: decl.comment&.string,
           source: :rbs
         )
-        rooted_tag = ComplexType.parse(other_type_to_tag(decl.type)).force_rooted.rooted_tags
+        rooted_tag = RbsTranslator.to_complex_type(decl.type).force_rooted.rooted_tags
         pin.docstring.add_tag(YARD::Tags::Tag.new(:type, '', rooted_tag))
         pins.push pin
       end
@@ -612,7 +763,7 @@ module Solargraph
       # @param decl [RBS::AST::Members::ClassVariable]
       # @param closure [Pin::Namespace]
       # @return [void]
-      def cvar_to_pin(decl, closure)
+      def cvar_to_pin decl, closure
         name = decl.name.to_s
         pin = Solargraph::Pin::ClassVariable.new(
           name: name,
@@ -621,7 +772,7 @@ module Solargraph
           type_location: location_decl_to_pin_location(decl.location),
           source: :rbs
         )
-        rooted_tag = ComplexType.parse(other_type_to_tag(decl.type)).force_rooted.rooted_tags
+        rooted_tag = RbsTranslator.to_complex_type(decl.type).force_rooted.rooted_tags
         pin.docstring.add_tag(YARD::Tags::Tag.new(:type, '', rooted_tag))
         pins.push pin
       end
@@ -629,7 +780,7 @@ module Solargraph
       # @param decl [RBS::AST::Members::ClassInstanceVariable]
       # @param closure [Pin::Namespace]
       # @return [void]
-      def civar_to_pin(decl, closure)
+      def civar_to_pin decl, closure
         name = decl.name.to_s
         pin = Solargraph::Pin::InstanceVariable.new(
           name: name,
@@ -638,7 +789,7 @@ module Solargraph
           type_location: location_decl_to_pin_location(decl.location),
           source: :rbs
         )
-        rooted_tag = ComplexType.parse(other_type_to_tag(decl.type)).force_rooted.rooted_tags
+        rooted_tag = RbsTranslator.to_complex_type(decl.type).force_rooted.rooted_tags
         pin.docstring.add_tag(YARD::Tags::Tag.new(:type, '', rooted_tag))
         pins.push pin
       end
@@ -662,6 +813,8 @@ module Solargraph
       # @param closure [Pin::Namespace]
       # @return [void]
       def prepend_to_pin decl, closure
+        type = build_type(decl.name, decl.args)
+        generic_values = type.all_params.map(&:rooted_tags)
         pins.push Solargraph::Pin::Reference::Prepend.new(
           name: decl.name.relative!.to_s,
           type_location: location_decl_to_pin_location(decl.location),
@@ -674,6 +827,8 @@ module Solargraph
       # @param closure [Pin::Namespace]
       # @return [void]
       def extend_to_pin decl, closure
+        type = build_type(decl.name, decl.args)
+        generic_values = type.all_params.map(&:rooted_tags)
         pins.push Solargraph::Pin::Reference::Extend.new(
           name: decl.name.relative!.to_s,
           type_location: location_decl_to_pin_location(decl.location),
@@ -693,7 +848,7 @@ module Solargraph
           original: decl.old_name.to_s,
           closure: closure,
           scope: final_scope,
-          source: :rbs,
+          source: :rbs
         )
       end
 
@@ -704,15 +859,18 @@ module Solargraph
         'untyped' => '',
         'NilClass' => 'nil'
       }
+      private_constant :RBS_TO_YARD_TYPE
 
+      # Extract a ComplexType from a MethodType's return type.
+      #
+      # This method will convert type aliases to concrete types.
+      #
       # @param type [RBS::MethodType]
-      # @return [String]
-      def method_type_to_tag type
-        if type_aliases.key?(type.type.return_type.to_s)
-          other_type_to_tag(type_aliases[type.type.return_type.to_s].type)
-        else
-          other_type_to_tag type.type.return_type
-        end
+      # @return [ComplexType]
+      def extract_method_type_return_type type, implicit_nil
+          tag = RbsTranslator.to_complex_type(type.type.return_type)
+          return ComplexType.parse("#{tag}, nil") if tag && implicit_nil
+          tag
       end
 
       # @param type_name [RBS::TypeName]
@@ -720,9 +878,7 @@ module Solargraph
       # @return [ComplexType::UniqueType]
       def build_type(type_name, type_args = [])
         base = RBS_TO_YARD_TYPE[type_name.relative!.to_s] || type_name.relative!.to_s
-        params = type_args.map { |a| other_type_to_tag(a) }.map do |t|
-          ComplexType.try_parse(t).force_rooted
-        end
+        params = type_args.map { |arg| RbsTranslator.to_complex_type(arg).force_rooted }
         if base == 'Hash' && params.length == 2
           ComplexType::UniqueType.new(base, [params.first], [params.last], rooted: true, parameters_type: :hash)
         else
@@ -730,80 +886,11 @@ module Solargraph
         end
       end
 
-      # @param type_name [RBS::TypeName]
-      # @param type_args [Enumerable<RBS::Types::Bases::Base>]
-      # @return [String]
-      def type_tag(type_name, type_args = [])
-        build_type(type_name, type_args).tags
-      end
-
-      # @param type [RBS::Types::Bases::Base]
-      # @return [String]
-      def other_type_to_tag type
-        if type.is_a?(RBS::Types::Optional)
-          "#{other_type_to_tag(type.type)}, nil"
-        elsif type.is_a?(RBS::Types::Bases::Any)
-          'undefined'
-        elsif type.is_a?(RBS::Types::Bases::Bool)
-          'Boolean'
-        elsif type.is_a?(RBS::Types::Tuple)
-          "Array(#{type.types.map { |t| other_type_to_tag(t) }.join(', ')})"
-        elsif type.is_a?(RBS::Types::Literal)
-          type.literal.inspect
-        elsif type.is_a?(RBS::Types::Union)
-          type.types.map { |t| other_type_to_tag(t) }.join(', ')
-        elsif type.is_a?(RBS::Types::Record)
-          # @todo Better record support
-          'Hash'
-        elsif type.is_a?(RBS::Types::Bases::Nil)
-          'nil'
-        elsif type.is_a?(RBS::Types::Bases::Self)
-          'self'
-        elsif type.is_a?(RBS::Types::Bases::Void)
-          'void'
-        elsif type.is_a?(RBS::Types::Variable)
-          "#{Solargraph::ComplexType::GENERIC_TAG_NAME}<#{type.name}>"
-        elsif type.is_a?(RBS::Types::ClassInstance) #&& !type.args.empty?
-          type_tag(type.name, type.args)
-        elsif type.is_a?(RBS::Types::Bases::Instance)
-          'self'
-        elsif type.is_a?(RBS::Types::Bases::Top)
-          # top is the most super superclass
-          'BasicObject'
-        elsif type.is_a?(RBS::Types::Bases::Bottom)
-          # bottom is used in contexts where nothing will ever return
-          # - e.g., it could be the return type of 'exit()' or 'raise'
-          #
-          # @todo define a specific bottom type and use it to
-          #   determine dead code
-          'undefined'
-        elsif type.is_a?(RBS::Types::Intersection)
-          type.types.map { |member| other_type_to_tag(member) }.join(', ')
-        elsif type.is_a?(RBS::Types::Proc)
-          'Proc'
-        elsif type.is_a?(RBS::Types::Alias)
-          # type-level alias use - e.g., 'bool' in "type bool = true | false"
-          # @todo ensure these get resolved after processing all aliases
-          # @todo handle recursive aliases
-          type_tag(type.name, type.args)
-        elsif type.is_a?(RBS::Types::Interface)
-          # represents a mix-in module which can be considered a
-          # subtype of a consumer of it
-          type_tag(type.name, type.args)
-        elsif type.is_a?(RBS::Types::ClassSingleton)
-          # e.g., singleton(String)
-          type_tag(type.name)
-        else
-          Solargraph.logger.warn "Unrecognized RBS type: #{type.class} at #{type.location}"
-          'undefined'
-        end
-      end
-
       # @param decl [RBS::AST::Declarations::Class, RBS::AST::Declarations::Module]
-      # @param namespace [Pin::Namespace]
+      # @param namespace [Pin::Namespace, nil]
       # @return [void]
       def add_mixins decl, namespace
-        # @param mixin [RBS::AST::Members::Include, RBS::AST::Members::Members::Extend, RBS::AST::Members::Members::Prepend]
+        # @param mixin [RBS::AST::Members::Include, RBS::AST::Members::Extend, RBS::AST::Members::Prepend]
         decl.each_mixin do |mixin|
           # @todo are we handling prepend correctly?
           klass = mixin.is_a?(RBS::AST::Members::Include) ? Pin::Reference::Include : Pin::Reference::Extend