[WIP] predict next words, step2

dongyuwei · May 2, 2024 · d97997f · d97997f
1 parent 75a9edd
commit d97997f
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/InputController.mm b/src/InputController.mm
@@ -85,7 +85,10 @@ - (BOOL)onKeyEvent:(NSEvent *)event client:(id)sender {
     NSString *characters = event.characters;
 
     NSString *bufferedText = [self originalBuffer];
+    NSString *bufferedSentence = [self sentenceBuffer];
     bool hasBufferedText = bufferedText && bufferedText.length > 0;
+    bool hasSentence = bufferedSentence && bufferedSentence.length > 0;
+
 
     if (keyCode == KEY_DELETE) {
         if (hasBufferedText) {
@@ -96,15 +99,15 @@ - (BOOL)onKeyEvent:(NSEvent *)event client:(id)sender {
     }
 
     if (keyCode == KEY_SPACE) {
-        if (hasBufferedText) {
+        if (hasBufferedText || hasSentence) {
             [self commitComposition:sender];
             return YES;
         }
         return NO;
     }
 
     if (keyCode == KEY_RETURN) {
-        if (hasBufferedText) {
+        if (hasBufferedText || hasSentence) {
             [self commitCompositionWithoutSpace:sender];
             return YES;
         }
@@ -144,7 +147,7 @@ - (BOOL)onKeyEvent:(NSEvent *)event client:(id)sender {
         }
 
         if ([[NSCharacterSet decimalDigitCharacterSet] characterIsMember:ch]) {
-            if (!hasBufferedText) {
+            if (!(hasBufferedText || hasSentence)) {
                 [self appendToComposedBuffer:characters];
                 [self commitCompositionWithoutSpace:sender];
                 return YES;
@@ -170,7 +173,7 @@ - (BOOL)onKeyEvent:(NSEvent *)event client:(id)sender {
     }
 
     if ([[NSCharacterSet punctuationCharacterSet] characterIsMember:ch] || [[NSCharacterSet symbolCharacterSet] characterIsMember:ch]) {
-        if (hasBufferedText) {
+        if (hasBufferedText || hasSentence) {
             [self appendToComposedBuffer:characters];
             [self commitCompositionWithoutSpace:sender];
             [self setSentenceBuffer: @""];
@@ -188,11 +191,14 @@ - (BOOL)isMojaveAndLaterSystem {
 
 - (BOOL)deleteBackward:(id)sender {
     NSMutableString *originalText = [self originalBuffer];
+    NSMutableString *sensence = [self sentenceBuffer];
 
     if (_insertionIndex > 0) {
         --_insertionIndex;
 
         NSString *convertedString = [originalText substringToIndex:originalText.length - 1];
+        NSString *convertedSentence = [sensence substringToIndex:sensence.length - 1];
+        [self setSentenceBuffer: convertedSentence];
 
         [self setComposedBuffer:convertedString];
         [self setOriginalBuffer:convertedString];
@@ -449,6 +455,7 @@ - (void)activateServer:(id)sender {
 }
 
 - (void)deactivateServer:(id)sender {
+    [self setSentenceBuffer:@""];
     [self reset];
 }