From 6a1b153ca2746875d2bef7759c1f8192b3579724 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 13:31:13 +0100 Subject: [PATCH 1/8] fix editor init --- packages/editor/src/lib/Editor.svelte | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index 25745da90e..5404b62c9e 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -108,7 +108,7 @@ } state = EditorState.create({ - doc: file.contents, + doc: '\n', extensions: [ ...extensions, ...(lang || []), @@ -118,6 +118,7 @@ }); editor_states.set(file.name, state); + select_state(file.name); } } } @@ -135,13 +136,11 @@ function select_state(selected_name: string | null) { const state = - (selected_name && editor_states.get(selected_name)) || - EditorState.create({ - doc: '', - extensions: [EditorState.readOnly.of(true)] - }); + (selected_name && editor_states.get(selected_name)) - editor_view.setState(state); + if (state) { + editor_view.setState(state); + } } $effect(() => { From 4475907fea720b69a00dd410ed0313d77ff77091 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 13:31:53 +0100 Subject: [PATCH 2/8] fix editor init --- packages/editor/src/lib/Editor.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index 5404b62c9e..72c0767ab0 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -108,7 +108,7 @@ } state = EditorState.create({ - doc: '\n', + doc: file.contents, extensions: [ ...extensions, ...(lang || []), From bd7028b109f045d369e0418008b02a1204f7a909 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 13:33:16 +0100 Subject: [PATCH 3/8] fix editor init --- packages/editor/src/lib/Editor.svelte | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index 72c0767ab0..da05778b26 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -136,11 +136,12 @@ function select_state(selected_name: string | null) { const state = - (selected_name && editor_states.get(selected_name)) - - if (state) { - editor_view.setState(state); - } + (selected_name && editor_states.get(selected_name)) || + EditorState.create({ + doc: '', + extensions: [EditorState.readOnly.of(true)] + }); + editor_view.setState(state); } $effect(() => { From f429001c5c9e9e5ce63cf21394f44029e4ca73b9 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 13:35:32 +0100 Subject: [PATCH 4/8] fix editor init --- packages/editor/src/lib/Editor.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index da05778b26..3267037f35 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -118,7 +118,7 @@ }); editor_states.set(file.name, state); - select_state(file.name); + // select_state(file.name); } } } @@ -141,6 +141,7 @@ doc: '', extensions: [EditorState.readOnly.of(true)] }); + editor_view.setState(state); } From 28c17703e6691cb4f59414b59ba5d830387ec2bd Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 13:37:24 +0100 Subject: [PATCH 5/8] fix editor init --- packages/editor/src/lib/Editor.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index 3267037f35..a81a0c3fda 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -118,7 +118,7 @@ }); editor_states.set(file.name, state); - // select_state(file.name); + select_state(file.name); } } } From 0e7a8fd8599fde83d47d9cf995299af4a42429b4 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 14:54:53 +0100 Subject: [PATCH 6/8] tune --- packages/editor/src/lib/Editor.svelte | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index a81a0c3fda..ee51da057e 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -135,14 +135,12 @@ } function select_state(selected_name: string | null) { - const state = - (selected_name && editor_states.get(selected_name)) || - EditorState.create({ - doc: '', - extensions: [EditorState.readOnly.of(true)] - }); + const state = (selected_name && editor_states.get(selected_name)); + - editor_view.setState(state); + if (state) { + editor_view.setState(state); + } } $effect(() => { From 44f7241b11daf49af44924b4235bb78e68b58a07 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 15:15:39 +0100 Subject: [PATCH 7/8] more fixes --- packages/editor/src/lib/Editor.svelte | 3 +-- packages/repl/src/lib/Input/ComponentSelector.svelte | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index ee51da057e..48a4027d11 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -135,8 +135,7 @@ } function select_state(selected_name: string | null) { - const state = (selected_name && editor_states.get(selected_name)); - + const state = selected_name && editor_states.get(selected_name); if (state) { editor_view.setState(state); diff --git a/packages/repl/src/lib/Input/ComponentSelector.svelte b/packages/repl/src/lib/Input/ComponentSelector.svelte index 387bb2c22d..433565002c 100644 --- a/packages/repl/src/lib/Input/ComponentSelector.svelte +++ b/packages/repl/src/lib/Input/ComponentSelector.svelte @@ -50,6 +50,7 @@ handle_select(edited_file.name); rebundle(); + workspace.invalidate(); editing_name = null; } From 48317f0eceab8cc0f4d66e744c341685ecf50452 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 18 Oct 2024 17:55:07 +0100 Subject: [PATCH 8/8] tweak --- packages/editor/src/lib/Editor.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte index 48a4027d11..c9c5cf0224 100644 --- a/packages/editor/src/lib/Editor.svelte +++ b/packages/editor/src/lib/Editor.svelte @@ -118,7 +118,7 @@ }); editor_states.set(file.name, state); - select_state(file.name); + editor_view.setState(state); } } }