Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: lsp completion depend on func return type for func call expr #1472

Merged
merged 1 commit into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion kclvm/sema/src/advanced_resolver/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,16 @@ impl<'ctx> AdvancedResolver<'ctx> {
end,
None,
);
expr_symbol.sema_info.ty = Some(ty.clone());
expr_symbol.sema_info.ty = if matches!(&expr.node, | ast::Expr::Call(_)) {
if let TypeKind::Function(func_ty) = &ty.kind {
Some(func_ty.return_ty.clone())
} else {
Some(ty.clone())
}
} else {
Some(ty.clone())
};

Ok(self.gs.get_symbols_mut().alloc_expression_symbol(
expr_symbol,
self.ctx.get_node_key(&expr.id),
Expand Down
24 changes: 24 additions & 0 deletions kclvm/tools/src/LSP/src/completion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2024,4 +2024,28 @@ mod tests {
8,
None
);

completion_label_without_builtin_func_test_snapshot!(
func_return_ty_1,
"src/test_data/completion_test/dot/func_return/func_return_1/func_return_1.k",
4,
8,
Some('.')
);

completion_label_without_builtin_func_test_snapshot!(
func_return_ty_2,
"src/test_data/completion_test/dot/func_return/func_return_2/func_return_2.k",
8,
12,
Some('.')
);

completion_label_without_builtin_func_test_snapshot!(
func_return_ty_3,
"src/test_data/completion_test/dot/func_return/func_return_3/func_return_3.k",
3,
2,
Some('.')
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: tools/src/LSP/src/completion.rs
expression: "format!(\"{:?}\", got_labels)"
---
["capitalize(…)", "count(…)", "endswith(…)", "find(…)", "format(…)", "index(…)", "isalnum(…)", "isalpha(…)", "isdigit(…)", "islower(…)", "isspace(…)", "istitle(…)", "isupper(…)", "join(…)", "lower(…)", "lstrip(…)", "removeprefix(…)", "removesuffix(…)", "replace(…)", "rfind(…)", "rindex(…)", "rsplit(…)", "rstrip(…)", "split(…)", "splitlines(…)", "startswith(…)", "strip(…)", "title(…)", "upper(…)"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: tools/src/LSP/src/completion.rs
expression: "format!(\"{:?}\", got_labels)"
---
["name"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: tools/src/LSP/src/completion.rs
expression: "format!(\"{:?}\", got_labels)"
---
[]
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
f: () -> str = lambda {
""
}
a = f()
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
schema Name:
name: str

f1: (str) -> Name = lambda s: str -> Name {
Name {name: s}
}

b = f1("a")
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
f: () -> str = lambda {
""
}
Loading