Load workspace and editor key bindings from a JSON file

crates/gpui/src/app.rs

@@ -10,7 +10,7 @@ use crate::{
     AssetCache, AssetSource, ClipboardItem, FontCache, PathPromptOptions, TextLayoutCache,
 };
 pub use action::*;
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, Context, Result};
 use collections::btree_map;
 use keymap::MatchResult;
 use lazy_static::lazy_static;
@@ -870,6 +870,7 @@ impl MutableAppContext {
             .get(name)
             .ok_or_else(|| anyhow!("unknown action {}", name))?;
         callback(argument.unwrap_or("{}"))
+            .with_context(|| format!("invalid data for action {}", name))
     }
 
     pub fn add_action<A, V, F>(&mut self, handler: F)

crates/gpui/src/keymap.rs

@@ -1,5 +1,5 @@
 use crate::Action;
-use anyhow::anyhow;
+use anyhow::{anyhow, Result};
 use std::{
     any::Any,
     collections::{HashMap, HashSet},
@@ -168,20 +168,26 @@ impl Keymap {
 
 impl Binding {
     pub fn new<A: Action>(keystrokes: &str, action: A, context: Option<&str>) -> Self {
+        Self::load(keystrokes, Box::new(action), context).unwrap()
+    }
+
+    pub fn load(keystrokes: &str, action: Box<dyn Action>, context: Option<&str>) -> Result<Self> {
         let context = if let Some(context) = context {
-            Some(ContextPredicate::parse(context).unwrap())
+            Some(ContextPredicate::parse(context)?)
         } else {
             None
         };
 
-        Self {
-            keystrokes: keystrokes
-                .split_whitespace()
-                .map(|key| Keystroke::parse(key).unwrap())
-                .collect(),
-            action: Box::new(action),
+        let keystrokes = keystrokes
+            .split_whitespace()
+            .map(|key| Keystroke::parse(key))
+            .collect::<Result<_>>()?;
+
+        Ok(Self {
+            keystrokes,
+            action,
             context,
-        }
+        })
     }
 }