Skip to content

fix: fix autocomplete for $props.id() #1307

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
Apr 17, 2025
Merged

fix: fix autocomplete for $props.id() #1307

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3119c41
update autocomplete stuff to current svelte 5
Ocean-OS Dec 7, 2024
e75aba6
Merge branch 'main' into update-autocomplete
Ocean-OS Dec 7, 2024
85feae7
update autocomplete
Ocean-OS Apr 16, 2025
796d949
Merge branch 'main' into update-autocomplete
Ocean-OS Apr 16, 2025
b032bbd
lint
Ocean-OS Apr 16, 2025
0c04048
fix autocomplete for `$props.id()`
Ocean-OS Apr 16, 2025
36def5e
lint
Ocean-OS Apr 16, 2025
6b154ba
Merge branch 'main' into update-autocomplete
Ocean-OS Apr 16, 2025
7e41815
Merge remote-tracking branch 'upstream/main' into update-autocomplete
Ocean-OS Apr 16, 2025
8ace346
add file type check
Ocean-OS Apr 16, 2025
3493373
Merge branch 'update-autocomplete' of https://github.com/Ocean-OS/sve…
Ocean-OS Apr 16, 2025
37b5c33
fix file check, the types were a lie
Ocean-OS Apr 16, 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
20 changes: 15 additions & 5 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 @@ -576,18 +576,28 @@ const is_bindable = (node, context) => {
/**
* @type {import("./types").Test}
*/
const is_props_id = (node) => {
if (node.parent?.name !== 'VariableDeclaration') return false;
if (node.parent?.parent?.name !== 'VariableDeclarator') return false;
if (node.parent?.parent?.parent?.name !== 'Program') return false;
if (node.parent?.firstChild?.name !== 'Identifier') return false;
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;
};

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: '$derived(${});', test: is_state },
{ snippet: '$derived', test: is_state_call },
Expand Down
Loading