Support for Inline RBS

lib/solargraph.rb

@@ -49,6 +49,7 @@ class InvalidRubocopVersionError < RuntimeError;  end
   autoload :RbsMap,           'solargraph/rbs_map'
   autoload :GemPins,          'solargraph/gem_pins'
   autoload :PinCache,         'solargraph/pin_cache'
+  autoload :RbsTranslator,    'solargraph/rbs_translator'
 
   dir = File.dirname(__FILE__)
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')

lib/solargraph/parser/parser_gem/node_processors/namespace_node.rb

@@ -8,22 +8,26 @@
           include ParserGem::NodeMethods
 
           def process
-            superclass_name = nil
-            superclass_name = unpack_name(node.children[1]) if node.type == :class && node.children[1]&.type == :const
+            name = unpack_name(node.children[0])
+            comments = comments_for(node)
+            superclass_name = if node.type == :class
+              "#{type_from_node}#{parameters_from_inline_rbs}"
+            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),
+              name: name,
+              comments: comments,
               visibility: :public,
               gates: region.closure.gates.freeze,
               source: :parser
             )
             pins.push nspin
-            unless superclass_name.nil?
+            Solargraph.logger.warn "Superclass: #{superclass_name}" if superclass_name&.start_with?('Array')
+            if superclass_name
               pins.push Pin::Reference::Superclass.new(
                 location: loc,
                 closure: pins.last,
@@ -33,6 +37,25 @@
             end
             process_children region.update(closure: nspin, visibility: :public)
           end
+
+          private
+
+          # @param comments [String]
+          # @return [String, nil]
+          def parameters_from_inline_rbs
+            source = region.source.code_for(node)
+            match = source.match(/[^\n]*?#\s?+\[([^\]]*)/)
+            return unless match && match[1]
+
+            code = match[1].strip
+            return if code.empty?
+
+            "<#{code}>"
+          end
+
+          def type_from_node
+            unpack_name(node.children[1]) if node.children[1]&.type == :const
+          end
         end
       end
     end

lib/solargraph/pin/method.rb

@@ -143,7 +143,7 @@ def symbol_kind
       end
 
       def return_type
-        @return_type ||= ComplexType.new(signatures.map(&:return_type).flat_map(&:items))
+        @return_type ||= return_type_from_inline_rbs || ComplexType.new(signatures.map(&:return_type).flat_map(&:items))
       end
 
       # @param parameters [::Array<Parameter>]
@@ -188,18 +188,11 @@ def generate_signature parameters, return_type
 
       # @return [::Array<Signature>]
       def signatures
-        @signatures ||= begin
-          top_type = generate_complex_type
-          result = []
-          result.push generate_signature(parameters, top_type) if top_type.defined?
-          unless overloads.empty?
-            result.concat(overloads.map do |meth|
-              generate_signature(meth.parameters, meth.return_type)
-            end)
-          end
-          result.push generate_signature(parameters, @return_type || ComplexType::UNDEFINED) if result.empty?
-          result
-        end
+        @signatures ||= if inline_rbs.empty?
+                          signatures_from_yard
+                        else
+                          signatures_from_inline_rbs
+                        end
       end
 
       # @param return_type [ComplexType]
@@ -451,7 +444,6 @@ def rest_of_stack api_map
 
       attr_writer :block, :signature_help, :documentation, :return_type
 
-      # @sg-ignore Need to add nil check here
       def dodgy_visibility_source?
         # as of 2025-03-12, the RBS generator used for
         # e.g. activesupport did not understand 'private' markings
@@ -721,6 +713,41 @@ def concat_example_tags
         .join("\n")
         .concat("```\n")
       end
+
+      # @return [ComplexType, nil]
+      def return_type_from_inline_rbs
+        return nil if inline_rbs.empty?
+        method_type = RBS::Parser.parse_method_type(inline_rbs)
+        RbsTranslator.to_complex_type(method_type.type.return_type)
+      rescue RBS::ParsingError
+        nil
+      end
+
+      # @return [Array<Pin::Signature>]
+      def signatures_from_inline_rbs
+        method_type = RBS::Parser.parse_method_type(inline_rbs)
+        [RbsTranslator.to_signature(method_type, self, parameter_names)]
+      rescue RBS::ParsingError
+        signatures_from_yard
+      end
+
+      # @return [Array<Pin::Signature>]
+      def signatures_from_yard
+        top_type = generate_complex_type
+        result = []
+        result.push generate_signature(parameters, top_type) if top_type.defined?
+        result.concat(overloads.map { |meth| generate_signature(meth.parameters, meth.return_type) }) unless overloads.empty?
+        result.push generate_signature(parameters, @return_type || ComplexType::UNDEFINED) if result.empty?
+        result
+      end
+
+      # @return [String]
+      def inline_rbs
+        comments.lines
+                .select { |line| line.start_with?(': ') }
+                .map { |line| line[2..].strip }
+                .join("\n")
+      end
     end
   end
 end