language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-07-19 10:45:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: improving names of matched structs and documenting matchers (#1022)

Browse source
This commit is contained in:
Myriad-Dreamin 2024-12-18 16:35:15 +08:00 • committed by GitHub
parent 902bd17cba
commit ad0c1e8aca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 391 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/tinymist-query/src/signature_help.rs
View file

@ -4,7 +4,7 @@ use typst_shim::syntax::LinkedNodeExt;
use crate::{
adt::interner::Interned,
prelude::*,
syntax::{get_check_target, get_deref_target, CheckTarget, ParamTarget},
syntax::{classify_cursor, classify_syntax, ArgClass, CursorClass},
LspParamInfo, SemanticRequest,
};
@ -28,18 +28,18 @@ impl SemanticRequest for SignatureHelpRequest {
let cursor = ctx.to_typst_pos(self.position, &source)? + 1;
let ast_node = LinkedNode::new(source.root()).leaf_at_compat(cursor)?;
let CheckTarget::Param {
let CursorClass::Arg {
callee,
target,
is_set,
..
} = get_check_target(ast_node)?
} = classify_cursor(ast_node)?
else {
return None;
};
let deref_target = get_deref_target(callee, cursor)?;
let def = ctx.def_of_syntax(&source, None, deref_target)?;
let syntax = classify_syntax(callee, cursor)?;
let def = ctx.def_of_syntax(&source, None, syntax)?;
let sig = ctx.sig_of_def(def.clone())?;
crate::log_debug_ct!("got signature {sig:?}");
@ -59,13 +59,13 @@ impl SemanticRequest for SignatureHelpRequest {
}
match &target {
ParamTarget::Positional { .. } if is_set => {}
ParamTarget::Positional { positional, .. } => {
ArgClass::Positional { .. } if is_set => {}
ArgClass::Positional { positional, .. } => {
if (*positional) + param_shift == i {
active_parameter = Some(real_offset);
}
}
ParamTarget::Named(name) => {
ArgClass::Named(name) => {
let focus_name = focus_name
.get_or_init(|| Interned::new_str(&name.get().clone().into_text()));
if focus_name == &param.name {
@ -106,7 +106,7 @@ impl SemanticRequest for SignatureHelpRequest {
label.push_str(ret_ty.describe().as_deref().unwrap_or("any"));
}
if matches!(target, ParamTarget::Positional { .. }) {
if matches!(target, ArgClass::Positional { .. }) {
active_parameter =
active_parameter.map(|x| x.min(sig.primary().pos_size().saturating_sub(1)));
}