cleanup 2

Author: bartoval

src/platform/packages/shared/kbn-esql-language/src/commands/definitions/utils/ast.test.ts

@@ -11,7 +11,6 @@ import { Parser, PromQLParser, Walker } from '@elastic/esql';
 import type { ESQLAstItem, ESQLAstQueryExpression } from '@elastic/esql/types';
 import { EDITOR_MARKER } from '../constants';
 import {
-  addAutocompleteMarker,
   correctPromqlQuerySyntax,
   correctQuerySyntax,
   getBracketsToClose,
@@ -47,33 +46,31 @@ describe('getBracketsToClose', () => {
   });
 });
 
-describe('addAutocompleteMarker', () => {
+describe('correctQuerySyntax', () => {
   it('appends marker after operator', () => {
     const query = 'FROM foo | EVAL field > ';
-    const result = addAutocompleteMarker(query);
+    const result = correctQuerySyntax(query);
     expect(result.endsWith(EDITOR_MARKER)).toBe(true);
   });
 
   it('appends marker after comma', () => {
     const query = 'FROM foo | STATS field1, ';
-    const result = addAutocompleteMarker(query);
+    const result = correctQuerySyntax(query);
     expect(result.endsWith(EDITOR_MARKER)).toBe(true);
   });
 
   it('appends marker if all brackets are closed and ends with operator', () => {
     const query = 'FROM index | STATS AVG(field1) != ';
-    const result = addAutocompleteMarker(query);
+    const result = correctQuerySyntax(query);
     expect(result.endsWith(EDITOR_MARKER)).toBe(true);
   });
 
   it('does not append marker for inline cast type names ending with operator-like suffixes', () => {
     const query = 'FROM index | EVAL vec = [0.1, 0.2]::dense_vector ';
-    const result = addAutocompleteMarker(query);
+    const result = correctQuerySyntax(query);
     expect(result).toEqual(query);
   });
-});
 
-describe('correctQuerySyntax', () => {
   it('closes unclosed brackets', () => {
     const query = 'FROM foo | EVAL foo(bar[baz';
     const result = correctQuerySyntax(query);
@@ -91,8 +88,7 @@ describe('correctQuerySyntax', () => {
   it('handles incomplete function signature', () => {
     const query = 'FROM foo | EVAL foo(bar, ';
     const result = correctQuerySyntax(query);
-    expect(result.endsWith(')')).toBe(true);
-    expect(result).not.toContain(EDITOR_MARKER);
+    expect(result.endsWith(`${EDITOR_MARKER})`)).toBe(true);
   });
 });
 
@@ -139,7 +135,7 @@ describe('correctPromqlQuerySyntax', () => {
 
 describe('removeAutocompleteMarkers', () => {
   const parseAutocomplete = (innerText: string): ESQLAstQueryExpression => {
-    const corrected = correctQuerySyntax(addAutocompleteMarker(innerText));
+    const corrected = correctQuerySyntax(innerText);
     return Parser.parse(corrected, { withFormatting: true }).root;
   };
 

src/platform/packages/shared/kbn-esql-language/src/commands/definitions/utils/ast.ts

@@ -225,29 +225,21 @@ export function getBracketsToClose(text: string) {
   return stack.reverse().map((bracket) => pairs[bracket]);
 }
 
-export function addAutocompleteMarker(query: string) {
-  if (
-    ENDS_WITH_BINARY_OPERATOR_REGEX.test(query) ||
-    ENDS_WITH_CASTING_OPERATOR_REGEX.test(query) ||
-    (endsWithComma(query) && endsWithWhitespace(query))
-  ) {
-    return `${query} ${EDITOR_MARKER}`;
-  }
-
-  return query;
-}
-
 /**
  * This function attempts to correct the syntax of a partial query to make it valid.
  *
  * We are generally dealing with incomplete queries when the user is typing. But,
  * having an AST is helpful so we heuristically correct the syntax so it can be parsed.
- *
- * @param _query
- * @param context
- * @returns
  */
 export function correctQuerySyntax(query: string) {
+  if (
+    ENDS_WITH_BINARY_OPERATOR_REGEX.test(query) ||
+    ENDS_WITH_CASTING_OPERATOR_REGEX.test(query) ||
+    (endsWithComma(query) && endsWithWhitespace(query))
+  ) {
+    query += ` ${EDITOR_MARKER}`;
+  }
+
   // check if all brackets are closed, otherwise close them
   return query + getBracketsToClose(query).join('');
 }
@@ -259,9 +251,7 @@ const PROMQL_TRAILING_COLON_REGEX = /:\s*$/;
  * It keeps the same marker semantics used in ES|QL correction, but only for trailing
  * separators relevant to PromQL argument/subquery contexts.
  */
-export function correctPromqlQuerySyntax(input: string): string {
-  let query = input;
-
+export function correctPromqlQuerySyntax(query: string): string {
   if (
     !query.includes(EDITOR_MARKER) &&
     (endsWithComma(query) || PROMQL_TRAILING_COLON_REGEX.test(query))

src/platform/packages/shared/kbn-esql-language/src/language/shared/get_cursor_context.test.ts

@@ -9,7 +9,6 @@
 
 import { EDITOR_MARKER } from '../../commands/definitions/constants';
 import {
-  addAutocompleteMarker,
   correctQuerySyntax,
   isMarkerNode,
   removeAutocompleteMarkers,
@@ -19,7 +18,7 @@ import { Parser, Walker } from '@elastic/esql';
 import { getCursorContext } from './get_cursor_context';
 
 const assertMarkerRemoved = (_query: string) => {
-  const query = correctQuerySyntax(addAutocompleteMarker(_query));
+  const query = correctQuerySyntax(_query);
   if (!query.includes(EDITOR_MARKER)) {
     throw new Error(`Query does not contain marker: ${query}`);
   }

src/platform/packages/shared/kbn-esql-language/src/language/shared/get_query_for_fields.ts

@@ -9,6 +9,7 @@
 
 import type { ESQLAstQueryExpression, ESQLAstForkCommand } from '@elastic/esql/types';
 import { getBracketsToClose } from '../../commands/definitions/utils/ast';
+import { endsWithComma } from '../../commands/definitions/utils/regex';
 import { expandEvals } from './expand_evals';
 
 /**
@@ -51,7 +52,7 @@ export function getQueryForFields(
 
   if (lastCommand && lastCommand.name === 'eval') {
     const hasTrailingSeparatorComma =
-      getBracketsToClose(queryString).length === 0 && queryString.trimEnd().endsWith(',');
+      getBracketsToClose(queryString).length === 0 && endsWithComma(queryString);
 
     if (lastCommand.args.length > 1 || hasTrailingSeparatorComma) {
       /**

src/platform/packages/shared/kbn-esql-language/src/language/shared/parse_for_autocomplete_query.ts

@@ -11,7 +11,6 @@ import { Parser, PromQLParser } from '@elastic/esql';
 import type { PromQLAstQueryExpression } from '@elastic/esql';
 import type { ESQLAstQueryExpression } from '@elastic/esql/types';
 import {
-  addAutocompleteMarker,
   correctPromqlQuerySyntax,
   correctQuerySyntax,
   findAstPosition,
@@ -30,7 +29,7 @@ interface ParsedAutocompleteQuery {
  */
 export function parseAutocompleteQuery(fullText: string, offset: number): ParsedAutocompleteQuery {
   const innerText = fullText.substring(0, offset);
-  const correctedQuery = correctQuerySyntax(addAutocompleteMarker(innerText));
+  const correctedQuery = correctQuerySyntax(innerText);
   const { root } = Parser.parse(correctedQuery, { withFormatting: true });
 
   return {