Makes the way we add external keywords a bit better

neo4j · Sep 13, 2024 · ec87686 · ec87686
1 parent 2f8a9fd
commit ec87686
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/.changeset/selfish-wombats-pay.md b/.changeset/selfish-wombats-pay.md
@@ -0,0 +1,5 @@
+---
+'@neo4j-cypher/language-support': patch
+---
+
+Fixes bug using non language keywords (EXPLAIN, PROFILE, etc) as symbolic names
diff --git a/packages/language-support/src/antlr-grammar/CypherCmdParser.g4 b/packages/language-support/src/antlr-grammar/CypherCmdParser.g4
@@ -27,9 +27,4 @@ listCompletionRule: LIST;
 
 useCompletionRule: USE;
 
-
-cmdCommandsKeywords: HISTORY | CLEAR | PARAM;
-
-
-unescapedLabelSymbolicNameString
-   : IDENTIFIER | staticIdentifiers | preparserOption | cmdCommandsKeywords;
+externalKeywords: preparserOption | HISTORY | CLEAR | PARAM;
diff --git a/packages/language-support/src/antlr-grammar/CypherLexer.g4 b/packages/language-support/src/antlr-grammar/CypherLexer.g4
@@ -98,9 +98,6 @@ ESCAPED_SYMBOLIC_NAME
    : '`' ( ~'`' | '``' )* '`'
    ;
 
-EXPLAIN:
-   E X P L A I N;
-
 ACCESS
    : A C C E S S
    ;

diff --git a/packages/language-support/src/antlr-grammar/CypherParser.g4 b/packages/language-support/src/antlr-grammar/CypherParser.g4
@@ -1769,14 +1769,15 @@ symbolicLabelNameString
    | unescapedLabelSymbolicNameString
    ;
 
+// Do not remove this, it is needed for composing the grammar 
+// with other ones (e.g. language support ones)
+externalKeywords
+   : IDENTIFIER
+   ;
 
 unescapedLabelSymbolicNameString
-   : IDENTIFIER | staticIdentifiers;
-
-
-
-staticIdentifiers
-   :ACCESS
+   : IDENTIFIER
+   | ACCESS
    | ACTIVE
    | ADMIN
    | ADMINISTRATOR
@@ -2030,6 +2031,7 @@ staticIdentifiers
    | YIELD
    | ZONE
    | ZONED
+   | externalKeywords
    ;
 
 endOfFile

diff --git a/packages/language-support/src/antlr-grammar/CypherPreLexer.g4 b/packages/language-support/src/antlr-grammar/CypherPreLexer.g4
@@ -6,4 +6,4 @@ EXPLAIN:
    E X P L A I N;
 
 PROFILE:
-   P R O F I L E;
+   P R O F I L E;
diff --git a/packages/language-support/src/antlr-grammar/CypherPreParser.g4 b/packages/language-support/src/antlr-grammar/CypherPreParser.g4
@@ -8,5 +8,4 @@ preparsedStatement:
    preparserOption? statement;
 
 preparserOption:
-   EXPLAIN | PROFILE;
-
+   EXPLAIN | PROFILE;