Merge branch 'elastic:main' into enable-modal

elastic · Nov 11, 2024 · 0adcd5d · 0adcd5d
2 parents 6f3aafc + c19551f
commit 0adcd5d
Show file tree

Hide file tree

Showing 17 changed files with 1,402 additions and 1,404 deletions.
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4 b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
@@ -107,6 +107,8 @@ WS
     : [ \r\n\t]+ -> channel(HIDDEN)
     ;
 
+COLON : ':';
+
 //
 // Expression - used by most command
 //
@@ -209,8 +211,8 @@ MINUS : '-';
 ASTERISK : '*';
 SLASH : '/';
 PERCENT : '%';
+EXPRESSION_COLON : {this.isDevVersion()}? COLON -> type(COLON);
 
-MATCH : 'match';
 NESTED_WHERE : WHERE -> type(WHERE);
 
 NAMED_OR_POSITIONAL_PARAM
@@ -479,7 +481,7 @@ SHOW_WS
 mode SETTING_MODE;
 SETTING_CLOSING_BRACKET : CLOSING_BRACKET -> type(CLOSING_BRACKET), popMode;
 
-COLON : ':';
+SETTING_COLON : COLON -> type(COLON);
 
 SETTING
     : (ASPERAND | DIGIT| DOT | LETTER | UNDERSCORE)+

diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
@@ -21,46 +21,46 @@ UNKNOWN_CMD=20
 LINE_COMMENT=21
 MULTILINE_COMMENT=22
 WS=23
-PIPE=24
-QUOTED_STRING=25
-INTEGER_LITERAL=26
-DECIMAL_LITERAL=27
-BY=28
-AND=29
-ASC=30
-ASSIGN=31
-CAST_OP=32
-COMMA=33
-DESC=34
-DOT=35
-FALSE=36
-FIRST=37
-IN=38
-IS=39
-LAST=40
-LIKE=41
-LP=42
-NOT=43
-NULL=44
-NULLS=45
-OR=46
-PARAM=47
-RLIKE=48
-RP=49
-TRUE=50
-EQ=51
-CIEQ=52
-NEQ=53
-LT=54
-LTE=55
-GT=56
-GTE=57
-PLUS=58
-MINUS=59
-ASTERISK=60
-SLASH=61
-PERCENT=62
-MATCH=63
+COLON=24
+PIPE=25
+QUOTED_STRING=26
+INTEGER_LITERAL=27
+DECIMAL_LITERAL=28
+BY=29
+AND=30
+ASC=31
+ASSIGN=32
+CAST_OP=33
+COMMA=34
+DESC=35
+DOT=36
+FALSE=37
+FIRST=38
+IN=39
+IS=40
+LAST=41
+LIKE=42
+LP=43
+NOT=44
+NULL=45
+NULLS=46
+OR=47
+PARAM=48
+RLIKE=49
+RP=50
+TRUE=51
+EQ=52
+CIEQ=53
+NEQ=54
+LT=55
+LTE=56
+GT=57
+GTE=58
+PLUS=59
+MINUS=60
+ASTERISK=61
+SLASH=62
+PERCENT=63
 NAMED_OR_POSITIONAL_PARAM=64
 OPENING_BRACKET=65
 CLOSING_BRACKET=66
@@ -101,23 +101,22 @@ INFO=100
 SHOW_LINE_COMMENT=101
 SHOW_MULTILINE_COMMENT=102
 SHOW_WS=103
-COLON=104
-SETTING=105
-SETTING_LINE_COMMENT=106
-SETTTING_MULTILINE_COMMENT=107
-SETTING_WS=108
-LOOKUP_LINE_COMMENT=109
-LOOKUP_MULTILINE_COMMENT=110
-LOOKUP_WS=111
-LOOKUP_FIELD_LINE_COMMENT=112
-LOOKUP_FIELD_MULTILINE_COMMENT=113
-LOOKUP_FIELD_WS=114
-METRICS_LINE_COMMENT=115
-METRICS_MULTILINE_COMMENT=116
-METRICS_WS=117
-CLOSING_METRICS_LINE_COMMENT=118
-CLOSING_METRICS_MULTILINE_COMMENT=119
-CLOSING_METRICS_WS=120
+SETTING=104
+SETTING_LINE_COMMENT=105
+SETTTING_MULTILINE_COMMENT=106
+SETTING_WS=107
+LOOKUP_LINE_COMMENT=108
+LOOKUP_MULTILINE_COMMENT=109
+LOOKUP_WS=110
+LOOKUP_FIELD_LINE_COMMENT=111
+LOOKUP_FIELD_MULTILINE_COMMENT=112
+LOOKUP_FIELD_WS=113
+METRICS_LINE_COMMENT=114
+METRICS_MULTILINE_COMMENT=115
+METRICS_WS=116
+CLOSING_METRICS_LINE_COMMENT=117
+CLOSING_METRICS_MULTILINE_COMMENT=118
+CLOSING_METRICS_WS=119
 'dissect'=1
 'drop'=2
 'enrich'=3
@@ -134,47 +133,46 @@ CLOSING_METRICS_WS=120
 'sort'=14
 'stats'=15
 'where'=16
-'|'=24
-'by'=28
-'and'=29
-'asc'=30
-'='=31
-'::'=32
-','=33
-'desc'=34
-'.'=35
-'false'=36
-'first'=37
-'in'=38
-'is'=39
-'last'=40
-'like'=41
-'('=42
-'not'=43
-'null'=44
-'nulls'=45
-'or'=46
-'?'=47
-'rlike'=48
-')'=49
-'true'=50
-'=='=51
-'=~'=52
-'!='=53
-'<'=54
-'<='=55
-'>'=56
-'>='=57
-'+'=58
-'-'=59
-'*'=60
-'/'=61
-'%'=62
-'match'=63
+':'=24
+'|'=25
+'by'=29
+'and'=30
+'asc'=31
+'='=32
+'::'=33
+','=34
+'desc'=35
+'.'=36
+'false'=37
+'first'=38
+'in'=39
+'is'=40
+'last'=41
+'like'=42
+'('=43
+'not'=44
+'null'=45
+'nulls'=46
+'or'=47
+'?'=48
+'rlike'=49
+')'=50
+'true'=51
+'=='=52
+'=~'=53
+'!='=54
+'<'=55
+'<='=56
+'>'=57
+'>='=58
+'+'=59
+'-'=60
+'*'=61
+'/'=62
+'%'=63
 ']'=66
 'metadata'=75
 'as'=84
 'on'=88
 'with'=89
 'info'=100
-':'=104