language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-08-03 17:58:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: correct field access dot target (#1489)

Browse source 
* fix: correct field access dot target

* test: add cases about #1267
This commit is contained in:
Myriad-Dreamin 2025-03-11 23:33:46 +08:00 • committed by GitHub
parent db1ff20a6d
commit 4bf6cdb9ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 182 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

48
crates/tinymist-analysis/src/syntax/matcher.rs
View file

@ -71,7 +71,37 @@ pub fn node_ancestors<'a, 'b>(
/// Finds the first ancestor node that is an expression.
pub fn first_ancestor_expr(node: LinkedNode) -> Option<LinkedNode> {
node_ancestors(&node).find(|n| n.is::<ast::Expr>()).cloned()
node_ancestors(&node)
.find(|n| n.is::<ast::Expr>())
.map(|mut node| {
while matches!(node.kind(), SyntaxKind::Ident | SyntaxKind::MathIdent) {
let Some(parent) = node.parent() else {
return node;
};
let Some(field_access) = parent.cast::<ast::FieldAccess>() else {
return node;
};
let dot = parent
.children()
.find(|n| matches!(n.kind(), SyntaxKind::Dot));
// Since typst matches `field()` by `case_last_match`, when the field access
// `x.` (`Ident(x).Error("")`), it will match the `x` as the
// field. We need to check dot position to filter out such cases.
if dot.is_some_and(|dot| {
dot.offset() <= node.offset() && field_access.field().span() == node.span()
}) {
node = parent;
} else {
return node;
}
}
node
})
.cloned()
}
/// A node that is an ancestor of the given node or the previous sibling
@ -715,7 +745,10 @@ pub fn classify_syntax(node: LinkedNode, cursor: usize) -> Option<SyntaxClass<'_
matches!(mode, InterpretMode::Markup)
&& (matches!(
dot_target.kind(),
SyntaxKind::Ident | SyntaxKind::MathIdent | SyntaxKind::FuncCall
SyntaxKind::Ident
| SyntaxKind::MathIdent
| SyntaxKind::FieldAccess
| SyntaxKind::FuncCall
) || (matches!(
dot_target.prev_leaf().as_deref().map(SyntaxNode::kind),
Some(SyntaxKind::Hash)
@ -1534,13 +1567,24 @@ Text
#[test]
fn test_markup_chain_access() {
assert_snapshot!(access_node("#a.b.", 5), @"a.b");
assert_snapshot!(access_field("#a.b.", 5), @"DotSuffix: 5");
assert_snapshot!(access_node("#a.b.c.", 7), @"a.b.c");
assert_snapshot!(access_field("#a.b.c.", 7), @"DotSuffix: 7");
assert_snapshot!(access_node("#context a.", 11), @"a");
assert_snapshot!(access_field("#context a.", 11), @"DotSuffix: 11");
assert_snapshot!(access_node("#context a.b.", 13), @"a.b");
assert_snapshot!(access_field("#context a.b.", 13), @"DotSuffix: 13");
assert_snapshot!(access_node("#a.at(1).", 9), @"a.at(1)");
assert_snapshot!(access_field("#a.at(1).", 9), @"DotSuffix: 9");
assert_snapshot!(access_node("#context a.at(1).", 17), @"a.at(1)");
assert_snapshot!(access_field("#context a.at(1).", 17), @"DotSuffix: 17");
assert_snapshot!(access_node("#a.at(1).c.", 11), @"a.at(1).c");
assert_snapshot!(access_field("#a.at(1).c.", 11), @"DotSuffix: 11");
assert_snapshot!(access_node("#context a.at(1).c.", 19), @"a.at(1).c");
assert_snapshot!(access_field("#context a.at(1).c.", 19), @"DotSuffix: 19");
}
#[test]