mirror of https://github.com/zkat/miette.git
Choose primary label from inside the context
This commit is contained in:
parent
d4f30ec501
commit
997a3ea782
|
|
@ -446,10 +446,16 @@ impl GraphicalReportHandler {
|
||||||
) -> fmt::Result {
|
) -> fmt::Result {
|
||||||
let (contents, lines) = self.get_lines(source, context.inner())?;
|
let (contents, lines) = self.get_lines(source, context.inner())?;
|
||||||
|
|
||||||
let primary_label = labels
|
// only consider labels from the context as primary label
|
||||||
.iter()
|
let ctx_labels = labels.iter().filter(|l| {
|
||||||
|
context.inner().offset() <= l.inner().offset()
|
||||||
|
&& l.inner().offset() + l.inner().len()
|
||||||
|
<= context.inner().offset() + context.inner().len()
|
||||||
|
});
|
||||||
|
let primary_label = ctx_labels
|
||||||
|
.clone()
|
||||||
.find(|label| label.primary())
|
.find(|label| label.primary())
|
||||||
.or_else(|| labels.first());
|
.or_else(|| ctx_labels.clone().next());
|
||||||
|
|
||||||
// sorting is your friend
|
// sorting is your friend
|
||||||
let labels = labels
|
let labels = labels
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue