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

refactor: merge some calculation stuff in completion worker (#1077)

Browse source
This commit is contained in:
Myriad-Dreamin 2024-12-27 16:55:07 +08:00 • committed by GitHub
parent fb528ec70a
commit 282b1d7b4d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 87 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

56
crates/tinymist-query/src/completion.rs
View file

@ -1,10 +1,6 @@
use lsp_types::CompletionList;
use typst_shim::syntax::LinkedNodeExt;
use crate::{analysis::CompletionWorker, prelude::*, syntax::SyntaxClass, StatefulRequest};
pub(crate) type LspCompletion = lsp_types::CompletionItem;
pub(crate) type LspCompletionKind = lsp_types::CompletionItemKind;
use crate::{analysis::CompletionWorker, prelude::*, StatefulRequest};
pub(crate) mod snippet;
@ -57,52 +53,6 @@ impl StatefulRequest for CompletionRequest {
return None;
}
let doc = doc.as_ref().map(|doc| doc.document.as_ref());
let source = ctx.source_by_path(&self.path).ok()?;
let (cursor, syntax) = ctx.classify_pos_(&source, self.position, 0)?;
// Skip if is the let binding item *directly*
if let Some(SyntaxClass::VarAccess(var)) = &syntax {
let node = var.node();
match node.parent_kind() {
// complete the init part of the let binding
Some(SyntaxKind::LetBinding) => {
let parent = node.parent()?;
let parent_init = parent.cast::<ast::LetBinding>()?.init()?;
let parent_init = parent.find(parent_init.span())?;
parent_init.find(node.span())?;
}
Some(SyntaxKind::Closure) => {
let parent = node.parent()?;
let parent_body = parent.cast::<ast::Closure>()?.body();
let parent_body = parent.find(parent_body.span())?;
parent_body.find(node.span())?;
}
_ => {}
}
}
// Skip if an error node starts with number (e.g. `1pt`)
if matches!(
syntax,
Some(SyntaxClass::Callee(..) | SyntaxClass::VarAccess(..) | SyntaxClass::Normal(..))
) {
let node = LinkedNode::new(source.root()).leaf_at_compat(cursor)?;
if node.erroneous() {
let mut chars = node.text().chars();
match chars.next() {
Some(ch) if ch.is_numeric() => return None,
Some('.') => {
if matches!(chars.next(), Some(ch) if ch.is_numeric()) {
return None;
}
}
_ => {}
}
}
}
// Please see <https://github.com/nvarner/typst-lsp/commit/2d66f26fb96ceb8e485f492e5b81e9db25c3e8ec>
//
// FIXME: correctly identify a completion which is triggered
@ -118,6 +68,10 @@ impl StatefulRequest for CompletionRequest {
// assume that the completion is not explicit.
let explicit = false;
let doc = doc.as_ref().map(|doc| doc.document.as_ref());
let source = ctx.source_by_path(&self.path).ok()?;
let cursor = ctx.to_typst_pos_offset(&source, self.position, 0)?;
let worker =
CompletionWorker::new(ctx, doc, &source, cursor, explicit, self.trigger_character)?;