mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Resovled behavioral inconsistency with how projects with multiple roots are handled

Browse source
This commit is contained in:
Mikayla Maki 2022-10-17 13:08:05 -07:00
parent 19c98bb5ad
commit 354fefe61b
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/editor/src/element.rs
View file

@ -1276,6 +1276,7 @@ impl EditorElement {
line_height: f32, line_height: f32,
style: &EditorStyle, style: &EditorStyle,
line_layouts: &[text_layout::Line], line_layouts: &[text_layout::Line],
include_root: bool,
cx: &mut LayoutContext, cx: &mut LayoutContext,
) -> (f32, Vec<BlockLayout>) { ) -> (f32, Vec<BlockLayout>) {
let editor = if let Some(editor) = self.view.upgrade(cx) { let editor = if let Some(editor) = self.view.upgrade(cx) {
@ -1379,7 +1380,7 @@ impl EditorElement {
let font_size = let font_size =
(style.text_scale_factor * self.style.text.font_size).round(); (style.text_scale_factor * self.style.text.font_size).round();
let path = buffer.resolve_file_path(cx, true); let path = buffer.resolve_file_path(cx, include_root);
let mut filename = None; let mut filename = None;
let mut parent_path = None; let mut parent_path = None;
// Can't use .and_then() because `.file_name()` and `.parent()` return references :( // Can't use .and_then() because `.file_name()` and `.parent()` return references :(
@ -1608,6 +1609,7 @@ impl Element for EditorElement {
let mut highlighted_rows = None; let mut highlighted_rows = None;
let mut highlighted_ranges = Vec::new(); let mut highlighted_ranges = Vec::new();
let mut show_scrollbars = false; let mut show_scrollbars = false;
let mut include_root = false;
self.update_view(cx.app, |view, cx| { self.update_view(cx.app, |view, cx| {
let display_map = view.display_map.update(cx, |map, cx| map.snapshot(cx)); let display_map = view.display_map.update(cx, |map, cx| map.snapshot(cx));
@ -1670,6 +1672,11 @@ impl Element for EditorElement {
} }
show_scrollbars = view.show_scrollbars(); show_scrollbars = view.show_scrollbars();
include_root = view
.project
.as_ref()
.map(|project| project.read(cx).visible_worktrees(cx).count() > 1)
.unwrap_or_default()
}); });
let line_number_layouts = let line_number_layouts =
@ -1712,6 +1719,7 @@ impl Element for EditorElement {
line_height, line_height,
&style, &style,
&line_layouts, &line_layouts,
include_root,
cx, cx,
); );