Resolve conflict

Author: ksss

src/parser.c

@@ -3789,7 +3789,7 @@ static bool parse_inline_leading_annotation(rbs_parser_t *parser, rbs_ast_ruby_a
             rbs_location_t *colon_loc = rbs_location_new(ALLOCATOR(), colon_range);
 
             rbs_node_t *type = NULL;
-            if (!rbs_parse_type(parser, &type, false)) {
+            if (!rbs_parse_type(parser, &type, false, false)) {
                 return false;
             }
 

test/rbs/inline_annotation_parsing_test.rb

@@ -204,5 +204,13 @@ def test_error__instance_variable
     assert_raises RBS::ParsingError do
       Parser.parse_inline_leading_annotation("@rbs name: String", 0...)
     end
+
+    assert_raises RBS::ParsingError do
+      Parser.parse_inline_leading_annotation("@rbs @name: void", 0...)
+    end
+
+    assert_raises RBS::ParsingError do
+      Parser.parse_inline_leading_annotation("@rbs @name: self", 0...)
+    end
   end
 end