caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-13 20:46:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix autocompletion of half-completed import item (#5531)

Browse Source 
Co-authored-by: Laurenz <laurmaedje@gmail.com>
This commit is contained in:
Yifan Song 2024-12-18 19:11:13 +01:00 committed by GitHub
parent 9b697d59ae
commit 45c866fbb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/typst-ide/src/complete.rs
View File

@ -521,11 +521,13 @@ fn complete_imports(ctx: &mut CompletionContext) -> bool {
if_chain! {
if ctx.leaf.kind() == SyntaxKind::Ident;
if let Some(parent) = ctx.leaf.parent();
if parent.kind() == SyntaxKind::ImportItems;
if parent.kind() == SyntaxKind::ImportItemPath;
if let Some(grand) = parent.parent();
if let Some(ast::Expr::Import(import)) = grand.get().cast();
if grand.kind() == SyntaxKind::ImportItems;
if let Some(great) = grand.parent();
if let Some(ast::Expr::Import(import)) = great.get().cast();
if let Some(ast::Imports::Items(items)) = import.imports();
if let Some(source) = grand.children().find(|child| child.is::<ast::Expr>());
if let Some(source) = great.children().find(|child| child.is::<ast::Expr>());
then {
ctx.from = ctx.leaf.offset();
import_item_completions(ctx, items, &source);
@ -1743,4 +1745,18 @@ mod tests {
test("#figure(cap)", -1).must_apply("caption", "caption: [${}]");
}
#[test]
fn test_autocomplete_import_items() {
let world = TestWorld::new("#import \"other.typ\": ")
.with_source("second.typ", "#import \"other.typ\": th")
.with_source("other.typ", "#let this = 1; #let that = 2");
test_with_path(&world, "main.typ", 21)
.must_include(["*", "this", "that"])
.must_exclude(["figure"]);
test_with_path(&world, "second.typ", 23)
.must_include(["this", "that"])
.must_exclude(["*", "figure"]);
}
}