Self review

Author: ncordon

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

@@ -10,7 +10,7 @@ import CypherLexer from '../generated-parser/CypherCmdLexer';
 import CypherParser, {
   Expression2Context,
 } from '../generated-parser/CypherCmdParser';
-import { rulesDefiningVariables } from '../helpers';
+import { findPreviousNonSpace, rulesDefiningVariables } from '../helpers';
 import {
   CypherTokenType,
   lexerKeywords,
@@ -571,21 +571,6 @@ function completeAliasName({
   ];
 }
 
-function findPreviousNonSpace(
-  tokens: Token[],
-  index: number,
-): Token | undefined {
-  let i = index;
-  while (i > 0) {
-    const token = tokens[--i];
-
-    if (token.type !== CypherParser.SPACE) {
-      return token;
-    }
-  }
-
-  return undefined;
-}
 function completeSymbolicName({
   candidateRule,
   dbSchema,
@@ -609,7 +594,7 @@ function completeSymbolicName({
   const afterToToken = previousToken.type === CypherParser.TO;
   const ruleList = candidateRule.ruleList;
 
-  // avoid suggesting existing database names when creating a new user or role
+  // avoid suggesting existing user names or role names when creating a new one
   if (
     rulesCreatingNewUserOrRole.some((rule) => ruleList.includes(rule)) ||
     // We are suggesting an user as target for the renaming

packages/language-support/src/helpers.ts

@@ -176,6 +176,22 @@ export function splitIntoStatements(
   return result;
 }
 
+export function findPreviousNonSpace(
+  tokens: Token[],
+  index: number,
+): Token | undefined {
+  let i = index;
+  while (i > 0) {
+    const token = tokens[--i];
+
+    if (token.type !== CypherParser.SPACE) {
+      return token;
+    }
+  }
+
+  return undefined;
+}
+
 export const rulesDefiningVariables = [
   CypherParser.RULE_returnItem,
   CypherParser.RULE_unwindClause,

packages/language-support/src/tests/autocompletion/parameterCompletions.test.ts

@@ -65,19 +65,6 @@ describe('Completes parameters outside of databases, roles, user names', () => {
     });
   });
 
-  test('Correctly suggests parameter in ENABLE SERVER', () => {
-    const query = 'ENABLE SERVER ';
-    testCompletions({
-      query,
-      dbSchema,
-      expected: [{ label: '$stringParam', kind: CompletionItemKind.Variable }],
-      excluded: [
-        { label: '$intParam', kind: CompletionItemKind.Variable },
-        { label: '$mapParam', kind: CompletionItemKind.Variable },
-      ],
-    });
-  });
-
   test('Suggests parameter as map properties', () => {
     const query = 'match (v :Movie ';
 
@@ -175,4 +162,25 @@ describe('Completes parameters outside of databases, roles, user names', () => {
       });
     });
   });
+
+  test('Suggests parameters for passwords', () => {
+    const cases = [
+      'ALTER CURRENT USER SET PASSWORD FROM ',
+      'ALTER CURRENT USER SET PASSWORD FROM $pw to ',
+      'ALTER USER foo IF EXISTS SET PASSWORD ',
+    ];
+    cases.forEach((query) => {
+      testCompletions({
+        query,
+        dbSchema,
+        expected: [
+          { label: '$stringParam', kind: CompletionItemKind.Variable },
+        ],
+        excluded: [
+          { label: '$intParam', kind: CompletionItemKind.Variable },
+          { label: '$mapParam', kind: CompletionItemKind.Variable },
+        ],
+      });
+    });
+  });
 });

packages/language-support/src/tests/autocompletion/roleNameCompletion.test.ts

@@ -306,7 +306,7 @@ describe('Can complete role names', () => {
     );
   });
 
-  test('Correctly completes parameters and existing user names in GRANT database privilege', () => {
+  test('Correctly completes parameters and existing role names in GRANT database privilege', () => {
     const cases = [
       'GRANT TERMINATE TRANSACTION (user) ON DATABASE neo4j TO ',
       'GRANT TERMINATE TRANSACTION (user) ON DATABASE neo4j TO role, ',
@@ -321,7 +321,7 @@ describe('Can complete role names', () => {
           { label: 'foo', kind: CompletionItemKind.Value },
           { label: 'bar', kind: CompletionItemKind.Value },
         ],
-        // do not suggest non-string parameters or existing user names
+        // do not suggest non-string parameters or existing role names
         excluded: [
           { label: '$intParam', kind: CompletionItemKind.Variable },
           { label: '$mapParam', kind: CompletionItemKind.Variable },

packages/language-support/src/tests/autocompletion/userNameCompletion.test.ts

@@ -126,27 +126,6 @@ describe('Can complete user names', () => {
     );
   });
 
-  test('Suggests parameters for passwords', () => {
-    const cases = [
-      'ALTER CURRENT USER SET PASSWORD FROM ',
-      'ALTER CURRENT USER SET PASSWORD FROM $pw to ',
-      'ALTER USER foo IF EXISTS SET PASSWORD ',
-    ];
-    cases.forEach((query) => {
-      testCompletions({
-        query,
-        dbSchema,
-        expected: [
-          { label: '$stringParam', kind: CompletionItemKind.Variable },
-        ],
-        excluded: [
-          { label: '$intParam', kind: CompletionItemKind.Variable },
-          { label: '$mapParam', kind: CompletionItemKind.Variable },
-        ],
-      });
-    });
-  });
-
   test('Correctly completes parameters and existing user names in GRANT ROLE TO USER', () => {
     const cases = ['GRANT ROLE abc TO ', 'GRANT ROLE abc TO user, '];