caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix suggestions for '.' after code mode has exited. (#4470)

Browse Source
This commit is contained in:
shinyfelix 2024-07-09 17:22:08 +02:00 committed by GitHub
parent 34990f7f0e
commit b1219395b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,6 +334,13 @@ fn math_completions(ctx: &mut CompletionContext) {
/// Complete field accesses. /// Complete field accesses.
fn complete_field_accesses(ctx: &mut CompletionContext) -> bool { fn complete_field_accesses(ctx: &mut CompletionContext) -> bool {
// Used to determine whether trivia nodes are allowed before '.'.
// During an inline expression in markup mode trivia nodes exit the inline expression.
let in_markup: bool = matches!(
ctx.leaf.parent_kind(),
None | Some(SyntaxKind::Markup) | Some(SyntaxKind::Ref)
);
// Behind an expression plus dot: "emoji.|". // Behind an expression plus dot: "emoji.|".
if_chain! { if_chain! {
if ctx.leaf.kind() == SyntaxKind::Dot if ctx.leaf.kind() == SyntaxKind::Dot
@ -341,6 +348,7 @@ fn complete_field_accesses(ctx: &mut CompletionContext) -> bool {
&& ctx.leaf.text() == "."); && ctx.leaf.text() == ".");
if ctx.leaf.range().end == ctx.cursor; if ctx.leaf.range().end == ctx.cursor;
if let Some(prev) = ctx.leaf.prev_sibling(); if let Some(prev) = ctx.leaf.prev_sibling();
if !in_markup || prev.range().end == ctx.leaf.range().start;
if prev.is::<ast::Expr>(); if prev.is::<ast::Expr>();
if prev.parent_kind() != Some(SyntaxKind::Markup) || if prev.parent_kind() != Some(SyntaxKind::Markup) ||
prev.prev_sibling_kind() == Some(SyntaxKind::Hash); prev.prev_sibling_kind() == Some(SyntaxKind::Hash);
@ -1433,6 +1441,16 @@ mod tests {
test("#().", 4, &["insert", "remove", "len", "all"], &["foo"]); test("#().", 4, &["insert", "remove", "len", "all"], &["foo"]);
} }
#[test]
fn test_whitespace_in_autocomplete() {
//Check that extra space before '.' is handled correctly.
test("#() .", 5, &[], &["insert", "remove", "len", "all"]);
test("#{() .}", 6, &["insert", "remove", "len", "all"], &["foo"]);
test("#() .a", 6, &[], &["insert", "remove", "len", "all"]);
test("#{() .a}", 7, &["at", "any", "all"], &["foo"]);
}
#[test] #[test]
fn test_before_window_char_boundary() { fn test_before_window_char_boundary() {
// Check that the `before_window` doesn't slice into invalid byte // Check that the `before_window` doesn't slice into invalid byte