fix: [completion] Fixed an issue where the cursor position was abnorm…

…al when completion was canceled as title Log: fix issue
linuxdeepin · Oct 23, 2024 · 2dc4a09 · 2dc4a09
1 parent 7d84faa
commit 2dc4a09
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/plugins/binarytools/configure/default_binarytools.json b/src/plugins/binarytools/configure/default_binarytools.json
@@ -175,7 +175,7 @@
                         "channelData": "%{CurrentDocument:Content}",
                         "triggerEvent" : 0
                     }
-                }
+		}
             ]
         }
     ],
@@ -192,6 +192,6 @@
                 "hunspell",
                 "clang-format"
             ]
-        }
+	}
     ]
 }
diff --git a/src/plugins/codeeditor/gui/private/texteditor_p.cpp b/src/plugins/codeeditor/gui/private/texteditor_p.cpp
@@ -641,10 +641,19 @@ void TextEditorPrivate::cancelInlineCompletion()
     if (inlineCompletionCache.first == -1)
         return;
 
-    q->clearEOLAnnotations(inlineCompletionCache.first);
-    q->clearAnnotations(inlineCompletionCache.first);
+    auto cancelFunc = [this] {
+        if (leftButtonPressed)
+            return cancelInlineCompletion();
 
-    inlineCompletionCache = qMakePair(-1, QString());
+        q->clearEOLAnnotations(inlineCompletionCache.first);
+        q->clearAnnotations(inlineCompletionCache.first);
+        inlineCompletionCache = qMakePair(-1, QString());
+    };
+
+    if (leftButtonPressed)
+        QTimer::singleShot(50, this, cancelFunc);
+    else
+        cancelFunc();
 }
 
 void TextEditorPrivate::updateInlineCompletion()

diff --git a/src/plugins/codegeex/codegeex/codegeexcompletionprovider.cpp b/src/plugins/codegeex/codegeex/codegeexcompletionprovider.cpp
@@ -21,6 +21,11 @@ QString CodeGeeXCompletionProvider::providerName() const
 
 void CodeGeeXCompletionProvider::provideInlineCompletionItems(const Position &pos, const InlineCompletionContext &c)
 {
+    for (const auto &item : qAsConst(completionItems)) {
+        if (c.prefix.endsWith(item.completion))
+            return;
+    }
+
     positon = pos;
     context = c;
     connect(&timer, &QTimer::timeout, Copilot::instance(), &Copilot::generateCode, Qt::UniqueConnection);