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

fix: capture docs before check init (#1195)

Browse source
This commit is contained in:
Myriad-Dreamin 2025-01-19 18:48:38 +08:00 • committed by GitHub
parent 3577ed3b2f
commit 40c176ccf6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ snapshot_kind: text
---
"x" = Any
"y" = Any
"mapper" = (Any, Any) => Any
"mapper" = (Type(function) | (Any, Any) => Any)
"" = (Any, Any) => Any
"x" = Any
"f" = Any

15
crates/tinymist-query/src/syntax/expr.rs
View file

@ -107,6 +107,7 @@ pub(crate) fn expr_of(
w.route.insert(w.fid, Some(root_scope.clone()));
w.lexical = LexicalContext::default();
w.comment_matcher.reset();
w.buffer.clear();
w.import_buffer.clear();
let root = w.check_in_mode(root.to_untyped().children(), InterpretMode::Markup);
@ -293,8 +294,8 @@ impl ExprWorker<'_> {
}
}
fn check_docstring(&mut self, decl: &DeclExpr, kind: DefKind) {
if let Some(docs) = self.comment_matcher.collect() {
fn check_docstring(&mut self, decl: &DeclExpr, docs: Option<String>, kind: DefKind) {
if let Some(docs) = docs {
let docstring = compute_docstring(&self.ctx, self.fid, docs, kind);
if let Some(docstring) = docstring {
self.docstrings
@ -442,12 +443,13 @@ impl ExprWorker<'_> {
typed.init().map_or_else(none_expr, |expr| self.check(expr))
}
ast::LetBindingKind::Normal(pat) => {
let docs = self.comment_matcher.collect();
// Check init expression before pattern checking
let body = typed.init().map(|init| self.defer(init));
let span = pat.span();
let decl = Decl::pattern(span).into();
self.check_docstring(&decl, DefKind::Variable);
self.check_docstring(&decl, docs, DefKind::Variable);
let pattern = self.check_pattern(pat);
Expr::Let(Interned::new(LetExpr {
span,
@ -459,11 +461,12 @@ impl ExprWorker<'_> {
}
fn check_closure(&mut self, typed: ast::Closure) -> Expr {
let docs = self.comment_matcher.collect();
let decl = match typed.name() {
Some(name) => Decl::func(name).into(),
None => Decl::closure(typed.span()).into(),
};
self.check_docstring(&decl, DefKind::Function);
self.check_docstring(&decl, docs, DefKind::Function);
self.resolve_as(Decl::as_def(&decl, None));
let (params, body) = self.with_scope(|this| {
@ -1058,8 +1061,8 @@ impl ExprWorker<'_> {
self.comment_matcher.reset();
continue;
}
if !self.init_stage {
self.comment_matcher.process(n);
if !self.init_stage && self.comment_matcher.process(n) {
self.comment_matcher.reset();
}
}