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

fix: simplify types of variables for hover tooltip (#959)

Browse source 
* feat: type for hover on var

* test: update snapshots for hover on params

* fix: simplify type before formatting

* test: update snapshot

---------

Co-authored-by: Myriad-Dreamin <camiyoru@gmail.com>
This commit is contained in:
Yifan Song 2024-12-07 12:32:40 +01:00 • committed by GitHub
parent 4a236e88cd
commit 44b3f3f8c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/tinymist-query/src/docs/def.rs
View file

@ -305,12 +305,18 @@ pub(crate) fn var_docs(ctx: &mut LocalContext, pos: Span) -> Option<VarDocs> {
let ty = type_info.type_of_span(pos)?;
// todo multiple sources
// Must use raw result as type aliases contain the source information.
let mut srcs = ty.sources();
srcs.sort();
log::info!("check variable docs of ty: {ty:?} => {srcs:?}");
let doc_source = srcs.into_iter().next()?;
let return_ty = format_ty(Some(&ty));
// todo people can easily forget to simplify the type which is not good. we
// might find a way to ensure them at compile time.
//
// Must be simplified before formatting, to expand type aliases.
let simplified_ty = type_info.simplify(ty, false);
let return_ty = format_ty(Some(&simplified_ty));
match doc_source {
DocSource::Var(var) => {
let docs = type_info

2
crates/tinymist-query/src/fixtures/hover/snaps/test@annotate_dict_param2.typ.snap
View file

@ -5,6 +5,6 @@ input_file: crates/tinymist-query/src/fixtures/hover/annotate_dict_param2.typ
snapshot_kind: text
---
{
"contents": "```typc\nlet inherited-scope = any;\n```\n\n---\nDefinitions that are made available to the entire parsed\n module. This parameter is only used internally.",
"contents": "```typc\nlet inherited-scope = dictionary;\n```\n\n---\nDefinitions that are made available to the entire parsed\n module. This parameter is only used internally.",
"range": "6:21:6:36"
}

2
crates/tinymist-query/src/fixtures/hover/snaps/test@param.typ.snap
View file

@ -5,6 +5,6 @@ input_file: crates/tinymist-query/src/fixtures/hover/param.typ
snapshot_kind: text
---
{
"contents": "```typc\nlet param = any;\n```\n\n---\nThe `parameter`.",
"contents": "```typc\nlet param = int;\n```\n\n---\nThe `parameter`.",
"range": "3:25:3:30"
}

4
tests/e2e/main.rs
View file

@ -374,7 +374,7 @@ fn e2e() {
});
let hash = replay_log(&tinymist_binary, &root.join("neovim"));
insta::assert_snapshot!(hash, @"siphash128_13:6b94fdf913e670825d2b4daf6ef8c7f5");
insta::assert_snapshot!(hash, @"siphash128_13:8cebcc89c1cbdaab64ad54fded330afb");
}
{
@ -385,7 +385,7 @@ fn e2e() {
});
let hash = replay_log(&tinymist_binary, &root.join("vscode"));
insta::assert_snapshot!(hash, @"siphash128_13:afe8f09344dbbd1ff501368282065404");
insta::assert_snapshot!(hash, @"siphash128_13:6ee935b352766f1faebe86fac4cb77c1");
}
}