Remove concept of git diff refresh from Item
trait
This commit is contained in:
parent
cede296b04
commit
8d662edb6c
11 changed files with 109 additions and 127 deletions
|
@ -40,7 +40,10 @@ use language::{
|
|||
language_settings::ShowWhitespaceSetting, Bias, CursorShape, DiagnosticSeverity, OffsetUtf16,
|
||||
Selection,
|
||||
};
|
||||
use project::ProjectPath;
|
||||
use project::{
|
||||
project_settings::{GitGutterSetting, ProjectSettings},
|
||||
ProjectPath,
|
||||
};
|
||||
use smallvec::SmallVec;
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
|
@ -51,7 +54,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
use text::Point;
|
||||
use workspace::{item::Item, GitGutterSetting, WorkspaceSettings};
|
||||
use workspace::item::Item;
|
||||
|
||||
enum FoldMarkers {}
|
||||
|
||||
|
@ -551,11 +554,8 @@ impl EditorElement {
|
|||
let scroll_top = scroll_position.y() * line_height;
|
||||
|
||||
let show_gutter = matches!(
|
||||
settings::get::<WorkspaceSettings>(cx)
|
||||
.git
|
||||
.git_gutter
|
||||
.unwrap_or_default(),
|
||||
GitGutterSetting::TrackedFiles
|
||||
settings::get::<ProjectSettings>(cx).git.git_gutter,
|
||||
Some(GitGutterSetting::TrackedFiles)
|
||||
);
|
||||
|
||||
if show_gutter {
|
||||
|
|
|
@ -720,17 +720,6 @@ impl Item for Editor {
|
|||
})
|
||||
}
|
||||
|
||||
fn git_diff_recalc(
|
||||
&mut self,
|
||||
_project: ModelHandle<Project>,
|
||||
cx: &mut ViewContext<Self>,
|
||||
) -> Task<Result<()>> {
|
||||
self.buffer().update(cx, |multibuffer, cx| {
|
||||
multibuffer.git_diff_recalc(cx);
|
||||
});
|
||||
Task::ready(Ok(()))
|
||||
}
|
||||
|
||||
fn to_item_events(event: &Self::Event) -> SmallVec<[ItemEvent; 2]> {
|
||||
let mut result = SmallVec::new();
|
||||
match event {
|
||||
|
|
|
@ -343,17 +343,6 @@ impl MultiBuffer {
|
|||
self.read(cx).symbols_containing(offset, theme)
|
||||
}
|
||||
|
||||
pub fn git_diff_recalc(&mut self, _: &mut ModelContext<Self>) {
|
||||
// let buffers = self.buffers.borrow();
|
||||
// for buffer_state in buffers.values() {
|
||||
// if buffer_state.buffer.read(cx).needs_git_diff_recalc() {
|
||||
// buffer_state
|
||||
// .buffer
|
||||
// .update(cx, |buffer, cx| buffer.git_diff_recalc(cx))
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
pub fn edit<I, S, T>(
|
||||
&mut self,
|
||||
edits: I,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue