Rework shared commit editors (#24274)
Rework of https://github.com/zed-industries/zed/pull/24130
Uses
1033c0b57e
`COMMIT_EDITMSG` language-related definitions (thanks @d1y )
Instead of using real `.git/COMMIT_EDITMSG` file, create a buffer
without FS representation, stored in the `Repository` and shared the
regular way via the `BufferStore`.
Adds a knowledge of what `Git Commit` language is, and uses it in the
buffers which are rendered in the git panel.
Release Notes:
- N/A
---------
Co-authored-by: Conrad Irwin <conrad@zed.dev>
Co-authored-by: d1y <chenhonzhou@gmail.com>
Co-authored-by: Smit <smit@zed.dev>
This commit is contained in:
parent
da4bad3a55
commit
868e3f75b2
17 changed files with 428 additions and 372 deletions
|
@ -31,6 +31,25 @@ mod yaml;
|
|||
#[exclude = "*.rs"]
|
||||
struct LanguageDir;
|
||||
|
||||
/// A shared grammar for plain text, exposed for reuse by downstream crates.
|
||||
#[cfg(feature = "tree-sitter-gitcommit")]
|
||||
pub static LANGUAGE_GIT_COMMIT: std::sync::LazyLock<Arc<Language>> =
|
||||
std::sync::LazyLock::new(|| {
|
||||
Arc::new(Language::new(
|
||||
LanguageConfig {
|
||||
name: "Git Commit".into(),
|
||||
soft_wrap: Some(language::language_settings::SoftWrap::EditorWidth),
|
||||
matcher: LanguageMatcher {
|
||||
path_suffixes: vec!["COMMIT_EDITMSG".to_owned()],
|
||||
first_line_pattern: None,
|
||||
},
|
||||
line_comments: vec![Arc::from("#")],
|
||||
..LanguageConfig::default()
|
||||
},
|
||||
Some(tree_sitter_gitcommit::LANGUAGE.into()),
|
||||
))
|
||||
});
|
||||
|
||||
pub fn init(languages: Arc<LanguageRegistry>, node_runtime: NodeRuntime, cx: &mut App) {
|
||||
#[cfg(feature = "load-grammars")]
|
||||
languages.register_native_grammars([
|
||||
|
@ -53,6 +72,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node_runtime: NodeRuntime, cx: &mu
|
|||
("tsx", tree_sitter_typescript::LANGUAGE_TSX),
|
||||
("typescript", tree_sitter_typescript::LANGUAGE_TYPESCRIPT),
|
||||
("yaml", tree_sitter_yaml::LANGUAGE),
|
||||
("gitcommit", tree_sitter_gitcommit::LANGUAGE),
|
||||
]);
|
||||
|
||||
macro_rules! language {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue