fix clash between auto keyword and auto console command

Author: angrykoala

packages/language-support/src/antlr-grammar/CypherCmdLexer.g4

@@ -25,5 +25,3 @@ PLAY: P L A Y;
 ACCESSMODE: A C C E S S '-' M O D E;
 
 HELP: H E L P;
-
-AUTO: A U T O;

packages/language-support/src/antlr-grammar/CypherCmdParser.g4

@@ -59,7 +59,7 @@ accessModeCmd: ACCESSMODE accessModeArgs?;
 
 helpCmd: HELP;
 
-autoCmd: AUTO statement;
+autoCmd: autoCompletionRule statement;
 
 // These rules are needed to distinguish cypher <-> commands, for example `USE` and `:use` in autocompletion
 listCompletionRule: LIST; 
@@ -72,6 +72,8 @@ readCompletionRule: READ;
 
 writeCompletionRule: WRITE;
 
+autoCompletionRule: AUTO;
+
 // This rule overrides the identifiers adding EXPLAIN, PROFILE, etc
 unescapedSymbolicNameString: 
     preparserKeyword 

packages/language-support/src/autocompletion/completionCoreCompletions.ts

@@ -525,6 +525,7 @@ export function completionCoreCompletion(
           CypherParser.RULE_serverCompletionRule,
           CypherParser.RULE_readCompletionRule,
           CypherParser.RULE_writeCompletionRule,
+          CypherParser.RULE_autoCompletionRule,
         ]
       : [CypherParser.RULE_consoleCommand]),
 
@@ -778,6 +779,10 @@ export function completionCoreCompletion(
         return [{ label: 'write', kind: CompletionItemKind.Event }];
       }
 
+      if (ruleNumber === CypherParser.RULE_autoCompletionRule) {
+        return [{ label: 'auto', kind: CompletionItemKind.Event }];
+      }
+
       return [];
     },
   );

packages/language-support/src/syntaxHighlighting/syntaxHighlighting.ts

@@ -3,7 +3,7 @@ import { ParseTreeWalker, TerminalNode, Token } from 'antlr4';
 import {
   AccessModeArgsContext,
   ArrowLineContext,
-  AutoCmdContext,
+  AutoCompletionRuleContext,
   BooleanLiteralContext,
   ConsoleCommandContext,
   CypherOptionNameContext,
@@ -277,7 +277,8 @@ class SyntaxHighlighter extends CypherParserListener {
     );
   };
 
-  exitAutoCmd = (ctx: AutoCmdContext) => {
+  // console commands that clash with cypher keywords
+  exitAutoCompletionRule = (ctx: AutoCompletionRuleContext) => {
     const auto = ctx.AUTO();
 
     this.addToken(auto.symbol, CypherTokenType.consoleCommand, auto.getText());

packages/language-support/src/syntaxValidation/completionCoreErrors.ts

@@ -53,6 +53,7 @@ export function completionCoreErrormessage(
           [CypherParser.RULE_serverCompletionRule]: 'server',
           [CypherParser.RULE_readCompletionRule]: 'read',
           [CypherParser.RULE_writeCompletionRule]: 'write',
+          [CypherParser.RULE_autoCompletionRule]: 'auto',
         }
       : { [CypherParser.RULE_consoleCommand]: null }),
   };

packages/language-support/src/tests/consoleCommands.test.ts

@@ -247,9 +247,9 @@ describe('sanity checks', () => {
 
   test('completes basic console cmds on :', () => {
     expect(autocomplete(':', {})).toEqual([
+      { kind: 23, label: 'auto' },
       { kind: 23, label: 'server' },
       { kind: 23, label: 'use' },
-      { kind: 23, label: 'auto' },
       { kind: 23, label: 'help' },
       { kind: 23, label: 'access-mode' },
       { kind: 23, label: 'play' },
@@ -297,7 +297,7 @@ describe('sanity checks', () => {
   test('handles misspelled or non-existing command', () => {
     expectErrorMessage(
       ':foo',
-      'Expected any of auto, help, access-mode, play, style, sysinfo, welcome, disconnect, connect, param, history, clear, server or use',
+      'Expected any of help, access-mode, play, style, sysinfo, welcome, disconnect, connect, param, history, clear, auto, server or use',
     );
 
     expectErrorMessage(':clea', 'Unexpected token. Did you mean clear?');