fix(review): retain metadata version diagnostics across scopes
This commit is contained in:
parent
248f6bcff7
commit
0cbb2c0e2f
2 changed files with 104 additions and 7 deletions
|
|
@ -597,15 +597,22 @@ impl<'a> Document<'a> {
|
|||
}
|
||||
|
||||
fn read_metadata(&mut self) -> Result<(), String> {
|
||||
for cell in self.cells.values_mut() {
|
||||
for object in cell.objects.iter_mut().filter(|o| o.kind == RTAG_TEXT) {
|
||||
for (cell_name, cell) in &mut self.cells {
|
||||
for object in cell.objects.iter().filter(|o| o.kind == RTAG_TEXT) {
|
||||
let text = object.field(RTAG_STRING).unwrap();
|
||||
if text.starts_with(b"KLAMATH_LAYER_NAMES_") && text != LAYER_SENTINEL.as_bytes() {
|
||||
object.issues.push(Diagnostic::at(
|
||||
// Layer names apply across the library. An unknown version
|
||||
// may describe layers used outside this carrier or cell, so
|
||||
// geometry scope selection cannot establish its relevance.
|
||||
let mut diagnostic = Diagnostic::at(
|
||||
"unsupported_metadata_version",
|
||||
object.offset,
|
||||
"unsupported layer-name metadata version".to_string(),
|
||||
));
|
||||
);
|
||||
diagnostic.cell = Some(cell_name.clone());
|
||||
diagnostic.layer = object.layer;
|
||||
diagnostic.message = format!("cell {cell_name:?}: {}", diagnostic.message);
|
||||
self.global_issues.push(diagnostic);
|
||||
}
|
||||
}
|
||||
let carriers: BTreeSet<_> = cell
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@ pub fn write_layer_names(
|
|||
) -> Result<Vec<u8>, String> {
|
||||
let doc = Document::parse(input)?;
|
||||
if doc
|
||||
.issues
|
||||
.diagnostics
|
||||
.iter()
|
||||
.any(|i| i.contains("unsupported layer-name metadata version"))
|
||||
.any(|i| i.code == "unsupported_metadata_version")
|
||||
{
|
||||
return Err("cannot rewrite an unsupported layer-name metadata version".to_string());
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue