Minor fix

Couchbase-Ecosystem · Jul 18, 2024 · 900ed48 · 900ed48
1 parent 9a39b63
commit 900ed48
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/commands/fts/SearchWorkbench/contributor/autoCompleteVisitor.ts b/src/commands/fts/SearchWorkbench/contributor/autoCompleteVisitor.ts
@@ -14,6 +14,7 @@ import { ctlCbsContributor } from "./ctlCbsContributor";
 import { shapeCbsContributor } from "./shapeCbsContributor";
 import { SearchWorkbench } from "../searchWorkbench";
 import { logger } from "../../../../logger/logger";
+import { CacheService } from "../../../../util/cacheService/cacheService";
 
 export class AutocompleteVisitor {
     public topLevelKeywords: string[] = [
@@ -51,6 +52,7 @@ export class AutocompleteVisitor {
         document: vscode.TextDocument,
         position: vscode.Position,
         searchWorkBench?: SearchWorkbench,
+        cache?:CacheService
     ): Promise<vscode.CompletionItem[]> {
         const text = document.getText();
         // const rootNode = jsonc.parseTree(text);
@@ -125,11 +127,13 @@ export class AutocompleteVisitor {
                         if (
                             attributeName == "field" &&
                             queryContext?.bucketName &&
-                            queryContext?.indexName
+                            queryContext?.indexName &&
+                            cache
                         ) {
                             fields = await fieldsContributor.getFieldNames(
                                 queryContext?.bucketName,
                                 queryContext?.indexName,
+                                cache
                             );
                         }
                         contributor.contributeValue(

diff --git a/src/commands/fts/SearchWorkbench/contributor/fieldsContributor.ts b/src/commands/fts/SearchWorkbench/contributor/fieldsContributor.ts
@@ -11,16 +11,15 @@ export class fieldsContributor {
     static async getFieldNames(
         bucketName: string,
         indexName: string,
+        cache: CacheService
     ): Promise<string[]> {
-        const cache = new CacheService();
         const suggestions: string[] = [];
         const connection = getActiveConnection();
         if (!connection) {
             return [];
         }
         const api = new CouchbaseRestAPI(connection);
 
-        cache.loadCache(connection);
         const bucketCache = cache.getCache(bucketName);
         const result = await api.fetchSearchIndexDefinition(indexName);
         if (!bucketCache) {

diff --git a/src/extension.ts b/src/extension.ts
@@ -128,7 +128,7 @@ const provider = vscode.languages.registerCompletionItemProvider(
   {
       async provideCompletionItems(document, position, token, context) {
           const autoComplete = new AutocompleteVisitor();
-          const suggestions = await autoComplete.getAutoCompleteContributor(document, position, currentSearchWorkbench);
+          const suggestions = await autoComplete.getAutoCompleteContributor(document, position, currentSearchWorkbench, cacheService);
           if (suggestions.length === 0) {
             return [new vscode.CompletionItem('', vscode.CompletionItemKind.Text)].map(item => {
                 item.sortText = '\u0000';