move initialization up to avoid lsps starting with old config

Author: mattwparas

helix-term/src/application.rs

@@ -138,6 +138,27 @@ impl Application {
         let editor_view = Box::new(ui::EditorView::new(Keymaps::new(keys)));
         compositor.push(editor_view);
 
+        let mut jobs = Jobs::new();
+        {
+            let syn_loader = editor.syn_loader.clone();
+
+            let mut cx = crate::commands::Context {
+                register: None,
+                count: std::num::NonZeroUsize::new(1),
+                editor: &mut editor,
+                callback: Vec::new(),
+                on_next_key_callback: None,
+                jobs: &mut jobs,
+            };
+
+            crate::commands::ScriptingEngine::run_initialization_script(
+                &mut cx,
+                config.clone(),
+                syn_loader,
+                terminal.backend().terminal().event_reader(),
+            );
+        }
+
         if args.load_tutor {
             let path = helix_loader::runtime_file(Path::new("tutor"));
             editor.open(&path, Action::VerticalSplit)?;
@@ -241,36 +262,16 @@ impl Application {
         ])
         .context("build signal handler")?;
 
-        let mut app = Self {
+        let app = Self {
             compositor,
             terminal,
             editor,
             config,
             signals,
-            jobs: Jobs::new(),
+            jobs,
             lsp_progress: LspProgressMap::new(),
         };
 
-        {
-            let syn_loader = app.editor.syn_loader.clone();
-
-            let mut cx = crate::commands::Context {
-                register: None,
-                count: std::num::NonZeroUsize::new(1),
-                editor: &mut app.editor,
-                callback: Vec::new(),
-                on_next_key_callback: None,
-                jobs: &mut app.jobs,
-            };
-
-            crate::commands::ScriptingEngine::run_initialization_script(
-                &mut cx,
-                app.config.clone(),
-                syn_loader,
-                app.terminal.backend().terminal().event_reader(),
-            );
-        }
-
         Ok(app)
     }
 

helix-term/src/commands/engine/steel/mod.rs

@@ -998,7 +998,6 @@ fn dynamic_set_option(
 
     let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
 
-    // let mut config = serde_json::json!(&cx.editor.config().deref());
     let mut config = serde_json::json!(configuration.load_config().editor);
     let pointer = format!("/{}", key.replace('.', "/"));
     let jvalue = config.pointer_mut(&pointer).ok_or_else(key_error)?;
@@ -3061,18 +3060,6 @@ impl HelixConfiguration {
         Ok(())
     }
 
-    // fn get_individual_language_config_for_filename(
-    //     &self,
-    //     file_name: SteelString,
-    // ) -> Option<IndividualLanguageConfiguration> {
-    //     self.language_configuration
-    //         .load()
-    //         .language_config_for_file_name(std::path::Path::new(file_name.as_str()))
-    //         .map(|config| IndividualLanguageConfiguration {
-    //             config: (*config).clone(),
-    //         })
-    // }
-
     fn update_language_server_config(
         &mut self,
         lsp: SteelString,