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

refactor: rename local variables and some types (#1023)

Browse source 
* fix: naming

* refactor: rename local variables and some types
This commit is contained in:
Myriad-Dreamin 2024-12-18 19:23:31 +08:00 • committed by GitHub
parent ad0c1e8aca
commit be1d659719
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 805 additions and 787 deletions
Download patch file Download diff file Expand all files Collapse all files

40
crates/tinymist-query/src/symbol.rs
View file

@ -43,16 +43,15 @@ impl SemanticRequest for SymbolRequest {
continue;
};
let uri = path_to_url(&path).unwrap();
let res =
get_lexical_hierarchy(source.clone(), LexicalScopeKind::Symbol).map(|symbols| {
filter_document_symbols(
&symbols,
self.pattern.as_deref(),
&source,
&uri,
ctx.position_encoding(),
)
});
let res = get_lexical_hierarchy(&source, LexicalScopeKind::Symbol).map(|symbols| {
filter_document_symbols(
&symbols,
self.pattern.as_deref(),
&source,
&uri,
ctx.position_encoding(),
)
});
if let Some(mut res) = res {
symbols.append(&mut res)
@ -65,28 +64,29 @@ impl SemanticRequest for SymbolRequest {
#[allow(deprecated)]
fn filter_document_symbols(
symbols: &[LexicalHierarchy],
hierarchy: &[LexicalHierarchy],
query_string: Option<&str>,
source: &Source,
uri: &Url,
position_encoding: PositionEncoding,
) -> Vec<SymbolInformation> {
symbols
hierarchy
.iter()
.flat_map(|e| {
[e].into_iter()
.chain(e.children.as_deref().into_iter().flatten())
.flat_map(|hierarchy| {
[hierarchy]
.into_iter()
.chain(hierarchy.children.as_deref().into_iter().flatten())
})
.flat_map(|e| {
if query_string.is_some_and(|s| !e.info.name.contains(s)) {
.flat_map(|hierarchy| {
if query_string.is_some_and(|s| !hierarchy.info.name.contains(s)) {
return None;
}
let rng = typst_to_lsp::range(e.info.range.clone(), source, position_encoding);
let rng = typst_to_lsp::range(hierarchy.info.range.clone(), source, position_encoding);
Some(SymbolInformation {
name: e.info.name.to_string(),
kind: e.info.kind.clone().try_into().unwrap(),
name: hierarchy.info.name.to_string(),
kind: hierarchy.info.kind.clone().try_into().unwrap(),
tags: None,
deprecated: None,
location: LspLocation {