Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2087 from zed-industries/buffer-language-registry

Browse source 
Assign the language registry to all buffers in the project
This commit is contained in:
Max Brunsfeld 2023-01-25 11:25:40 -08:00 • committed by GitHub
commit 9db55b3029
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/project/src/project.rs
View file

@ -1480,6 +1480,10 @@ impl Project {
buffer: &ModelHandle<Buffer>, buffer: &ModelHandle<Buffer>,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) -> Result<()> { ) -> Result<()> {
buffer.update(cx, |buffer, _| {
buffer.set_language_registry(self.languages.clone())
});
let remote_id = buffer.read(cx).remote_id(); let remote_id = buffer.read(cx).remote_id();
let open_buffer = if self.is_remote() || self.is_shared() { let open_buffer = if self.is_remote() || self.is_shared() {
OpenBuffer::Strong(buffer.clone()) OpenBuffer::Strong(buffer.clone())
@ -1803,7 +1807,6 @@ impl Project {
if buffer.language().map_or(true, |old_language| { if buffer.language().map_or(true, |old_language| {
!Arc::ptr_eq(old_language, &new_language) !Arc::ptr_eq(old_language, &new_language)
}) { }) {
buffer.set_language_registry(self.languages.clone());
buffer.set_language(Some(new_language.clone()), cx); buffer.set_language(Some(new_language.clone()), cx);
} }
}); });