Fix text before cursor cache filter logic

arshad-yaseen · Jul 21, 2024 · 173a7f4 · 173a7f4
1 parent dabe93f
commit 173a7f4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 25 deletions.
diff --git a/src/copilot/handler.ts b/src/copilot/handler.ts
@@ -14,7 +14,7 @@ import {
   getCompletionCache,
 } from '../utils/completion';
 
-const DEBOUNCE_DELAY = 200;
+const DEBOUNCE_DELAY = 250;
 
 const debouncedFetchCompletionItem = debounce(
   fetchCompletionItem,
@@ -83,7 +83,6 @@ const handleInlineCompletions = async ({
       text,
       model,
       position,
-      token,
     });
 
     if (completion) {

diff --git a/src/helpers/completion.ts b/src/helpers/completion.ts
@@ -25,15 +25,7 @@ export const fetchCompletionItem = async ({
   externalContext,
   model,
   position,
-  token,
 }: FetchCompletionItemParams): Promise<string | null> => {
-  const controller = new AbortController();
-
-  if (token.isCancellationRequested) {
-    controller.abort();
-    return null;
-  }
-
   try {
     const {completion} = await HTTP.POST<CompletionResponse, CompletionRequest>(
       endpoint,
@@ -50,7 +42,6 @@ export const fetchCompletionItem = async ({
       {
         headers: {'Content-Type': CONTENT_TYPE_JSON},
         error: 'Error while fetching completion item',
-        signal: controller.signal,
       },
     );
 

diff --git a/src/types/completion.ts b/src/types/completion.ts
@@ -4,12 +4,7 @@ import type {
 } from 'groq-sdk/resources/chat/completions';
 
 import {Endpoint, ExternalContext, Filename, Technologies} from './copilot';
-import {
-  EditorCancellationToken,
-  EditorModel,
-  EditorPosition,
-  EditorRange,
-} from './editor';
+import {EditorModel, EditorPosition, EditorRange} from './editor';
 
 export type CompletionModel = 'llama';
 
@@ -53,7 +48,6 @@ export interface FetchCompletionItemParams {
   externalContext?: ExternalContext;
   model: EditorModel;
   position: EditorPosition;
-  token: EditorCancellationToken;
 }
 
 export type CompletionCache = {

diff --git a/src/utils/completion/cache.ts b/src/utils/completion/cache.ts
@@ -25,14 +25,18 @@ export const getCompletionCache = (
     );
 
     return (
-      (currentTextBeforeCursorInLine === cache.textBeforeCursorInLine &&
-        cache.range.startLineNumber === position.lineNumber &&
+      // Check if the current text before cursor in line starts with the cached text before cursor
+      currentTextBeforeCursorInLine.startsWith(cache.textBeforeCursorInLine) &&
+      // Ensure crsor is at the start of the cached range
+      ((cache.range.startLineNumber === position.lineNumber &&
         position.column === cache.range.startColumn) ||
-      (cache.completion.startsWith(currentValueInRange) &&
-        cache.range.startLineNumber === position.lineNumber &&
-        position.column >=
-          cache.range.startColumn - currentValueInRange.length &&
-        position.column <= cache.range.endColumn)
+        // Ensure cached completion starts with the current value in cached range
+        (cache.completion.startsWith(currentValueInRange) &&
+          // Ensure the cursor is within the cached range
+          cache.range.startLineNumber === position.lineNumber &&
+          position.column >=
+            cache.range.startColumn - currentValueInRange.length &&
+          position.column <= cache.range.endColumn))
     );
   });