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

Simplify buffer constructor methods

Browse source 
Don't expose the `buffer::History` to callers of `language::Buffer`
This commit is contained in:
Max Brunsfeld 2021-10-26 14:26:15 -07:00
parent 4069db4959
commit 5bfbeb55c0
5 changed files with 60 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/project/src/worktree.rs
View file

@ -12,7 +12,7 @@ use gpui::{
executor, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext,
Task, UpgradeModelHandle, WeakModelHandle,
};
use language::{Buffer, History, LanguageRegistry, Operation, Rope};
use language::{Buffer, LanguageRegistry, Operation, Rope};
use lazy_static::lazy_static;
use lsp::LanguageServer;
use parking_lot::Mutex;
@ -892,10 +892,7 @@ impl LocalWorktree {
.cloned()
});
let buffer = cx.add_model(|cx| {
Buffer::from_history(
0,
History::new(contents.into()),
Some(Box::new(file)),
Buffer::from_file(0, contents, Box::new(file), cx).with_language(
language,
language_server,
cx,
@ -1321,14 +1318,9 @@ impl RemoteWorktree {
let remote_buffer = response.buffer.ok_or_else(|| anyhow!("empty buffer"))?;
let buffer_id = remote_buffer.id as usize;
let buffer = cx.add_model(|cx| {
Buffer::from_proto(
replica_id,
remote_buffer,
Some(Box::new(file)),
language,
cx,
)
.unwrap()
Buffer::from_proto(replica_id, remote_buffer, Some(Box::new(file)))
.unwrap()
.with_language(language, None, cx)
});
this.update(&mut cx, |this, cx| {
let this = this.as_remote_mut().unwrap();