From abcaab41d657065507a335584f0f327e452509e3 Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <quynh.nguyen@elastic.co>
Date: Fri, 30 Aug 2024 09:53:22 -0500
Subject: [PATCH] Make it so it doesn't add comma when completing an arg from a
 snippet

---
 .../src/autocomplete/autocomplete.ts          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
index d6d465e27d630..8fbe915e456a0 100644
--- a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
@@ -309,7 +309,9 @@ export async function suggest(
       astContext,
       getFieldsByType,
       getFieldsMap,
-      getPolicyMetadata
+      getPolicyMetadata,
+      fullText,
+      offset
     );
   }
   if (astContext.type === 'list') {
@@ -1258,7 +1260,9 @@ async function getFunctionArgsSuggestions(
   },
   getFieldsByType: GetFieldsByTypeFn,
   getFieldsMap: GetFieldsMapFn,
-  getPolicyMetadata: GetPolicyMetadataFn
+  getPolicyMetadata: GetPolicyMetadataFn,
+  fullText: string,
+  offset: number
 ): Promise<SuggestionRawDefinition[]> {
   const fnDefinition = getFunctionDefinition(node.name);
   // early exit on no hit
@@ -1314,9 +1318,11 @@ async function getFunctionArgsSuggestions(
     // no need to suggest comma
     .some((p) => p === null || p?.optional === true);
 
-  // Wehther to prepend comma to suggestion string
+  // Whether to prepend comma to suggestion string
   // E.g. if true, "fieldName" -> "fieldName, "
-  const shouldAddComma = hasMoreMandatoryArgs && fnDefinition.type !== 'builtin';
+  const alreadyHasComma = fullText ? fullText[offset] === ',' : false;
+  const shouldAddComma =
+    hasMoreMandatoryArgs && fnDefinition.type !== 'builtin' && !alreadyHasComma;
 
   const suggestedConstants = uniq(
     typesToSuggestNext
@@ -1777,11 +1783,8 @@ async function getOptionArgsSuggestions(
                   defaultMessage: 'Add date histogram using bucket()',
                 }
               ),
-              documentation: {
-                value: '',
-              },
               sortText: '1A',
-            });
+            } as SuggestionRawDefinition);
           }
 
           suggestions.push(