revert format code

Author: Chris Yang

shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.h

@@ -25,7 +25,7 @@
 + (instancetype)new NS_UNAVAILABLE;
 - (instancetype)initWithMisspelledRange:(NSRange)range
                             suggestions:(NSArray<NSString*>*)suggestions NS_DESIGNATED_INITIALIZER;
-- (NSString*)toFormattedString;
+- (NSDictionary<NSString*, NSObject*>*)toDictionary;
 
 @end
 

shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.mm

@@ -49,8 +49,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
 // Get all the misspelled words and suggestions in the entire String.
 //
 // The result will be formatted as an NSArray.
-// Each item of the array is a JSON string representing a misspelled word and suggestions.
-// The JSON format looks like:
+// Each item of the array is a dictionary representing a misspelled word and suggestions.
+// The format looks like:
 // {
 //  startIndex: 0,
 //  endIndex: 5,
@@ -83,7 +83,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   NSMutableArray* methodChannelResult = [[[NSMutableArray alloc] init] autorelease];
 
   for (FlutterSpellCheckResult* result in allSpellSuggestions) {
-    [methodChannelResult addObject:[result toFormattedString]];
+    [methodChannelResult addObject:[result toDictionary]];
   }
 
   [allSpellSuggestions release];
@@ -142,18 +142,12 @@ - (instancetype)initWithMisspelledRange:(NSRange)range
   return self;
 }
 
-- (NSString*)toFormattedString {
-  NSDictionary* map = @{
-    @"startIndex" : @(_misspelledRange.location),
-    @"endIndex" : @(_misspelledRange.location + _misspelledRange.length - 1),
-    @"suggestions" : _suggestions,
-  };
-
-  NSData* jsonData = [NSJSONSerialization dataWithJSONObject:map options:kNilOptions error:nil];
-  FML_DCHECK(jsonData != nil);
-  NSString* jsonString = [[[NSString alloc] initWithData:jsonData
-                                                encoding:NSUTF8StringEncoding] autorelease];
-  return jsonString;
+- (NSDictionary<NSString*, NSObject*>*)toDictionary {
+  NSMutableDictionary* result = [[[NSMutableDictionary alloc] initWithCapacity:3] autorelease];
+  result[@"startIndex"] = @(_misspelledRange.location);
+  result[@"endIndex"] = @(_misspelledRange.location + _misspelledRange.length - 1);
+  result[@"suggestions"] = _suggestions;
+  return result;
 }
 
 - (void)dealloc {

shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPluginTest.mm

@@ -159,11 +159,11 @@ - (void)testFindAllSpellCheckSuggestionsForText {
                                   capturedResult = result;
                                 }];
   XCTAssertTrue(capturedResult.count == 2);
-  NSDictionary* suggestionsJSON1 = [self decodeJson:capturedResult.firstObject];
+  NSDictionary* suggestionsJSON1 = capturedResult.firstObject;
   XCTAssertEqualObjects(suggestionsJSON1[@"startIndex"], @0);
   XCTAssertEqualObjects(suggestionsJSON1[@"endIndex"], @4);
   XCTAssertEqualObjects(suggestionsJSON1[@"suggestions"], suggestions1);
-  NSDictionary* suggestionsJSON2 = [self decodeJson:capturedResult[1]];
+  NSDictionary* suggestionsJSON2 = capturedResult[1];
   XCTAssertEqualObjects(suggestionsJSON2[@"startIndex"], @5);
   XCTAssertEqualObjects(suggestionsJSON2[@"endIndex"], @9);
   XCTAssertEqualObjects(suggestionsJSON2[@"suggestions"], suggestions2);
@@ -196,11 +196,11 @@ - (void)testStopFindingMoreWhenTheLastWordIsMisspelled {
                                   capturedResult = result;
                                 }];
   XCTAssertTrue(capturedResult.count == 2);
-  NSDictionary* suggestionsJSON1 = [self decodeJson:capturedResult.firstObject];
+  NSDictionary* suggestionsJSON1 = capturedResult.firstObject;
   XCTAssertEqualObjects(suggestionsJSON1[@"startIndex"], @0);
   XCTAssertEqualObjects(suggestionsJSON1[@"endIndex"], @4);
   XCTAssertEqualObjects(suggestionsJSON1[@"suggestions"], suggestions1);
-  NSDictionary* suggestionsJSON2 = [self decodeJson:capturedResult[1]];
+  NSDictionary* suggestionsJSON2 = capturedResult[1];
   XCTAssertEqualObjects(suggestionsJSON2[@"startIndex"], @6);
   XCTAssertEqualObjects(suggestionsJSON2[@"endIndex"], @9);
   XCTAssertEqualObjects(suggestionsJSON2[@"suggestions"], suggestions2);
@@ -226,7 +226,7 @@ - (void)testStopFindingMoreWhenTheWholeStringIsAMisspelledWord {
                                   capturedResult = result;
                                 }];
   XCTAssertTrue(capturedResult.count == 1);
-  NSDictionary* suggestionsJSON1 = [self decodeJson:capturedResult.firstObject];
+  NSDictionary* suggestionsJSON1 = capturedResult.firstObject;
   XCTAssertEqualObjects(suggestionsJSON1[@"startIndex"], @0);
   XCTAssertEqualObjects(suggestionsJSON1[@"endIndex"], @4);
   XCTAssertEqualObjects(suggestionsJSON1[@"suggestions"], suggestions1);
@@ -338,12 +338,4 @@ - (void)mockUITextCheckerWithExpectedMisspelledWordRange:(NSRange)expectedRange
                       withStartingIndex:startingIndex];
 }
 
-- (NSDictionary*)decodeJson:(NSString*)jsonString {
-  NSData* data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-  NSDictionary* dictionary = [NSJSONSerialization JSONObjectWithData:data
-                                                             options:kNilOptions
-                                                               error:nil];
-  return dictionary;
-}
-
 @end