suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: do not pass extra argument

pull/12203/head
Nikita Revenco 2024-12-09 14:27:52 +00:00
parent 2b28ce94be
commit 4b5da9e667
5 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helix-view/src/editor.rs
View File

@ -1649,15 +1649,12 @@ impl Editor {
} }
Action::HorizontalSplit | Action::VerticalSplit => { Action::HorizontalSplit | Action::VerticalSplit => {
// copy the current view, unless there is no view yet // copy the current view, unless there is no view yet
let config = self.config();
let gutters = config.gutters.clone();
let enable_diagnostics = config.enable_diagnostics;
let view = self let view = self
.tree .tree
.try_get(self.tree.focus) .try_get(self.tree.focus)
.filter(|v| id == v.doc) // Different Document .filter(|v| id == v.doc) // Different Document
.cloned() .cloned()
.unwrap_or_else(|| View::new(id, gutters, enable_diagnostics)); .unwrap_or_else(|| View::new(id, self.config().gutters.clone()));
let view_id = self.tree.split( let view_id = self.tree.split(
view, view,
match action { match action {
@ -1831,11 +1828,7 @@ impl Editor {
.map(|(&doc_id, _)| doc_id) .map(|(&doc_id, _)| doc_id)
.next() .next()
.unwrap_or_else(|| self.new_document(Document::default(self.config.clone()))); .unwrap_or_else(|| self.new_document(Document::default(self.config.clone())));
let view = View::new( let view = View::new(doc_id, self.config().gutters.clone());
doc_id,
self.config().gutters.clone(),
self.config().enable_diagnostics,
);
let view_id = self.tree.insert(view); let view_id = self.tree.insert(view);
let doc = doc_mut!(self, &doc_id); let doc = doc_mut!(self, &doc_id);
doc.ensure_view_init(view_id); doc.ensure_view_init(view_id);

8
helix-view/src/gutter.rs
View File

@ -346,7 +346,7 @@ mod tests {
#[test] #[test]
fn test_default_gutter_widths() { fn test_default_gutter_widths() {
let mut view = View::new(DocumentId::default(), GutterConfig::default(), true); let mut view = View::new(DocumentId::default(), GutterConfig::default());
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("abc\n\tdef"); let rope = Rope::from_str("abc\n\tdef");
@ -371,7 +371,7 @@ mod tests {
..Default::default() ..Default::default()
}; };
let mut view = View::new(DocumentId::default(), gutters, true); let mut view = View::new(DocumentId::default(), gutters);
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("abc\n\tdef"); let rope = Rope::from_str("abc\n\tdef");
@ -389,7 +389,7 @@ mod tests {
line_numbers: GutterLineNumbersConfig { min_width: 10 }, line_numbers: GutterLineNumbersConfig { min_width: 10 },
}; };
let mut view = View::new(DocumentId::default(), gutters, true); let mut view = View::new(DocumentId::default(), gutters);
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("abc\n\tdef"); let rope = Rope::from_str("abc\n\tdef");
@ -411,7 +411,7 @@ mod tests {
line_numbers: GutterLineNumbersConfig { min_width: 1 }, line_numbers: GutterLineNumbersConfig { min_width: 1 },
}; };
let mut view = View::new(DocumentId::default(), gutters, true); let mut view = View::new(DocumentId::default(), gutters);
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("a\nb"); let rope = Rope::from_str("a\nb");

4
helix-view/src/handlers/diagnostics.rs
View File

@ -69,13 +69,13 @@ pub struct DiagnosticsHandler {
// but to fix that larger architecutre changes are needed // but to fix that larger architecutre changes are needed
impl Clone for DiagnosticsHandler { impl Clone for DiagnosticsHandler {
fn clone(&self) -> Self { fn clone(&self) -> Self {
Self::new(self.active) Self::new()
} }
} }
impl DiagnosticsHandler { impl DiagnosticsHandler {
#[allow(clippy::new_without_default)] #[allow(clippy::new_without_default)]
pub fn new(enable_diagnostics: bool) -> Self { pub fn new() -> Self {
let active_generation = Arc::new(AtomicUsize::new(0)); let active_generation = Arc::new(AtomicUsize::new(0));
let events = DiagnosticTimeout { let events = DiagnosticTimeout {
active_generation: active_generation.clone(), active_generation: active_generation.clone(),

28
helix-view/src/tree.rs
View File

@ -736,22 +736,22 @@ mod test {
width: 180, width: 180,
height: 80, height: 80,
}); });
let mut view = View::new(DocumentId::default(), GutterConfig::default(), true); let mut view = View::new(DocumentId::default(), GutterConfig::default());
view.area = Rect::new(0, 0, 180, 80); view.area = Rect::new(0, 0, 180, 80);
tree.insert(view); tree.insert(view);
let l0 = tree.focus; let l0 = tree.focus;
let view = View::new(DocumentId::default(), GutterConfig::default(), true); let view = View::new(DocumentId::default(), GutterConfig::default());
tree.split(view, Layout::Vertical); tree.split(view, Layout::Vertical);
let r0 = tree.focus; let r0 = tree.focus;
tree.focus = l0; tree.focus = l0;
let view = View::new(DocumentId::default(), GutterConfig::default(), true); let view = View::new(DocumentId::default(), GutterConfig::default());
tree.split(view, Layout::Horizontal); tree.split(view, Layout::Horizontal);
let l1 = tree.focus; let l1 = tree.focus;
tree.focus = l0; tree.focus = l0;
let view = View::new(DocumentId::default(), GutterConfig::default(), true); let view = View::new(DocumentId::default(), GutterConfig::default());
tree.split(view, Layout::Vertical); tree.split(view, Layout::Vertical);
// Tree in test // Tree in test
@ -792,28 +792,28 @@ mod test {
}); });
let doc_l0 = DocumentId::default(); let doc_l0 = DocumentId::default();
let mut view = View::new(doc_l0, GutterConfig::default(), true); let mut view = View::new(doc_l0, GutterConfig::default());
view.area = Rect::new(0, 0, 180, 80); view.area = Rect::new(0, 0, 180, 80);
tree.insert(view); tree.insert(view);
let l0 = tree.focus; let l0 = tree.focus;
let doc_r0 = DocumentId::default(); let doc_r0 = DocumentId::default();
let view = View::new(doc_r0, GutterConfig::default(), true); let view = View::new(doc_r0, GutterConfig::default());
tree.split(view, Layout::Vertical); tree.split(view, Layout::Vertical);
let r0 = tree.focus; let r0 = tree.focus;
tree.focus = l0; tree.focus = l0;
let doc_l1 = DocumentId::default(); let doc_l1 = DocumentId::default();
let view = View::new(doc_l1, GutterConfig::default(), true); let view = View::new(doc_l1, GutterConfig::default());
tree.split(view, Layout::Horizontal); tree.split(view, Layout::Horizontal);
let l1 = tree.focus; let l1 = tree.focus;
tree.focus = l0; tree.focus = l0;
let doc_l2 = DocumentId::default(); let doc_l2 = DocumentId::default();
let view = View::new(doc_l2, GutterConfig::default(), true); let view = View::new(doc_l2, GutterConfig::default());
tree.split(view, Layout::Vertical); tree.split(view, Layout::Vertical);
let l2 = tree.focus; let l2 = tree.focus;
@ -908,19 +908,19 @@ mod test {
width: tree_area_width, width: tree_area_width,
height: 80, height: 80,
}); });
let mut view = View::new(DocumentId::default(), GutterConfig::default(), true); let mut view = View::new(DocumentId::default(), GutterConfig::default());
view.area = Rect::new(0, 0, 180, 80); view.area = Rect::new(0, 0, 180, 80);
tree.insert(view); tree.insert(view);
let view = View::new(DocumentId::default(), GutterConfig::default(), true); let view = View::new(DocumentId::default(), GutterConfig::default());
tree.split(view, Layout::Vertical); tree.split(view, Layout::Vertical);
let view = View::new(DocumentId::default(), GutterConfig::default(), true); let view = View::new(DocumentId::default(), GutterConfig::default());
tree.split(view, Layout::Horizontal); tree.split(view, Layout::Horizontal);
tree.remove(tree.focus); tree.remove(tree.focus);
let view = View::new(DocumentId::default(), GutterConfig::default(), true); let view = View::new(DocumentId::default(), GutterConfig::default());
tree.split(view, Layout::Vertical); tree.split(view, Layout::Vertical);
// Make sure that we only have one level in the tree. // Make sure that we only have one level in the tree.
@ -946,12 +946,12 @@ mod test {
width: tree_area_width, width: tree_area_width,
height: tree_area_height, height: tree_area_height,
}); });
let mut view = View::new(DocumentId::default(), GutterConfig::default(), true); let mut view = View::new(DocumentId::default(), GutterConfig::default());
view.area = Rect::new(0, 0, tree_area_width, tree_area_height); view.area = Rect::new(0, 0, tree_area_width, tree_area_height);
tree.insert(view); tree.insert(view);
for _ in 0..9 { for _ in 0..9 {
let view = View::new(DocumentId::default(), GutterConfig::default(), true); let view = View::new(DocumentId::default(), GutterConfig::default());
tree.split(view, Layout::Vertical); tree.split(view, Layout::Vertical);
} }

12
helix-view/src/view.rs
View File

@ -168,7 +168,7 @@ impl fmt::Debug for View {
} }
impl View { impl View {
pub fn new(doc: DocumentId, gutters: GutterConfig, enable_diagnostics: bool) -> Self { pub fn new(doc: DocumentId, gutters: GutterConfig) -> Self {
Self { Self {
id: ViewId::default(), id: ViewId::default(),
doc, doc,
@ -179,7 +179,7 @@ impl View {
object_selections: Vec::new(), object_selections: Vec::new(),
gutters, gutters,
doc_revisions: HashMap::new(), doc_revisions: HashMap::new(),
diagnostics_handler: DiagnosticsHandler::new(enable_diagnostics), diagnostics_handler: DiagnosticsHandler::new(),
} }
} }
@ -695,7 +695,7 @@ mod tests {
#[test] #[test]
fn test_text_pos_at_screen_coords() { fn test_text_pos_at_screen_coords() {
let mut view = View::new(DocumentId::default(), GutterConfig::default(), true); let mut view = View::new(DocumentId::default(), GutterConfig::default());
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("abc\n\tdef"); let rope = Rope::from_str("abc\n\tdef");
let mut doc = Document::from( let mut doc = Document::from(
@ -870,7 +870,6 @@ mod tests {
layout: vec![GutterType::Diagnostics], layout: vec![GutterType::Diagnostics],
line_numbers: GutterLineNumbersConfig::default(), line_numbers: GutterLineNumbersConfig::default(),
}, },
true,
); );
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("abc\n\tdef"); let rope = Rope::from_str("abc\n\tdef");
@ -901,7 +900,6 @@ mod tests {
layout: vec![], layout: vec![],
line_numbers: GutterLineNumbersConfig::default(), line_numbers: GutterLineNumbersConfig::default(),
}, },
true,
); );
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("abc\n\tdef"); let rope = Rope::from_str("abc\n\tdef");
@ -926,7 +924,7 @@ mod tests {
#[test] #[test]
fn test_text_pos_at_screen_coords_cjk() { fn test_text_pos_at_screen_coords_cjk() {
let mut view = View::new(DocumentId::default(), GutterConfig::default(), true); let mut view = View::new(DocumentId::default(), GutterConfig::default());
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("Hi! こんにちは皆さん"); let rope = Rope::from_str("Hi! こんにちは皆さん");
let mut doc = Document::from( let mut doc = Document::from(
@ -1010,7 +1008,7 @@ mod tests {
#[test] #[test]
fn test_text_pos_at_screen_coords_graphemes() { fn test_text_pos_at_screen_coords_graphemes() {
let mut view = View::new(DocumentId::default(), GutterConfig::default(), true); let mut view = View::new(DocumentId::default(), GutterConfig::default());
view.area = Rect::new(40, 40, 40, 40); view.area = Rect::new(40, 40, 40, 40);
let rope = Rope::from_str("Hèl̀l̀ò world!"); let rope = Rope::from_str("Hèl̀l̀ò world!");
let mut doc = Document::from( let mut doc = Document::from(