config text editor

initial work on text editor
show proper error in footer
add open config editor to keybind
proper theming
update command bar

updated CHANGELOG

better dark theme.

Author: casperstorm

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 Added:
 
+- Config editor pane for editing the config file in-app
 - Improved legibility of the returned values of `MONITOR` list (`/monitor L`)
 
 Fixed:

Cargo.lock

@@ -84,6 +84,7 @@ iced = { workspace = true, features = [
     "x11",
     "crisp",
     "web-colors",
+    "highlighter",
 ] }
 percent-encoding = { workspace = true }
 

Cargo.toml

@@ -211,6 +211,12 @@
       "css": "eraser",
       "code": 61741,
       "src": "fontawesome"
+    },
+    {
+      "uid": "6533bdc16ab201eb3f3b27ce989cab33",
+      "css": "folder-open-empty",
+      "code": 61717,
+      "src": "fontawesome"
     }
   ]
 }

assets/fontello/config.json

@@ -37,6 +37,8 @@ pub enum Internal {
     Highlights,
     #[strum(serialize = "Channel Discovery")]
     ChannelDiscovery(Option<Server>),
+    #[strum(serialize = "Config Editor")]
+    ConfigEditor,
 }
 
 impl Buffer {
@@ -114,6 +116,7 @@ impl Internal {
         Self::Logs,
         Self::Highlights,
         Self::ChannelDiscovery(None),
+        Self::ConfigEditor,
     ];
 
     pub fn key(&self) -> String {
@@ -122,6 +125,7 @@ impl Internal {
             Internal::Logs => "logs",
             Internal::Highlights => "highlights",
             Internal::ChannelDiscovery(_) => "channel-discovery",
+            Internal::ConfigEditor => "config-editor",
         }
         .to_string()
     }

data/src/buffer.rs

@@ -528,7 +528,7 @@ impl Config {
             .map_err(|e| Error::LoadConfigFile(e.to_string()))?;
 
         let config = toml::Deserializer::parse(content.as_ref())
-            .map_err(|e| Error::Parse(e.to_string()))?;
+            .map_err(|e| Error::Parse(ParseError::new(&content, &e)))?;
 
         let Configuration {
             theme,
@@ -559,7 +559,7 @@ impl Config {
         } = serde_ignored::deserialize(config, |ignored| {
             log::warn!("[config.toml] Ignoring unknown setting: {ignored}");
         })
-        .map_err(|e| Error::Parse(e.to_string()))?;
+        .map_err(|e| Error::Parse(ParseError::new(&content, &e)))?;
 
         let servers = ServerMap::new(
             servers,
@@ -787,6 +787,32 @@ pub fn random_nickname_with_seed<R: Rng>(rng: &mut R) -> String {
     rand_nick
 }
 
+#[derive(Debug, Clone)]
+pub struct ParseError {
+    /// Short description of the problem, e.g. `invalid basic string`.
+    pub message: String,
+    /// Full rendered error, including a snippet of the offending TOML.
+    pub details: String,
+    /// Zero-indexed line of the parse error in the config file.
+    pub line: Option<usize>,
+}
+
+impl ParseError {
+    fn new(content: &str, error: &toml::de::Error) -> Self {
+        let line = error.span().map(|span| {
+            content[..span.start.min(content.len())]
+                .matches('\n')
+                .count()
+        });
+
+        Self {
+            message: error.message().to_owned(),
+            details: error.to_string(),
+            line,
+        }
+    }
+}
+
 #[derive(Debug, Error, Clone)]
 pub enum Error {
     #[error("config could not be read: {0}")]
@@ -795,8 +821,8 @@ pub enum Error {
     ExecutePasswordCommand(String),
     #[error("{0}")]
     Io(String),
-    #[error("{0}")]
-    Parse(String),
+    #[error("{}", .0.details)]
+    Parse(ParseError),
     #[error("UTF8 parsing error: {0}")]
     StrUtf8Error(#[from] str::Utf8Error),
     #[error("UTF8 parsing error: {0}")]

data/src/config.rs

@@ -37,6 +37,7 @@ pub struct Keyboard {
     pub cycle_previous_unread_buffer: KeyBinds,
     pub mark_as_read: KeyBinds,
     pub quit_application: KeyBinds,
+    pub open_config_editor: KeyBinds,
     pub open_config_file: KeyBinds,
 }
 
@@ -75,6 +76,7 @@ impl Default for Keyboard {
                 KeyBind::cycle_previous_unread_buffer().into(),
             mark_as_read: KeyBind::mark_as_read().into(),
             quit_application: KeyBind::quit_application().into(),
+            open_config_editor: KeyBind::open_config_editor().into(),
             open_config_file: KeyBind::open_config_file().into(),
         }
     }
@@ -128,6 +130,7 @@ impl Keyboard {
         );
         push(&self.mark_as_read, MarkAsRead);
         push(&self.quit_application, QuitApplication);
+        push(&self.open_config_editor, OpenConfigEditor);
         push(&self.open_config_file, OpenConfigFile);
 
         shortcuts

data/src/config/keys.rs

@@ -132,6 +132,7 @@ impl Kind {
             }
             Buffer::Internal(buffer::Internal::FileTransfers) => None,
             Buffer::Internal(buffer::Internal::ChannelDiscovery(_)) => None,
+            Buffer::Internal(buffer::Internal::ConfigEditor) => None,
         }
     }
 }

data/src/history.rs

@@ -107,6 +107,7 @@ pub enum Command {
     CycleNextUnreadBuffer,
     CyclePreviousUnreadBuffer,
     MarkAsRead,
+    OpenConfigEditor,
     OpenConfigFile,
 }
 
@@ -295,9 +296,10 @@ impl KeyBind {
     #[cfg(not(target_os = "linux"))]
     default!(quit_application);
     #[cfg(target_os = "macos")]
-    default!(open_config_file, ",", COMMAND);
+    default!(open_config_editor, ",", COMMAND);
     #[cfg(not(target_os = "macos"))]
-    default!(open_config_file, ",", CTRL);
+    default!(open_config_editor, ",", CTRL);
+    default!(open_config_file);
 }
 
 impl From<(keyboard::Key, keyboard::Modifiers)> for KeyBind {

data/src/shortcut.rs

@@ -51,4 +51,5 @@ Each shortcut accepts either a single keybind string or an array of keybind stri
 | `theme_editor`                 | Toggle Theme Editor Window          | <kbd>⌘</kbd> + <kbd>t</kbd>                         | <kbd>ctrl</kbd> + <kbd>t</kbd>                      |
 | `highlights`                   | Toggle Highlights Window            | <kbd>⌘</kbd> + <kbd>i</kbd>                         | <kbd>ctrl</kbd> + <kbd>i</kbd>                      |
 | `quit_application`             | Quit Halloy                         | None                                                | None                                                |
-| `open_config_file`             | Open settings file in system editor | <kbd>⌘</kbd> + <kbd>,</kbd>                         | <kbd>ctrl</kbd> + <kbd>,</kbd>None                  |
+| `open_config_editor`           | Toggle Config Editor Buffer         | <kbd>⌘</kbd> + <kbd>,</kbd>                         | <kbd>ctrl</kbd> + <kbd>,</kbd>                      |
+| `open_config_file`             | Open settings file in system editor | None                                                | None                                                |