diff options
| author | Blaž Hrastnik | 2022-09-11 02:09:12 +0000 |
|---|---|---|
| committer | Blaž Hrastnik | 2022-09-11 02:11:07 +0000 |
| commit | c2e41082e4b2e0e1dba6a980a7f09ccaad88cbd0 (patch) | |
| tree | ecf53d11e0f83f8a5d50585a6877f4d3fc4ebef5 | |
| parent | a15420ed1c3b46df0dade6ec6d05a0e4b26e06e0 (diff) | |
Remove the .txt suffix from tutor
The tutor file is loaded as .txt which can potentially spawn a
language server. Then the path is unset, but the LS remains active.
This can cause panics since updates are now submitted for a doc
with no path.
As a quick workaround we remove the extension which should avoid
detection.
Fixes #3730
| -rw-r--r-- | book/src/usage.md | 2 | ||||
| -rw-r--r-- | helix-term/src/application.rs | 2 | ||||
| -rw-r--r-- | helix-term/src/commands/typed.rs | 2 | ||||
| -rw-r--r-- | runtime/tutor (renamed from runtime/tutor.txt) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/book/src/usage.md b/book/src/usage.md index ba631b62..164ae267 100644 --- a/book/src/usage.md +++ b/book/src/usage.md @@ -2,7 +2,7 @@ (Currently not fully documented, see the [keymappings](./keymap.md) list for more.) -See [tutor.txt](https://github.com/helix-editor/helix/blob/master/runtime/tutor.txt) (accessible via `hx --tutor` or `:tutor`) for a vimtutor-like introduction. +See [tutor](https://github.com/helix-editor/helix/blob/master/runtime/tutor) (accessible via `hx --tutor` or `:tutor`) for a vimtutor-like introduction. ## Registers diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index ec698321..7ee5b7f1 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -157,7 +157,7 @@ impl Application { compositor.push(editor_view); if args.load_tutor { - let path = helix_loader::runtime_dir().join("tutor.txt"); + let path = helix_loader::runtime_dir().join("tutor"); editor.open(&path, Action::VerticalSplit)?; // Unset path to prevent accidentally saving to the original tutor file. doc_mut!(editor).set_path(None)?; diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index 674ce7a6..c22f8712 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -1147,7 +1147,7 @@ fn tutor( return Ok(()); } - let path = helix_loader::runtime_dir().join("tutor.txt"); + let path = helix_loader::runtime_dir().join("tutor"); cx.editor.open(&path, Action::Replace)?; // Unset path to prevent accidentally saving to the original tutor file. doc_mut!(cx.editor).set_path(None)?; diff --git a/runtime/tutor.txt b/runtime/tutor index 4a6c4425..4a6c4425 100644 --- a/runtime/tutor.txt +++ b/runtime/tutor |