Support multi class/module declarations in inline RBS

Author: soutaro

lib/rbs/environment.rb

@@ -378,11 +378,10 @@ def insert_ruby_decl(decl, context:, namespace:)
           if entry.is_a?(ModuleEntry)
             raise DuplicatedDeclarationError.new(name, decl, *entry.each_decl.to_a)
           end
+        else
+          entry = class_decls[name] = ClassEntry.new(name)
         end
 
-        entry = ClassEntry.new(name)
-        class_decls[name] = entry
-
         entry << [context, decl]
 
         inner_context = [context, name] #: Resolver::context
@@ -400,11 +399,10 @@ def insert_ruby_decl(decl, context:, namespace:)
           if entry.is_a?(ClassEntry)
             raise DuplicatedDeclarationError.new(name, decl, *entry.each_decl.to_a)
           end
+        else
+          entry = class_decls[name] = ModuleEntry.new(name)
         end
 
-        entry = ModuleEntry.new(name)
-        class_decls[name] = entry
-
         entry << [context, decl]
 
         inner_context = [context, name] #: Resolver::context

test/rbs/environment_test.rb

@@ -719,4 +719,31 @@ class C
       end
     end
   end
+
+  def test__ruby__multiple_decls
+    result = parse_inline(<<~RUBY)
+      class Hello
+      end
+
+      class Hello
+      end
+
+      module World
+      end
+
+      module World
+      end
+    RUBY
+
+    env = Environment.new
+    env.add_source(RBS::Source::Ruby.new(result.buffer, result.prism_result, result.declarations, result.diagnostics))
+
+    env.resolve_type_names.tap do |env|
+      class_decl = env.class_decls[RBS::TypeName.parse("::Hello")]
+      assert_equal 2, class_decl.context_decls.size
+
+      module_decl = env.class_decls[RBS::TypeName.parse("::World")]
+      assert_equal 2, module_decl.context_decls.size
+    end
+  end
 end