language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-11-22 20:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: correct the lexical hierarchy of comment group (#2116)
Some checks are pending
tinymist::auto_tag / auto-tag (push) Waiting to run
Details
tinymist::ci / Duplicate Actions Detection (push) Waiting to run
Details
tinymist::ci / Check Clippy, Formatting, Completion, Documentation, and Tests (Linux) (push) Waiting to run
Details
tinymist::ci / Check Minimum Rust version and Tests (Windows) (push) Waiting to run
Details
tinymist::ci / prepare-build (push) Waiting to run
Details
tinymist::ci / announce (push) Blocked by required conditions
Details
tinymist::ci / build (push) Blocked by required conditions
Details
tinymist::gh_pages / build-gh-pages (push) Waiting to run
Details

Browse source 
Hierarchy of comment group is always wrong previously, causing #2021.

This PR fixed it and added a test case.

BTW, the changes in the lexical hierarchy module influenced a folding
range test case, but it's just changed the order of items, which doesn't
affect the correctness (the order is even more correct).
This commit is contained in:
Luyan Zhou 2025-09-14 09:49:13 +08:00 • committed by GitHub
parent 22089e5e27
commit 45100d6d16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 51 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/tinymist-query/src/fixtures/document_symbols/snaps/test@symbol-after-comments.typ.snap Normal file
View file

@ -0,0 +1,25 @@
---
source: crates/tinymist-query/src/document_symbol.rs
expression: "JsonRepr::new_redacted(result.unwrap(), &REDACT_LOC)"
input_file: crates/tinymist-query/src/fixtures/document_symbols/symbol-after-comments.typ
---
[
{
"kind": 13,
"name": "symbol_after_comment",
"range": "1:5:1:25",
"selectionRange": "1:5:1:25"
},
{
"kind": 13,
"name": "symbol_after_line_comments",
"range": "5:5:5:31",
"selectionRange": "5:5:5:31"
},
{
"kind": 13,
"name": "symbol_after_block_comment",
"range": "9:5:9:31",
"selectionRange": "9:5:9:31"
}
]

10
crates/tinymist-query/src/fixtures/document_symbols/symbol-after-comments.typ Normal file
View file

@ -0,0 +1,10 @@
// This is a comment
#let symbol_after_comment = 0
// This is a group
// of line comments
#let symbol_after_line_comments = 1
/* This is a
* block comment */
#let symbol_after_block_comment = 2

29
crates/tinymist-query/src/fixtures/folding_range/snaps/test@comment.typ.snap
View file

@ -2,18 +2,9 @@
source: crates/tinymist-query/src/folding_range.rs
expression: "JsonRepr::new_pure(json!({ \"false\": result_false, \"true\": result_true, }))"
input_file: crates/tinymist-query/src/fixtures/folding_range/comment.typ
snapshot_kind: text
---
{
"false": [
{
"collapsedText": "",
"endCharacter": 14,
"endLine": 8,
"kind": "comment",
"startCharacter": 2,
"startLine": 3
},
{
"collapsedText": "",
"endCharacter": 27,
@ -21,20 +12,28 @@ snapshot_kind: text
"kind": "comment",
"startCharacter": 0,
"startLine": 0
},
{
"collapsedText": "",
"endCharacter": 14,
"endLine": 8,
"kind": "comment",
"startCharacter": 2,
"startLine": 3
}
],
"true": [
{
"collapsedText": "",
"endLine": 8,
"kind": "comment",
"startLine": 3
},
{
"collapsedText": "",
"endLine": 1,
"kind": "comment",
"startLine": 0
},
{
"collapsedText": "",
"endLine": 8,
"kind": "comment",
"startLine": 3
}
]
}

2
crates/tinymist-query/src/syntax/lexical_hierarchy.rs
View file

@ -297,6 +297,8 @@ impl LexicalHierarchyWorker {
},
eco_vec![],
));
// Push the lexical node to the children of the current top of the stack.
self.finish_hierarchy();
}
if !Self::is_plain_token(child.kind()) {