Allow Cxx references to be used in native module's method signature

Reviewed By: javache Differential Revision: D5772182 fbshipit-source-id: 21e2f7b8d14ffdcfc0ba969c9a35315863a19b71
facebook · Sep 7, 2017 · bd72374 · bd72374
1 parent 1f2ca24
commit bd72374
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m b/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
@@ -90,11 +90,12 @@ - (void)testUntypedUnnamedArgs
 - (void)testNamespacedCxxStruct
 {
   NSArray *arguments;
-  const char *methodSignature = "foo:(foo::type &)foo";
+  const char *methodSignature = "foo:(foo::type &)foo bar:(bar::type &)bar";
   SEL selector = RCTParseMethodSignature(methodSignature, &arguments);
-  XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:");
-  XCTAssertEqual(arguments.count, (NSUInteger)1);
+  XCTAssertEqualObjects(NSStringFromSelector(selector), @"foo:bar:");
+  XCTAssertEqual(arguments.count, (NSUInteger)2);
   XCTAssertEqualObjects(((RCTMethodArgument *)arguments[0]).type, @"foo::type");
+  XCTAssertEqualObjects(((RCTMethodArgument *)arguments[1]).type, @"bar::type");
 }
 
 - (void)testAttributes

diff --git a/React/Base/RCTParserUtils.m b/React/Base/RCTParserUtils.m
@@ -136,7 +136,9 @@ static BOOL RCTIsCollectionType(NSString *type)
     RCTReadChar(input, '>');
   }
   RCTSkipWhitespace(input);
-  RCTReadChar(input, '*');
+  if (!RCTReadChar(input, '*')) {
+    RCTReadChar(input, '&');
+  }
   return type;
 }