mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-02 14:51:48 +00:00
If possible, show type lenses for the let bindings
This commit is contained in:
parent
7bde8012cb
commit
b6c662c573
2 changed files with 48 additions and 16 deletions
|
@ -1,5 +1,6 @@
|
||||||
use crate::TextRange;
|
use crate::TextRange;
|
||||||
|
|
||||||
|
use ra_syntax::ast::PatKind;
|
||||||
use ra_syntax::{
|
use ra_syntax::{
|
||||||
algo::visit::{visitor, Visitor},
|
algo::visit::{visitor, Visitor},
|
||||||
ast::{self, AttrsOwner, NameOwner, TypeAscriptionOwner, TypeParamsOwner},
|
ast::{self, AttrsOwner, NameOwner, TypeAscriptionOwner, TypeParamsOwner},
|
||||||
|
@ -155,6 +156,27 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
|
||||||
}
|
}
|
||||||
decl(mc)
|
decl(mc)
|
||||||
})
|
})
|
||||||
|
.visit(|let_statement: &ast::LetStmt| {
|
||||||
|
let let_syntax = let_statement.syntax();
|
||||||
|
|
||||||
|
let mut label = String::new();
|
||||||
|
collapse_ws(let_syntax, &mut label);
|
||||||
|
|
||||||
|
let pat = match let_statement.pat()?.kind() {
|
||||||
|
PatKind::BindPat(bind_pat) => bind_pat,
|
||||||
|
_ => return None,
|
||||||
|
};
|
||||||
|
|
||||||
|
Some(StructureNode {
|
||||||
|
parent: None,
|
||||||
|
label,
|
||||||
|
navigation_range: pat.syntax().range(),
|
||||||
|
node_range: let_syntax.range(),
|
||||||
|
kind: let_syntax.kind(),
|
||||||
|
detail: None,
|
||||||
|
deprecated: false,
|
||||||
|
})
|
||||||
|
})
|
||||||
.accept(&node)?
|
.accept(&node)?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -726,29 +726,39 @@ pub fn handle_code_lens(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle impls
|
lenses.extend(world.analysis().file_structure(file_id).into_iter().filter_map(|it| {
|
||||||
lenses.extend(
|
match it.kind {
|
||||||
world
|
// Handle impls
|
||||||
.analysis()
|
SyntaxKind::TRAIT_DEF | SyntaxKind::STRUCT_DEF | SyntaxKind::ENUM_DEF => {
|
||||||
.file_structure(file_id)
|
|
||||||
.into_iter()
|
|
||||||
.filter(|it| match it.kind {
|
|
||||||
SyntaxKind::TRAIT_DEF | SyntaxKind::STRUCT_DEF | SyntaxKind::ENUM_DEF => true,
|
|
||||||
_ => false,
|
|
||||||
})
|
|
||||||
.map(|it| {
|
|
||||||
let range = it.node_range.conv_with(&line_index);
|
let range = it.node_range.conv_with(&line_index);
|
||||||
let pos = range.start;
|
let pos = range.start;
|
||||||
let lens_params =
|
let lens_params =
|
||||||
req::TextDocumentPositionParams::new(params.text_document.clone(), pos);
|
req::TextDocumentPositionParams::new(params.text_document.clone(), pos);
|
||||||
CodeLens {
|
Some(CodeLens {
|
||||||
range,
|
range,
|
||||||
command: None,
|
command: None,
|
||||||
data: Some(to_value(CodeLensResolveData::Impls(lens_params)).unwrap()),
|
data: Some(to_value(CodeLensResolveData::Impls(lens_params)).unwrap()),
|
||||||
}
|
})
|
||||||
}),
|
}
|
||||||
);
|
// handle let statements
|
||||||
|
SyntaxKind::LET_STMT => world
|
||||||
|
.analysis()
|
||||||
|
.type_of(FileRange { range: it.navigation_range, file_id })
|
||||||
|
.ok()
|
||||||
|
.and_then(std::convert::identity)
|
||||||
|
.filter(|resolved_type| "{unknown}" != resolved_type)
|
||||||
|
.map(|resolved_type| CodeLens {
|
||||||
|
range: it.node_range.conv_with(&line_index),
|
||||||
|
command: Some(Command {
|
||||||
|
title: resolved_type,
|
||||||
|
command: String::new(),
|
||||||
|
arguments: None,
|
||||||
|
}),
|
||||||
|
data: None,
|
||||||
|
}),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}));
|
||||||
Ok(Some(lenses))
|
Ok(Some(lenses))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue