Skip to content

fix(language-service): avoid duplicate directive modifiers in completion #5920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KazariEX merged 2 commits into from
Jan 5, 2026
Merged

fix(language-service): avoid duplicate directive modifiers in completion #5920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0ec8b4
fix: avoid duplicate directive modifiers in completion
KazariEX Jan 4, 2026
6734de5
test: add
KazariEX Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions packages/language-server/tests/completions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { TextDocument } from '@volar/language-server';
import * as path from 'node:path';
import type * as ts from 'typescript';
import { afterEach, expect, test } from 'vitest';
import { URI } from 'vscode-uri';
import { getLanguageServer, testWorkspacePath } from './server.js';
Expand Down Expand Up @@ -621,10 +622,17 @@ test('Directives', async () => {
await requestCompletionItemToVueServer('fixture.vue', 'vue', `<template><div v-p|></div></template>`, 'v-pre');
});

// FIXME:
test.skip('Directive Modifiers', async () => {
test('Directive Modifiers', async () => {
expect(
(await requestCompletionListToVueServer(
'fixture.vue',
'vue',
`<template><div :foo.|></div></template>`,
)).items.filter(item => item.label === 'camel').length,
).toBe(1);

expect(
(await requestCompletionListToTsServer(
'fixture.vue',
'vue',
`
Expand All @@ -633,16 +641,14 @@ test.skip('Directive Modifiers', async () => {
</template>
<script setup lang="ts">
import type { FunctionDirective } from 'vue';
let vFoo!: FunctionDirective<any, any, 'attr' | 'prop'>;
let vFoo!: import('vue').FunctionDirective<any, any, 'attr' | 'prop'>;
</script>
`,
)).items.map(item => item.label),
)).map(item => item.name),
).toMatchInlineSnapshot(`
[
"attr",
"prop"
"prop",
]
`);
});
Expand Down Expand Up @@ -1059,8 +1065,8 @@ async function requestCompletionItemToTsServer(
const completions = await requestCompletionListToTsServer(fileName, languageId, content);
let completion = completions.find((item: any) => item.name === itemLabel);
expect(completion).toBeDefined();
delete completion.data;
completion.source &&= path.relative(testWorkspacePath, completion.source).replace(/\\/g, '/');
delete completion!.data;
completion!.source &&= path.relative(testWorkspacePath, completion!.source).replace(/\\/g, '/');
return completion!;
}

Expand All @@ -1082,7 +1088,7 @@ async function requestCompletionListToTsServer(fileName: string, languageId: str
});
expect(res.success).toBe(true);

return res.body;
return res.body as ts.CompletionEntry[];
}

async function prepareDocument(fileName: string, languageId: string, content: string) {
Expand Down
6 changes: 4 additions & 2 deletions packages/language-service/lib/plugins/vue-template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,10 @@ export function create(
htmlCompletion.isIncomplete = true;
}

if (htmlCompletion.items[0]?.kind === 12 satisfies typeof CompletionItemKind.Value) {
addDirectiveModifiers(htmlCompletion, htmlCompletion.items[0], document);
}

await resolveAutoImportPlaceholder(htmlCompletion, info);
resolveComponentItemKinds(htmlCompletion);

Expand Down Expand Up @@ -336,8 +340,6 @@ export function create(
}
break;
case 12 satisfies typeof CompletionItemKind.Value:
addDirectiveModifiers(htmlCompletion, item, document);

if (
typeof item.documentation === 'object' && item.documentation.value.includes('*@deprecated*')
) {
Expand Down