Keymap presentation refinements and underlying restructuring + consistent config use

book/src/themes.md

@@ -252,10 +252,14 @@ These scopes are used for theming the editor interface.
 | `ui.background`             |                                                                                                |
 | `ui.background.separator`   | Picker separator below input line                                                              |
 | `ui.cursor`                 |                                                                                                |
+| `ui.cursor.normal`          |                                                                                                |
 | `ui.cursor.insert`          |                                                                                                |
 | `ui.cursor.select`          |                                                                                                |
 | `ui.cursor.match`           | Matching bracket etc.                                                                          |
 | `ui.cursor.primary`         | Cursor with primary selection                                                                  |
+| `ui.cursor.primary.normal`  |                                                                                                |
+| `ui.cursor.primary.insert`  |                                                                                                |
+| `ui.cursor.primary.select`  |                                                                                                |
 | `ui.gutter`                 | Gutter                                                                                         |
 | `ui.gutter.selected`        | Gutter for the line the cursor is on                                                           |
 | `ui.linenr`                 | Line numbers                                                                                   |

helix-core/src/lib.rs

@@ -3,7 +3,6 @@ pub use encoding_rs as encoding;
 pub mod auto_pairs;
 pub mod chars;
 pub mod comment;
-pub mod config;
 pub mod diagnostic;
 pub mod diff;
 pub mod graphemes;

helix-core/src/macros.rs

@@ -7,7 +7,7 @@ macro_rules! hashmap {
     ($($key:expr => $value:expr),*) => {
         {
             let _cap = hashmap!(@count $($key),*);
-            let mut _map = ::std::collections::HashMap::with_capacity(_cap);
+            let mut _map = std::collections::HashMap::with_capacity(_cap);
             $(
                 let _ = _map.insert($key, $value);
             )*

helix-core/src/syntax.rs

@@ -60,13 +60,21 @@ fn default_timeout() -> u64 {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct Configuration {
+pub struct LanguageConfigurations {
     pub language: Vec<LanguageConfiguration>,
 }
 
-impl Default for Configuration {
+impl LanguageConfigurations {
+    /// Attemps to deserialize a merged user configured languages.toml with the repository languages.toml file.
+    pub fn merged() -> Result<Self, toml::de::Error> {
+        helix_loader::merged_lang_config()?.try_into()
+    }
+}
+impl Default for LanguageConfigurations {
     fn default() -> Self {
-        crate::config::default_syntax_loader()
+       helix_loader::default_lang_configs()
+            .try_into()
+            .expect("Failed to deserialize built-in languages.toml into LanguageConfigurations")
     }
 }
 
@@ -75,11 +83,11 @@ impl Default for Configuration {
 #[serde(rename_all = "kebab-case", deny_unknown_fields)]
 pub struct LanguageConfiguration {
     #[serde(rename = "name")]
-    pub language_id: String, // c-sharp, rust
+    pub language_id: String,       // c-sharp, rust
     pub scope: String,             // source.rust
     pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
     #[serde(default)]
-    pub shebangs: Vec<String>, // interpreter(s) associated with language
+    pub shebangs: Vec<String>,     // interpreter(s) associated with language
     pub roots: Vec<String>,        // these indicate project roots <.git, Cargo.toml>
     pub comment_token: Option<String>,
     pub max_line_length: Option<usize>,
@@ -561,7 +569,7 @@ pub struct Loader {
 }
 
 impl Loader {
-    pub fn new(config: Configuration) -> Self {
+    pub fn new(config: LanguageConfigurations) -> Self {
         let mut loader = Self {
             language_configs: Vec::new(),
             language_config_ids_by_extension: HashMap::new(),
@@ -2278,7 +2286,7 @@ mod test {
         "#,
         );
 
-        let loader = Loader::new(Configuration { language: vec![] });
+        let loader = Loader::new(LanguageConfigurations { language: vec![] });
         let language = get_language("rust").unwrap();
 
         let query = Query::new(language, query_str).unwrap();
@@ -2337,7 +2345,7 @@ mod test {
         .map(String::from)
         .collect();
 
-        let loader = Loader::new(Configuration { language: vec![] });
+        let loader = Loader::new(LanguageConfigurations { language: vec![] });
 
         let language = get_language("rust").unwrap();
         let config = HighlightConfiguration::new(
@@ -2440,7 +2448,7 @@ mod test {
     ) {
         let source = Rope::from_str(source);
 
-        let loader = Loader::new(Configuration { language: vec![] });
+        let loader = Loader::new(LanguageConfigurations { language: vec![] });
         let language = get_language(language_name).unwrap();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();

helix-loader/src/grammar.rs

@@ -191,7 +191,7 @@ pub fn build_grammars(target: Option<String>) -> Result<()> {
 // merged. The `grammar_selection` key of the config is then used to filter
 // down all grammars into a subset of the user's choosing.
 fn get_grammar_configs() -> Result<Vec<GrammarConfiguration>> {
-    let config: Configuration = crate::config::user_lang_config()
+    let config: Configuration = crate::merged_lang_config()
         .context("Could not parse languages.toml")?
         .try_into()?;
 
@@ -511,7 +511,7 @@ fn mtime(path: &Path) -> Result<SystemTime> {
 /// Gives the contents of a file from a language's `runtime/queries/<lang>`
 /// directory
 pub fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::Error> {
-    let path = crate::RUNTIME_DIR
+    let path = crate::runtime_dir()
         .join("queries")
         .join(language)
         .join(filename);