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

Correctly incorporate editor settings into diagnostic header rendering

Browse source
This commit is contained in:
Max Brunsfeld 2021-12-16 16:36:33 -08:00
parent ae147a379d
commit fb492a9fb8
8 changed files with 37 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/diagnostics/src/diagnostics.rs
View file

@ -1,7 +1,5 @@
use std::{cmp, sync::Arc};
use editor::{
diagnostic_block_renderer, diagnostic_style,
diagnostic_block_renderer, diagnostic_header_renderer,
display_map::{BlockDisposition, BlockProperties},
Editor, ExcerptProperties, MultiBuffer,
};
@ -12,6 +10,7 @@ use gpui::{
use language::Point;
use postage::watch;
use project::Project;
use std::cmp;
use workspace::Workspace;
action!(Toggle);
@ -129,27 +128,10 @@ impl workspace::Item for ProjectDiagnostics {
.count()
as u8
+ 1,
render_header: Some(Arc::new({
let settings = settings.clone();
move |_| {
let editor_style =
&settings.borrow().theme.editor;
let mut text_style = editor_style.text.clone();
text_style.color = diagnostic_style(
primary_diagnostic.severity,
true,
&editor_style,
)
.text;
Text::new(
primary_diagnostic.message.clone(),
text_style,
)
.boxed()
}
})),
render_header: Some(diagnostic_header_renderer(
primary_diagnostic,
build_settings.clone(),
)),
},
excerpts_cx,
);