Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-tengler committed Mar 1, 2024
1 parent fcc3845 commit 116e859
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,18 @@ impl ValidateRequiredArguments<'_> {
.map(|arg| arg.name.item)
.any(|x| x == def.name.item)
{
return Err(vec![Diagnostic::error(
ValidationMessage::MissingRequiredArgument {
argument_name: def.name.item,
node_name,
root_name: root_name_with_location.item,
type_string: self.program.schema.get_type_string(&def.type_),
},
node_location,
)
.annotate("Root definition:", root_name_with_location.location)]);
return Err(vec![
Diagnostic::error(
ValidationMessage::MissingRequiredArgument {
argument_name: def.name.item,
node_name,
root_name: root_name_with_location.item,
type_string: self.program.schema.get_type_string(&def.type_),
},
node_location,
)
.annotate("Root definition:", root_name_with_location.location),
]);
}
}
}
Expand Down
50 changes: 31 additions & 19 deletions compiler/crates/schema/src/flatbuffer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -628,25 +628,37 @@ mod tests {
assert!(fb_schema.read_type("Aaaa".intern()).is_none());
assert!(fb_schema.read_type("Zzzz".intern()).is_none());

assert!(fb_schema
.read_directive(DirectiveName("ref_type".intern()))
.is_some());
assert!(fb_schema
.read_directive(DirectiveName("extern_type".intern()))
.is_some());
assert!(fb_schema
.read_directive(DirectiveName("fetchable".intern()))
.is_some());

assert!(fb_schema
.read_directive(DirectiveName("goto".intern()))
.is_none());
assert!(fb_schema
.read_directive(DirectiveName("aaaa".intern()))
.is_none());
assert!(fb_schema
.read_directive(DirectiveName("zzzz".intern()))
.is_none());
assert!(
fb_schema
.read_directive(DirectiveName("ref_type".intern()))
.is_some()
);
assert!(
fb_schema
.read_directive(DirectiveName("extern_type".intern()))
.is_some()
);
assert!(
fb_schema
.read_directive(DirectiveName("fetchable".intern()))
.is_some()
);

assert!(
fb_schema
.read_directive(DirectiveName("goto".intern()))
.is_none()
);
assert!(
fb_schema
.read_directive(DirectiveName("aaaa".intern()))
.is_none()
);
assert!(
fb_schema
.read_directive(DirectiveName("zzzz".intern()))
.is_none()
);

Ok(())
}
Expand Down
9 changes: 4 additions & 5 deletions compiler/crates/schema/src/in_memory/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1634,11 +1634,10 @@ impl InMemorySchema {
let field_name = field_def.name.value;
let field_location = Location::new(source_location_key, field_def.name.span);
if let Some(prev_location) = existing_fields.insert(field_name, field_location) {
return Err(vec![Diagnostic::error(
SchemaError::DuplicateField(field_name),
field_location,
)
.annotate("previously defined here", prev_location)]);
return Err(vec![
Diagnostic::error(SchemaError::DuplicateField(field_name), field_location)
.annotate("previously defined here", prev_location),
]);
}
let arguments = self.build_arguments(&field_def.arguments, source_location_key)?;
let directives = self.build_directive_values(&field_def.directives);
Expand Down

0 comments on commit 116e859

Please sign in to comment.