Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Japanese Clear Text Crash #6989

Merged
justinmc merged 2 commits into from
Dec 12, 2018
Merged

Japanese Clear Text Crash #6989

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb36f1a
Update marked text before selection so textInRange is never called with
justinmc Nov 28, 2018
b6d9380
Merge branch 'master' into japanese-text-crash
justinmc Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ - (void)setTextInputState:(NSDictionary*)state {
[self.text setString:newText];
}

NSInteger composingBase = [state[@"composingBase"] intValue];
NSInteger composingExtent = [state[@"composingExtent"] intValue];
NSRange composingRange = [self clampSelection:NSMakeRange(MIN(composingBase, composingExtent),
ABS(composingBase - composingExtent))
forText:self.text];
self.markedTextRange =
composingRange.length > 0 ? [FlutterTextRange rangeWithNSRange:composingRange] : nil;

NSInteger selectionBase = [state[@"selectionBase"] intValue];
NSInteger selectionExtent = [state[@"selectionExtent"] intValue];
NSRange selectedRange = [self clampSelection:NSMakeRange(MIN(selectionBase, selectionExtent),
Expand All @@ -233,14 +241,6 @@ - (void)setTextInputState:(NSDictionary*)state {
[self.inputDelegate selectionDidChange:self];
}

NSInteger composingBase = [state[@"composingBase"] intValue];
NSInteger composingExtent = [state[@"composingExtent"] intValue];
NSRange composingRange = [self clampSelection:NSMakeRange(MIN(composingBase, composingExtent),
ABS(composingBase - composingExtent))
forText:self.text];
self.markedTextRange =
composingRange.length > 0 ? [FlutterTextRange rangeWithNSRange:composingRange] : nil;

if (textChanged) {
[self.inputDelegate textDidChange:self];

Expand Down