caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-15 01:25:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let type constructor/field access error report the name correctly (#3140)

Browse Source 
Co-authored-by: Laurenz <laurmaedje@gmail.com>
This commit is contained in:
Leedehai 2024-01-09 02:45:24 -05:00 committed by GitHub
parent 712eaaa5f4
commit 23875a0483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/typst/src/foundations/ty.rs
View File

@ -94,10 +94,10 @@ impl Type {
.constructor .constructor
.as_ref() .as_ref()
.map(|lazy| Func::from(*lazy)) .map(|lazy| Func::from(*lazy))
.ok_or_else(|| eco_format!("type self does not have a constructor")) .ok_or_else(|| eco_format!("type {self} does not have a constructor"))
} }
/// The type's associated scope of sub-definition. /// The type's associated scope that holds sub-definitions.
pub fn scope(&self) -> &'static Scope { pub fn scope(&self) -> &'static Scope {
&(self.0).0.scope &(self.0).0.scope
} }
@ -106,13 +106,13 @@ impl Type {
pub fn field(&self, field: &str) -> StrResult<&'static Value> { pub fn field(&self, field: &str) -> StrResult<&'static Value> {
self.scope() self.scope()
.get(field) .get(field)
.ok_or_else(|| eco_format!("type self does not contain field `{}`", field)) .ok_or_else(|| eco_format!("type {self} does not contain field `{field}`"))
} }
} }
// Type compatibility. // Type compatibility.
impl Type { impl Type {
/// The type's backwards-compatible name. /// The type's backward-compatible name.
pub fn compat_name(&self) -> &str { pub fn compat_name(&self) -> &str {
self.long_name() self.long_name()
} }

15
tests/typ/bugs/3110-no-type-ctor-or-field.typ Normal file
View File

@ -0,0 +1,15 @@
// Issue #3110: let the error message report the type name.
// https://github.com/typst/typst/issues/3110
// Ref: false
---
// Error: 2-9 type content does not have a constructor
#content()
---
// Error: 6-12 type integer does not contain field `MAXVAL`
#int.MAXVAL
---
// Error: 6-18 type string does not contain field `from-unïcode`
#str.from-unïcode(97)