aboutsummaryrefslogtreecommitdiff
path: root/helix-view/src/editor.rs
diff options
context:
space:
mode:
authorOmnikar2021-11-06 15:57:14 +0000
committerGitHub2021-11-06 15:57:14 +0000
commited23057ff8e01404ab608682445b4f293b6142ed (patch)
tree611fc6777bc80159227f078d751bc49856b81b02 /helix-view/src/editor.rs
parent2c1313c0648977540c395de584b4293c1909cbf7 (diff)
Launch with defaults upon invalid config/theme (#982)
* Launch with defaults upon invalid config/theme * Startup message if there is a problematic config * Statusline error if trying to switch to an invalid theme * Use serde `deny_unknown_fields` for config
Diffstat (limited to 'helix-view/src/editor.rs')
-rw-r--r--helix-view/src/editor.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 6aa8b04d..17cd3d7b 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -34,7 +34,7 @@ where
}
#[derive(Debug, Clone, PartialEq, Deserialize)]
-#[serde(rename_all = "kebab-case", default)]
+#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
pub struct Config {
/// Padding to keep between the edge of the screen and the cursor when scrolling. Defaults to 5.
pub scrolloff: usize,
@@ -195,6 +195,12 @@ impl Editor {
}
pub fn set_theme(&mut self, theme: Theme) {
+ // `ui.selection` is the only scope required to be able to render a theme.
+ if theme.find_scope_index("ui.selection").is_none() {
+ self.set_error("Invalid theme: `ui.selection` required".to_owned());
+ return;
+ }
+
let scopes = theme.scopes();
for config in self
.syn_loader