Fix params logic missing after merge

elastic · Nov 11, 2024 · 9147041 · 9147041
1 parent f19e521
commit 9147041
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 23 deletions.
diff --git a/...esql-validation-autocomplete/src/autocomplete/__tests__/autocomplete.suggest.eval.test.ts b/...esql-validation-autocomplete/src/autocomplete/__tests__/autocomplete.suggest.eval.test.ts
@@ -371,7 +371,7 @@ describe('autocomplete.suggest', () => {
       for (const fn of scalarFunctionDefinitions) {
         // skip this fn for the moment as it's quite hard to test
         // Add match in the text when the autocomplete is ready https://github.com/elastic/kibana/issues/196995
-        if (!['bucket', 'date_extract', 'date_diff', 'case', 'match'].includes(fn.name)) {
+        if (!['bucket', 'date_extract', 'date_diff', 'case', 'match', 'qstr'].includes(fn.name)) {
           test(`${fn.name}`, async () => {
             const testedCases = new Set<string>();
 

diff --git a/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.test.ts b/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.test.ts
@@ -314,28 +314,30 @@ describe('quick fixes logic', () => {
           { equalityCheck: 'include', ...options }
         );
       }
-      // for (const fn of getAllFunctions({ type: 'agg' })) {
-      //   // add an A to the function name to make it invalid
-      //   testQuickFixes(
-      //     `FROM index | STATS ${BROKEN_PREFIX}${fn.name}()`,
-      //     [fn.name].map(toFunctionSignature),
-      //     { equalityCheck: 'include', ...options }
-      //   );
-      //   testQuickFixes(
-      //     `FROM index | STATS var0 = ${BROKEN_PREFIX}${fn.name}()`,
-      //     [fn.name].map(toFunctionSignature),
-      //     { equalityCheck: 'include', ...options }
-      //   );
-      // }
-      // // it should preserve the arguments
-      // testQuickFixes(`FROM index | EVAL rAund(numberField)`, ['round(numberField)'], {
-      //   equalityCheck: 'include',
-      //   ...options,
-      // });
-      // testQuickFixes(`FROM index | STATS AVVG(numberField)`, ['avg(numberField)'], {
-      //   equalityCheck: 'include',
-      //   ...options,
-      // });
+      for (const fn of getAllFunctions({ type: 'agg' })) {
+        if (['match', 'qstr', '?'].includes(fn.name)) continue;
+
+        // add an A to the function name to make it invalid
+        testQuickFixes(
+          `FROM index | STATS ${BROKEN_PREFIX}${fn.name}()`,
+          [fn.name].map(toFunctionSignature),
+          { equalityCheck: 'include', ...options }
+        );
+        testQuickFixes(
+          `FROM index | STATS var0 = ${BROKEN_PREFIX}${fn.name}()`,
+          [fn.name].map(toFunctionSignature),
+          { equalityCheck: 'include', ...options }
+        );
+      }
+      // it should preserve the arguments
+      testQuickFixes(`FROM index | EVAL rAund(numberField)`, ['round(numberField)'], {
+        equalityCheck: 'include',
+        ...options,
+      });
+      testQuickFixes(`FROM index | STATS AVVG(numberField)`, ['avg(numberField)'], {
+        equalityCheck: 'include',
+        ...options,
+      });
     }
   });
 

diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/validation.ts b/packages/kbn-esql-validation-autocomplete/src/validation/validation.ts
@@ -448,6 +448,9 @@ function validateFunction({
   if (fn.incomplete) {
     return messages;
   }
+  if (isFunctionOperatorParam(fn)) {
+    return messages;
+  }
   const fnDefinition = getFunctionDefinition(fn.name)!;
 
   const isFnSupported = isSupportedFunction(fn.name, parentCommand, parentOption);