From e8add6f46d0f208c96407151276a985dd34fc93f Mon Sep 17 00:00:00 2001 From: A-Walrus Date: Mon, 8 Aug 2022 22:04:41 +0300 Subject: Add error handling to set language command If you type a nonexistant language an appropriate message will show, and the language won't be changed. --- helix-term/src/commands/typed.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'helix-term/src') diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index f005d9bf..127eea0d 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -1253,7 +1253,16 @@ fn language( } let doc = doc_mut!(cx.editor); - doc.set_language_by_language_id(&args[0], cx.editor.syn_loader.clone()); + + let loader = cx.editor.syn_loader.clone(); + if args[0] == "text" { + doc.set_language(None, Some(loader)) + } else { + let ok = doc.set_language_by_language_id(&args[0], loader); + if !ok { + anyhow::bail!("invalid language: {}", args[0]); + } + } doc.detect_indent_and_line_ending(); let id = doc.id(); -- cgit v1.2.3-70-g09d2