Skip to content

fix $props() and $props.id() autocompletion #1309

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 1 commit into from
Apr 17, 2025
Merged

fix $props() and $props.id() autocompletion #1309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 5 additions & 16 deletions packages/site-kit/src/lib/codemirror/autocompletionDataProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ const is_statement = (node) => {
* @type {import("./types").Test}
*/
const is_props = (node, _, selected) => {
if (selected.type !== 'svelte') return false;
if (!selected.endsWith('.svelte')) return false;

return (
node.name === 'VariableName' &&
Expand Down Expand Up @@ -577,28 +577,17 @@ const is_bindable = (node, context) => {
* @type {import("./types").Test}
*/
const is_props_id_call = (node, context, selected) => {
if (!selected.match(/\.svelte$/)) return false;
if (!is_state_call(node, context, selected)) return false;
if (node.parent?.parent?.name !== 'Script') return false;
return true;
};

/**
* @type {import("./types").Test}
*/
const is_props_id = (node, context, selected) => {
if (!selected.match(/\.svelte$/)) return false;
if (!is_state(node, context, selected)) return false;
if (node.parent?.parent?.name !== 'Script') return false;
return true;
return (
is_state_call(node, context, selected) && node.parent?.parent?.parent?.parent?.name === 'Script'
);
};

export const runes = [
{ snippet: '$state(${})', test: is_state },
{ snippet: '$state', test: is_state_call },
{ snippet: '$props()', test: is_props },
{ snippet: '$props.id', test: is_props_id_call },
{ snippet: '$props.id()', test: is_props_id },
{ snippet: '$props.id()', test: is_props },
{ snippet: '$derived(${});', test: is_state },
{ snippet: '$derived', test: is_state_call },
{ snippet: '$derived.by(() => {\n\t${}\n});', test: is_state },
Expand Down
Loading