diff --git a/packages/kbn-esql-ast/src/antlr_error_listener.ts b/packages/kbn-esql-ast/src/antlr_error_listener.ts
index e685dfe3473ba..5bd02b3b74eb9 100644
--- a/packages/kbn-esql-ast/src/antlr_error_listener.ts
+++ b/packages/kbn-esql-ast/src/antlr_error_listener.ts
@@ -12,7 +12,7 @@ import { ErrorListener } from 'antlr4';
 import type { EditorError } from './types';
 import { getPosition } from './ast_position_utils';
 
-const REPLACE_DEV = /,*\s*DEV_\w+\s*/g;
+const REPLACE_DEV = /,{0,1}(?<!\s)\s*DEV_\w+\s*/g;
 export class ESQLErrorListener extends ErrorListener<any> {
   protected errors: EditorError[] = [];
 
diff --git a/packages/kbn-text-based-editor/src/helpers.ts b/packages/kbn-text-based-editor/src/helpers.ts
index fb541c4fe39be..0ba6d5004606f 100644
--- a/packages/kbn-text-based-editor/src/helpers.ts
+++ b/packages/kbn-text-based-editor/src/helpers.ts
@@ -77,12 +77,14 @@ export const parseWarning = (warning: string): MonacoMessage[] => {
             startColumn = Number(encodedColumn);
             startLineNumber = Number(encodedLine.replace('Line ', ''));
           }
-          // extract the length of the "expression" within the message
-          // and try to guess the correct size for the editor marker to highlight
-          if (/\[.*\]/.test(warningMessage)) {
-            const [_, wordWithError] = warningMessage.split('[');
-            if (wordWithError) {
-              errorLength = wordWithError.length;
+          const openingSquareBracketIndex = warningMessage.indexOf('[');
+          if (openingSquareBracketIndex !== -1) {
+            const closingSquareBracketIndex = warningMessage.indexOf(
+              ']',
+              openingSquareBracketIndex
+            );
+            if (closingSquareBracketIndex !== -1) {
+              errorLength = warningMessage.length - openingSquareBracketIndex - 1;
             }
           }
         }