Skip to content

fix(language-service): filter special tags #4596

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
merged 2 commits into from
Jul 20, 2024
Merged

fix(language-service): filter special tags #4596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88fee53
fix(language-service): filter special tags
so1ve Jul 18, 2024
7d39ed6
Merge branch 'master' into pr/4596
johnsoncodehk Jul 20, 2024
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
36 changes: 26 additions & 10 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 @@ -15,6 +15,8 @@ import { loadModelModifiersData, loadTemplateData } from './data';
let builtInData: html.HTMLDataV1;
let modelData: html.HTMLDataV1;

const specialTags = new Set(['slot', 'component', 'template']);

export function create(
mode: 'html' | 'pug',
ts: typeof import('typescript'),
Expand Down Expand Up @@ -419,14 +421,8 @@ export function create(

if (builtInData.tags) {
for (const tag of builtInData.tags) {
if (tag.name === 'slot') {
continue;
}
if (tag.name === 'component') {
continue;
}
if (tag.name === 'template') {
continue;
if (specialTags.has(tag.name)) {
tag.name = createInternalItemId('specialTag', [tag.name]);
}
if (casing.tag === TagNameCasing.Kebab) {
tag.name = hyphenateTag(tag.name);
Expand Down Expand Up @@ -735,6 +731,26 @@ export function create(

for (const item of completionList.items) {

if (specialTags.has(item.label)) {
completionList.items = completionList.items.filter(i => i !== item);
}

const nameId = readInternalItemId(item.label);

if (nameId) {
const name = nameId.args[0];
item.label = name;
if (item.textEdit) {
item.textEdit.newText = name;
};
if (item.insertText) {
item.insertText = name;
}
if (item.sortText) {
item.sortText = name;
}
}

const itemIdKey = typeof item.documentation === 'string' ? item.documentation : item.documentation?.value;
const itemId = itemIdKey ? readInternalItemId(itemIdKey) : undefined;

Expand Down Expand Up @@ -848,15 +864,15 @@ export function create(
}
};

function createInternalItemId(type: 'componentEvent' | 'componentProp', args: string[]) {
function createInternalItemId(type: 'componentEvent' | 'componentProp' | 'specialTag', args: string[]) {
return '__VLS_::' + type + '::' + args.join(',');
}

function readInternalItemId(key: string) {
if (key.startsWith('__VLS_::')) {
const strs = key.split('::');
return {
type: strs[1] as 'componentEvent' | 'componentProp',
type: strs[1] as 'componentEvent' | 'componentProp' | 'specialTag',
args: strs[2].split(','),
};
}
Expand Down