Skip to content

chore: add editor autocompletions to site-kit #396

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 6 commits into from
Oct 15, 2024
Merged

chore: add editor autocompletions to site-kit #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5061b30
chore: add editor autocompletions to site-kit
trueadm Oct 15, 2024
3dfacbb
lint
trueadm Oct 15, 2024
a0aec07
make paths relative to current file
Rich-Harris Oct 15, 2024
bbc7655
filter
Rich-Harris Oct 15, 2024
2d15309
filter
Rich-Harris Oct 15, 2024
99ac5f0
fix
Rich-Harris Oct 15, 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
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/tutorial/[...slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
</section>

<section class="editor-container" slot="b">
<Editor />
<Editor exercise={data.exercise} />
<ImageViewer selected={$selected_file} />

{#if mobile && show_filetree}
Expand Down
23 changes: 21 additions & 2 deletions apps/svelte.dev/src/routes/tutorial/[...slug]/Editor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@
import { basicSetup } from 'codemirror';
import { onMount, tick } from 'svelte';
import { adapter_state } from './adapter.svelte';
import { autocomplete_for_svelte } from './autocompletion.js';
import './codemirror.css';
import { files, selected_file, selected_name, update_file } from './state.js';
import { toStore } from 'svelte/store';
import { autocomplete_for_svelte } from '@sveltejs/site-kit/codemirror';

/** @type {import('$lib/tutorial').Exercise}*/
export let exercise;

/** @type {HTMLDivElement} */
let container;
Expand Down Expand Up @@ -120,7 +123,23 @@
} else if (file.name.endsWith('.html')) {
lang = [html()];
} else if (file.name.endsWith('.svelte')) {
lang = [svelte(), ...autocomplete_for_svelte()];
lang = [
svelte(),
...autocomplete_for_svelte(
() => /** @type {import('$lib/tutorial').FileStub} */ ($selected_file).name,
() =>
$files
.filter(
(file) =>
file.type === 'file' &&
file.name.startsWith('/src') &&
file.name.startsWith(exercise.scope.prefix) &&
file.name !== '/src/__client.js' &&
file.name !== '/src/app.html'
)
.map((file) => file.name)
)
];
}

state = EditorState.create({
Expand Down
14 changes: 10 additions & 4 deletions packages/repl/src/lib/CodeMirror.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
import { get_repl_context } from './context';
import Message from './Message.svelte';
import { svelteTheme } from './theme';
import { autocomplete } from './autocomplete';
import { completion_for_javascript } from '@sveltejs/site-kit/codemirror';
import type { LintSource } from '@codemirror/lint';
import type { Extension } from '@codemirror/state';
import { CompletionContext } from '@codemirror/autocomplete';
import type { Lang } from './types';
import type { File, Lang } from './types';

export let diagnostics: LintSource | undefined = undefined;
export let readonly = false;
Expand Down Expand Up @@ -206,12 +206,18 @@

const { files, selected } = get_repl_context();

function get_basename(file: File) {
return `${file.name}.${file.type}`;
}

const svelte_rune_completions = svelteLanguage.data.of({
autocomplete: (context: CompletionContext) => autocomplete(context, $selected!, $files)
autocomplete: (context: CompletionContext) =>
completion_for_javascript(context, get_basename($selected!), $files.map(get_basename))
});

const js_rune_completions = javascriptLanguage.data.of({
autocomplete: (context: CompletionContext) => autocomplete(context, $selected!, $files)
autocomplete: (context: CompletionContext) =>
completion_for_javascript(context, get_basename($selected!), $files.map(get_basename))
});
</script>

Expand Down
200 changes: 0 additions & 200 deletions packages/repl/src/lib/autocomplete.ts
View file
Open in desktop

This file was deleted.

17 changes: 16 additions & 1 deletion packages/site-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@
},
"homepage": "https://github.com/sveltejs/svelte.dev/tree/main/packages/site-kit#readme",
"dependencies": {
"@lezer/common": "^1.0.4",
"@codemirror/autocomplete": "^6.9.0",
"@codemirror/commands": "^6.2.5",
"@codemirror/lang-css": "^6.2.1",
"@codemirror/lang-html": "^6.4.6",
"@codemirror/lang-javascript": "^6.2.1",
"@codemirror/language": "^6.9.0",
"@codemirror/lint": "^6.4.1",
"@codemirror/search": "^6.5.2",
"@codemirror/state": "^6.2.1",
"@codemirror/view": "^6.17.1",
"@fontsource/dm-serif-display": "^5.1.0",
"@fontsource/eb-garamond": "^5.1.0",
"@fontsource/fira-mono": "^5.1.0",
Expand All @@ -30,7 +41,8 @@
"esm-env": "^1.0.0",
"json5": "^2.2.3",
"shiki": "^1.22.0",
"svelte-persisted-store": "^0.9.2"
"svelte-persisted-store": "^0.9.2",
"@replit/codemirror-lang-svelte": "^6.0.0"
},
"devDependencies": {
"@sveltejs/kit": "^2.6.3",
Expand Down Expand Up @@ -63,6 +75,9 @@
"./stores": {
"default": "./src/lib/stores/index.ts"
},
"./codemirror": {
"default": "./src/lib/codemirror/index.js"
},
"./branding/svelte-logo.svg": "./src/lib/branding/svelte-logo.svg",
"./components": {
"default": "./src/lib/components/index.ts",
Expand Down
Loading
Loading