Skip to content

fix(language-core): intersect __VLS_slots with __VLS_ctx.$slots #5083

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 12 commits into from
Feb 12, 2025
Merged

fix(language-core): intersect __VLS_slots with __VLS_ctx.$slots #5083

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6a54fc2
fix: intersect local `$slots` with `__VLS_ctx.$slots`
KazariEX Dec 24, 2024
210ac37
test: update
KazariEX Dec 24, 2024
0641670
fix: intersect `__VLS_slots` with ...
KazariEX Dec 24, 2024
09bda6c
fix: omit string index from `__VLS_ctx.$slots`
KazariEX Dec 24, 2024
86a9fce
chore: lint
KazariEX Dec 24, 2024
ff25171
refactor: rename some properties
KazariEX Dec 24, 2024
1e0c3a2
Merge branch 'master' of https://github.com/vuejs/language-tools into…
KazariEX Jan 7, 2025
c33836c
Update index.ts
KazariEX Jan 7, 2025
32c173e
Merge branch 'master' of https://github.com/vuejs/language-tools into…
KazariEX Jan 17, 2025
aeabdbb
wip:
KazariEX Feb 12, 2025
f99cc75
Merge branch 'master' of https://github.com/vuejs/language-tools into…
KazariEX Feb 12, 2025
b57b57f
test: update snapshot
KazariEX Feb 12, 2025
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
Prev Previous commit
Next Next commit
Update index.ts
  • Loading branch information
@KazariEX
KazariEX committed Jan 7, 2025
commit c33836cacb39ff9a3e8d0321266c89f8a340eca2
4 changes: 2 additions & 2 deletions packages/language-core/lib/codegen/template/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function* generateSlots(
): Generator<Code> {
const name = getSlotsPropertyName(options.vueCompilerOptions.target);
if (!options.hasDefineSlots) {
yield `var __VLS_slots!: `;
yield `var __VLS_slots!: __VLS_OmitStringIndex<typeof __VLS_ctx.${name}> & `;
for (const { expVar, propsVar } of ctx.dynamicSlots) {
ctx.hasSlot = true;
yield `Partial<Record<NonNullable<typeof ${expVar}>, (props: typeof ${propsVar}) => any>> &${newLine}`;
Expand Down Expand Up @@ -99,7 +99,7 @@ function* generateSlots(
}
yield `}${endOfLine}`;
}
return `__VLS_OmitStringIndex<typeof __VLS_ctx.${name}> & typeof ${options.slotsAssignName ?? `__VLS_slots`}`;
return `typeof ${options.slotsAssignName ?? `__VLS_slots`}`;
}

function* generateInheritedAttrs(
Expand Down
Loading