language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

several highlighting cleanups

Browse source 
* make stuff more type-safe by using `BindPat` instead of just `Pat`
* don't add `mut` into binding hash
* reset shadow counter when we enter a function
This commit is contained in:
Aleksey Kladov 2019-07-19 15:53:16 +03:00
parent e418889996
commit f9d9e0a1f7
6 changed files with 92 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_hir/src/source_binder.rs
View file

@ -181,7 +181,7 @@ pub enum PathResolution {
/// An item
Def(crate::ModuleDef),
/// A local binding (only value namespace)
LocalBinding(Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>),
LocalBinding(Either<AstPtr<ast::BindPat>, AstPtr<ast::SelfParam>>),
/// A generic parameter
GenericParam(u32),
SelfType(crate::ImplBlock),
@ -307,7 +307,18 @@ impl SourceAnalyzer {
let res = match res {
crate::Resolution::Def(it) => PathResolution::Def(it),
crate::Resolution::LocalBinding(it) => {
PathResolution::LocalBinding(self.body_source_map.as_ref()?.pat_syntax(it)?)
// We get a `PatId` from resolver, but it actually can only
// point at `BindPat`, and not at the arbitrary pattern.
let pat_ptr = self.body_source_map.as_ref()?.pat_syntax(it)?;
let pat_ptr = match pat_ptr {
Either::A(pat) => {
let pat: AstPtr<ast::BindPat> =
pat.cast_checking_kind(|kind| kind == BIND_PAT).unwrap();
Either::A(pat)
}
Either::B(self_param) => Either::B(self_param),
};
PathResolution::LocalBinding(pat_ptr)
}
crate::Resolution::GenericParam(it) => PathResolution::GenericParam(it),
crate::Resolution::SelfType(it) => PathResolution::SelfType(it),