suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better panic messages for when you're missing selection scopes (#608)

pull/640/head
Kirawi 2021-08-21 22:15:33 -04:00 committed by GitHub
parent f9375f449c
commit 59e0ceef8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helix-term/src/ui/editor.rs
View File

@ -195,7 +195,9 @@ impl EditorView {
.find_scope_index("diagnostic") .find_scope_index("diagnostic")
.or_else(|| theme.find_scope_index("ui.cursor")) .or_else(|| theme.find_scope_index("ui.cursor"))
.or_else(|| theme.find_scope_index("ui.selection")) .or_else(|| theme.find_scope_index("ui.selection"))
.expect("no selection scope found!"); .expect(
"at least one of the following scopes must be defined in the theme: `diagnostic`, `ui.cursor`, or `ui.selection`",
);
doc.diagnostics() doc.diagnostics()
.iter() .iter()
@ -220,7 +222,7 @@ impl EditorView {
let selection_scope = theme let selection_scope = theme
.find_scope_index("ui.selection") .find_scope_index("ui.selection")
.expect("no selection scope found!"); .expect("could not find `ui.selection` scope in the theme!");
let base_cursor_scope = theme let base_cursor_scope = theme
.find_scope_index("ui.cursor") .find_scope_index("ui.cursor")
.unwrap_or(selection_scope); .unwrap_or(selection_scope);