Merge branch 'master' into feat/diagnostic-picker-display-lsp

helix-term/src/ui/picker.rs

@@ -585,8 +585,7 @@ impl<T: 'static + Send + Sync, D: 'static + Send + Sync> Picker<T, D> {
                     // retrieve the `Arc<Path>` key. The `path` in scope here is a `&Path` and
                     // we can cheaply clone the key for the preview highlight handler.
                     let (path, preview) = self.preview_cache.get_key_value(path).unwrap();
-                    if matches!(preview, CachedPreview::Document(doc) if doc.language_config().is_none())
+                    if matches!(preview, CachedPreview::Document(doc) if doc.syntax().is_none()) {
-                    {
                         helix_event::send_blocking(&self.preview_highlight_handler, path.clone());
                     }
                     return Some((Preview::Cached(preview), range));
@@ -624,27 +623,27 @@ impl<T: 'static + Send + Sync, D: 'static + Send + Sync> Picker<T, D> {
                             if content_type.is_binary() {
                                 return Ok(CachedPreview::Binary);
                             }
-                            Document::open(
+                            let mut doc = Document::open(
                                 &path,
                                 None,
                                 false,
                                 editor.config.clone(),
                                 editor.syn_loader.clone(),
                             )
-                            .map_or(
+                            .or(Err(std::io::Error::new(
-                                Err(std::io::Error::new(
+                                std::io::ErrorKind::NotFound,
-                                    std::io::ErrorKind::NotFound,
+                                "Cannot open document",
-                                    "Cannot open document",
+                            )))?;
-                                )),
+                            let loader = editor.syn_loader.load();
-                                |doc| {
+                            if let Some(language_config) = doc.detect_language_config(&loader) {
-                                    // Asynchronously highlight the new document
+                                doc.language = Some(language_config);
-                                    helix_event::send_blocking(
+                                // Asynchronously highlight the new document
-                                        &self.preview_highlight_handler,
+                                helix_event::send_blocking(
-                                        path.clone(),
+                                    &self.preview_highlight_handler,
-                                    );
+                                    path.clone(),
-                                    Ok(CachedPreview::Document(Box::new(doc)))
+                                );
-                                },
+                            }
-                            )
+                            Ok(CachedPreview::Document(Box::new(doc)))
                         } else {
                             Err(std::io::Error::new(
                                 std::io::ErrorKind::NotFound,

helix-term/src/ui/picker/handlers.rs

@@ -66,16 +66,15 @@ impl<T: 'static + Send + Sync, D: 'static + Send + Sync> AsyncHook
                 return;
             };
 
-            if doc.language_config().is_some() {
+            if doc.syntax().is_some() {
                 return;
             }
 
-            let loader = editor.syn_loader.load();
+            let Some(language) = doc.language_config().map(|config| config.language()) else {
-            let Some(language_config) = doc.detect_language_config(&loader) else {
                 return;
             };
-            let language = language_config.language();
+
-            doc.language = Some(language_config);
+            let loader = editor.syn_loader.load();
             let text = doc.text().clone();
 
             tokio::task::spawn_blocking(move || {

languages.toml

@@ -648,6 +648,7 @@ comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 grammar = "ruby"
 language-servers = [ "crystalline" ]
+formatter = { command = "crystal", args = ["tool", "format", "-"] }
 
 [[language]]
 name = "c-sharp"

runtime/queries/ecma/highlights.scm

@@ -235,6 +235,8 @@
   (template_string)
 ] @string
 
+(escape_sequence) @constant.character.escape
+
 (regex) @string.regexp
 (number) @constant.numeric.integer