[ES|QL] Make sure that the commands are not overwritten (#204711)

(cherry picked from commit 76e22f7)
elastic · Dec 19, 2024 · 6d17e8d · 6d17e8d
1 parent 7dcfba5
commit 6d17e8d
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 29 deletions.
diff --git a/...latform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts b/...latform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
@@ -612,22 +612,30 @@ async function getExpressionSuggestionsByType(
           (fragment) => Boolean(getColumnByName(fragment, references)),
           (_fragment: string, rangeToReplace?: { start: number; end: number }) => {
             // COMMAND fie<suggest>
-            return fieldSuggestions.map((suggestion) => ({
-              ...suggestion,
-              text: suggestion.text + (['grok', 'dissect'].includes(command.name) ? ' ' : ''),
-              command: TRIGGER_SUGGESTION_COMMAND,
-              rangeToReplace,
-            }));
+            return fieldSuggestions.map((suggestion) => {
+              // if there is already a command, we don't want to override it
+              if (suggestion.command) return suggestion;
+              return {
+                ...suggestion,
+                text: suggestion.text + (['grok', 'dissect'].includes(command.name) ? ' ' : ''),
+                command: TRIGGER_SUGGESTION_COMMAND,
+                rangeToReplace,
+              };
+            });
           },
           (fragment: string, rangeToReplace: { start: number; end: number }) => {
             // COMMAND field<suggest>
             if (['grok', 'dissect'].includes(command.name)) {
-              return fieldSuggestions.map((suggestion) => ({
-                ...suggestion,
-                text: suggestion.text + ' ',
-                command: TRIGGER_SUGGESTION_COMMAND,
-                rangeToReplace,
-              }));
+              return fieldSuggestions.map((suggestion) => {
+                // if there is already a command, we don't want to override it
+                if (suggestion.command) return suggestion;
+                return {
+                  ...suggestion,
+                  text: suggestion.text + ' ',
+                  command: TRIGGER_SUGGESTION_COMMAND,
+                  rangeToReplace,
+                };
+              });
             }
 
             const finalSuggestions = [{ ...pipeCompleteItem, text: ' | ' }];

diff --git a/.../packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/commands/drop/index.ts b/.../packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/commands/drop/index.ts
@@ -41,12 +41,16 @@ export async function suggest(
     (fragment) => columnExists(fragment),
     (_fragment: string, rangeToReplace?: { start: number; end: number }) => {
       // KEEP fie<suggest>
-      return fieldSuggestions.map((suggestion) => ({
-        ...suggestion,
-        text: suggestion.text,
-        command: TRIGGER_SUGGESTION_COMMAND,
-        rangeToReplace,
-      }));
+      return fieldSuggestions.map((suggestion) => {
+        // if there is already a command, we don't want to override it
+        if (suggestion.command) return suggestion;
+        return {
+          ...suggestion,
+          text: suggestion.text,
+          command: TRIGGER_SUGGESTION_COMMAND,
+          rangeToReplace,
+        };
+      });
     },
     (fragment: string, rangeToReplace: { start: number; end: number }) => {
       // KEEP field<suggest>

diff --git a/.../packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/commands/keep/index.ts b/.../packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/commands/keep/index.ts
@@ -41,12 +41,16 @@ export async function suggest(
     (fragment) => columnExists(fragment),
     (_fragment: string, rangeToReplace?: { start: number; end: number }) => {
       // KEEP fie<suggest>
-      return fieldSuggestions.map((suggestion) => ({
-        ...suggestion,
-        text: suggestion.text,
-        command: TRIGGER_SUGGESTION_COMMAND,
-        rangeToReplace,
-      }));
+      return fieldSuggestions.map((suggestion) => {
+        // if there is already a command, we don't want to override it
+        if (suggestion.command) return suggestion;
+        return {
+          ...suggestion,
+          text: suggestion.text,
+          command: TRIGGER_SUGGESTION_COMMAND,
+          rangeToReplace,
+        };
+      });
     },
     (fragment: string, rangeToReplace: { start: number; end: number }) => {
       // KEEP field<suggest>

diff --git a/.../packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/commands/sort/index.ts b/.../packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/commands/sort/index.ts
@@ -128,11 +128,15 @@ export async function suggest(
       // SORT fie<suggest>
       return [
         ...pushItUpInTheList(
-          fieldSuggestions.map((suggestion) => ({
-            ...suggestion,
-            command: TRIGGER_SUGGESTION_COMMAND,
-            rangeToReplace,
-          })),
+          fieldSuggestions.map((suggestion) => {
+            // if there is already a command, we don't want to override it
+            if (suggestion.command) return suggestion;
+            return {
+              ...suggestion,
+              command: TRIGGER_SUGGESTION_COMMAND,
+              rangeToReplace,
+            };
+          }),
           true
         ),
         ...functionSuggestions,