Skip to content

Commit 2802752

Browse files
committed
Fixes role and username completions
1 parent 0a4e887 commit 2802752

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

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

+13-1
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,24 @@ enum ExpectedParameterType {
215215

216216
const inferExpectedParameterTypeFromContext = (context: CandidateRule) => {
217217
const parentRule = context.ruleList.at(-1);
218+
const grandParentRule = context.ruleList.at(-2);
218219
if (
219220
[
220221
CypherParser.RULE_stringOrParameter,
221222
CypherParser.RULE_symbolicNameOrStringParameter,
222223
CypherParser.RULE_passwordExpression,
223-
].includes(parentRule)
224+
CypherParser.RULE_createUser,
225+
CypherParser.RULE_dropUser,
226+
CypherParser.RULE_alterUser,
227+
CypherParser.RULE_renameUser,
228+
CypherParser.RULE_createRole,
229+
CypherParser.RULE_dropRole,
230+
CypherParser.RULE_renameRole,
231+
].includes(parentRule) ||
232+
[
233+
CypherParser.RULE_showUserPrivileges,
234+
CypherParser.RULE_grantRole,
235+
].includes(grandParentRule)
224236
) {
225237
return ExpectedParameterType.String;
226238
} else if (

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

-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ describe('can complete database names', () => {
366366
'SHOW USER ',
367367
'ALTER CURRENT USER SET PASSWORD FROM ',
368368
'ALTER CURRENT USER SET PASSWORD FROM $pw to ',
369-
'ALTER USER ',
370369
'ALTER USER foo IF EXISTS SET PASSWORD ',
371370
];
372371
cases.forEach((query) => {

0 commit comments

Comments
 (0)