WIP Trying to fix tests

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

@@ -784,27 +784,47 @@ - (void)updateEditingState {
     @"composingExtent" : @(composingExtent),
     @"text" : [NSString stringWithString:self.text],
   };
-  _latestState = state;
 
   // Debounce calls to updateEditingClient. This makes iOS text editing behave
   // more similarly to Android's, which has built-in event batching, and avoids
   // race conditions. The delay value was chosen to be imperceptible by the user
   // but still long enough to allow the framework to respond with formatting
   // updates, thereby avoiding common race conditions.
+  if (_latestState == nil) {
+    _latestState = state;
+    NSLog(@"justin leading edge updateEditingClient for %@", _latestState[@"text"]);
+    [self updateEditingClient];
+    NSLog(@"justin 1");
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 10000000), dispatch_get_main_queue(), ^(void){
+      NSLog(@"justin 2");
+      if (_latestState == state) {
+        NSLog(@"justin updateEditingClient clear leading edge for %@", _latestState[@"text"]);
+        _latestState = nil;
+      }
+    });
+    NSLog(@"justin 3");
+    return;
+  }
+  _latestState = state;
+  NSLog(@"justin updateEditingClient start trailing edge timer for _latestState for %@", _latestState[@"text"]);
   dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 10000000), dispatch_get_main_queue(), ^(void){
     if (state != _latestState) {
       return;
     }
+    NSLog(@"justin trailing edge updateEditingClient for %@", _latestState[@"text"]);
+    [self updateEditingClient];
     _latestState = nil;
-
-    if (_textInputClient == 0 && _autofillId != nil) {
-      [_textInputDelegate updateEditingClient:_textInputClient withState:state withTag:_autofillId];
-    } else {
-      [_textInputDelegate updateEditingClient:_textInputClient withState:state];
-    }
   });
 }
 
+- (void)updateEditingClient {
+  if (_textInputClient == 0 && _autofillId != nil) {
+    [_textInputDelegate updateEditingClient:_textInputClient withState:_latestState withTag:_autofillId];
+  } else {
+    [_textInputDelegate updateEditingClient:_textInputClient withState:_latestState];
+  }
+}
+
 - (BOOL)hasText {
   return self.text.length > 0;
 }
@@ -1036,6 +1056,7 @@ + (void)setupInputView:(FlutterTextInputView*)inputView
 
 - (void)setTextInputEditingState:(NSDictionary*)state {
   if ([_activeView setTextInputState:state]) {
+    NSLog(@"justin setTextInputEditingState for %@", state[@"text"]);
     [_activeView updateEditingState];
   }
 }

shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m

@@ -245,36 +245,62 @@ - (void)testTextRangeFromPositionMatchesUITextViewBehavior {
 }
 
 - (void)testUITextInputCallsUpdateEditingStateOnce {
+  NSLog(@"justin start testUITextInputCallsUpdateEditingStateOnce");
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] init];
   inputView.textInputDelegate = engine;
 
+  XCTestExpectation* expectation = [self expectationWithDescription:@"called updateEditingClient"];
+  XCTestExpectation* expectation3 = [self expectationWithDescription:@"called four times"];
+  NSString* text;
+  __block bool calledSinceChange = false;
   __block int updateCount = 0;
   OCMStub([engine updateEditingClient:0 withState:[OCMArg isNotNil]])
       .andDo(^(NSInvocation* invocation) {
+        XCTAssertEqual(calledSinceChange, false);
+        calledSinceChange = true;
         updateCount++;
+        if (updateCount == 1) {
+          [expectation fulfill];
+        } else if (updateCount == 3) {
+          [expectation3 fulfill];
+        }
       });
 
+  text = @"text to insert";
+  NSLog(@"justin testUITextInputCallsUpdateEditingStateOnce insertText 1");
   [inputView insertText:@"text to insert"];
+  NSLog(@"justin testUITextInputCallsUpdateEditingStateOnce insertedText 1");
   // Update the framework exactly once.
   XCTAssertEqual(updateCount, 1);
+  calledSinceChange = false;
 
+  expectation = [self expectationWithDescription:@"called updateEditingClient"];
+  text = @"text to inser";
   [inputView deleteBackward];
+  XCTAssertEqual(updateCount, 1);
+  [self waitForExpectations:@[expectation] timeout:1];
   XCTAssertEqual(updateCount, 2);
 
   inputView.selectedTextRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)];
   XCTAssertEqual(updateCount, 3);
 
   [inputView replaceRange:[FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)]
                  withText:@"replace text"];
+  XCTAssertEqual(updateCount, 3);
+  [self waitForExpectations:@[expectation3] timeout:1];
   XCTAssertEqual(updateCount, 4);
 
+  /*
   [inputView setMarkedText:@"marked text" selectedRange:NSMakeRange(0, 1)];
+  [self waitForExpectations:@[expectation4] timeout:1];
   XCTAssertEqual(updateCount, 5);
 
   [inputView unmarkText];
   XCTAssertEqual(updateCount, 6);
+  */
 }
 
+/*
 - (void)testBackToBackUITextInputCallsUpdateEditingStateOnce {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] init];
   inputView.textInputDelegate = engine;
@@ -306,4 +332,5 @@ - (void)testBackToBackUITextInputCallsUpdateEditingStateOnce {
   [inputView unmarkText];
   XCTAssertEqual(updateCount, 6);
 }
+*/
 @end