ESQL: Remove duplicated nested commands (elastic#123085)

Fork grammar duplicated nested command declaration causing additional
 lexing to occur resulting in invalid field name declaration

Relates to elastic#121948

Author: costin

docs/changelog/123085.yaml

@@ -0,0 +1,5 @@
+pr: 123085
+summary: Remove duplicated nested commands
+area: ES|QL
+type: bug
+issues: []

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4

@@ -195,14 +195,12 @@ IN: 'in';
 IS: 'is';
 LAST : 'last';
 LIKE: 'like';
-LP : '(';
 NOT : 'not';
 NULL : 'null';
 NULLS : 'nulls';
 OR : 'or';
 PARAM: '?';
 RLIKE: 'rlike';
-RP : ')';
 TRUE : 'true';
 
 EQ  : '==';
@@ -223,8 +221,6 @@ LEFT_BRACES : '{';
 RIGHT_BRACES : '}';
 
 NESTED_WHERE : WHERE -> type(WHERE);
-NESTED_SORT : {this.isDevVersion()}? SORT -> type(SORT);
-NESTED_LIMIT : {this.isDevVersion()}? LIMIT -> type(LIMIT);
 
 NAMED_OR_POSITIONAL_PARAM
     : PARAM (LETTER | UNDERSCORE) UNQUOTED_ID_BODY*
@@ -239,6 +235,9 @@ NAMED_OR_POSITIONAL_PARAM
 OPENING_BRACKET : '[' -> pushMode(EXPRESSION_MODE), pushMode(EXPRESSION_MODE);
 CLOSING_BRACKET : ']' -> popMode, popMode;
 
+LP : '(' -> pushMode(EXPRESSION_MODE), pushMode(EXPRESSION_MODE);
+RP : ')' -> popMode, popMode;
+
 UNQUOTED_IDENTIFIER
     : LETTER UNQUOTED_ID_BODY*
     // only allow @ at beginning of identifier to keep the option to allow @ as infix operator in the future
@@ -678,8 +677,8 @@ INSIST_MULTILINE_COMMENT : MULTILINE_COMMENT -> channel(HIDDEN);
 //
 mode FORK_MODE;
 FORK_LP : LP -> type(LP), pushMode(DEFAULT_MODE);
-FORK_RP : RP -> type(RP), popMode;
 FORK_PIPE : PIPE -> type(PIPE), popMode;
+
 FORK_WS : WS -> channel(HIDDEN);
 FORK_LINE_COMMENT : LINE_COMMENT -> channel(HIDDEN);
 FORK_MULTILINE_COMMENT : MULTILINE_COMMENT -> channel(HIDDEN);