Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
git_ui: Fix missing language injections in historical file buffer (#64683)
Sudarsh6990d3f6787c
diff --git a/Cargo.lock b/Cargo.lockindex d5bef4eea95..9e727ba650f 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -7244,6 +7244,7 @@ dependencies = ["time","time_format","tracing",+ "tree-sitter-md","ui","ui_input","unindent",diff --git a/crates/git_ui/Cargo.toml b/crates/git_ui/Cargo.tomlindex 727d4601ed3..4ea810d6410 100644--- a/crates/git_ui/Cargo.toml+++ b/crates/git_ui/Cargo.toml@@ -82,6 +82,7 @@ fs = { workspace = true, features = ["test-support"] }git = { workspace = true, features = ["test-support"] }gpui = { workspace = true, features = ["test-support"] }indoc.workspace = true+language = { workspace = true, features = ["test-support"] }pretty_assertions.workspace = trueproject = { workspace = true, features = ["test-support"] }rand.workspace = true@@ -89,6 +90,7 @@ remote_connection = { workspace = true, features = ["test-support"] }search.workspace = truesettings = { workspace = true, features = ["test-support"] }task.workspace = true+tree-sitter-md.workspace = trueunindent.workspace = trueworkspace = { workspace = true, features = ["test-support"] }zlog.workspace = truediff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rsindex e5786864d72..4db00ef647d 100644--- a/crates/git_ui/src/commit_view.rs+++ b/crates/git_ui/src/commit_view.rs@@ -1139,6 +1139,7 @@ pub(crate) async fn build_buffer(text,);let mut buffer = Buffer::build(buffer, Some(blob), Capability::ReadWrite, cx);+ buffer.set_language_registry(language_registry.clone());buffer.set_language_async(language, cx);buffer});@@ -1529,3 +1530,78 @@ fn stash_matches_index(sha: &str, stash_index: usize, repo: &Repository) -> bool.map(|entry| entry.oid.to_string() == sha).unwrap_or(false)}++#[cfg(test)]+mod tests {+ use super::*;+ use gpui::{EmptyView, TestAppContext};+ use indoc::indoc;+ use language::{Language, LanguageConfig, markdown_lang};+ use settings::SettingsStore;++ #[gpui::test]+ async fn test_build_buffer_resolves_injected_languages(cx: &mut TestAppContext) {+ cx.update(|cx| {+ let store = SettingsStore::test(cx);+ cx.set_global(store);+ });++ let language_registry = Arc::new(LanguageRegistry::test(cx.executor()));+ language_registry.add(markdown_lang());+ language_registry.add(Arc::new(markdown_inline_lang()));++ let window = cx.add_window(|_, _| EmptyView);+ let mut async_cx = window+ .update(cx, |_, window, cx| window.to_async(cx))+ .expect("window should be open");++ let text = indoc! {"+ # Title++ Some *emphasized* text.+ "}+ .to_string();+ let blob = Arc::new(GitBlob {+ path: RepoPath::new("notes.md").unwrap(),+ worktree_id: WorktreeId::from_usize(0),+ is_deleted: false,+ is_binary: false,+ display_name: "abc1234 - notes.md".into(),+ }) as Arc<dyn File>;++ let buffer = build_buffer(text, blob, &language_registry, &mut async_cx)+ .await+ .expect("buffer should build");++ cx.run_until_parked();++ buffer.read_with(cx, |buffer, _| {+ let language = buffer.language().expect("buffer should have a language");+ assert_eq!(language.name().as_ref(), "Markdown");++ let layers = buffer+ .snapshot()+ .syntax_layers()+ .map(|layer| layer.language.name().to_string())+ .collect::<Vec<_>>();+ assert!(+ layers.iter().any(|name| name == "Markdown-Inline"),+ "emphasis, links, and fenced code blocks are highlighted by the injected \+ Markdown-Inline grammar, but the buffer parsed with layers {layers:?}",+ );+ });+ }++ fn markdown_inline_lang() -> Language {+ Language::new(+ LanguageConfig {+ name: "Markdown-Inline".into(),+ hidden: true,+ ..LanguageConfig::default()+ },+ Some(tree_sitter_md::INLINE_LANGUAGE.into()),+ )+ .with_highlights_query("(emphasis) @emphasis")+ .unwrap()+ }+}