Merge remote-tracking branch 'upstream/master' into readonly

helix-term/src/ui/picker.rs

@@ -427,12 +427,9 @@ impl<T: Item + 'static> Picker<T> {
  (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
  CachedPreview::LargeFile
  }
- _ => {
- // TODO: enable syntax highlighting; blocked by async rendering
- Document::open(path, None, None, editor.config.clone(), false)
- .map(|doc| CachedPreview::Document(Box::new(doc)))
- .unwrap_or(CachedPreview::NotFound)
- }
+ _ => Document::open(path, None, None, editor.config.clone(), false)
+ .map(|doc| CachedPreview::Document(Box::new(doc)))
+ .unwrap_or(CachedPreview::NotFound),
  },
  )
  .unwrap_or(CachedPreview::NotFound);