aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/ra_ide_api/src/syntax_highlighting.rs9
-rw-r--r--crates/ra_syntax/src/lib.rs2
2 files changed, 5 insertions, 6 deletions
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index 3ea26f58b..eb392d5da 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -4,8 +4,7 @@ use hir::{Mutability, Ty};
4use ra_db::SourceDatabase; 4use ra_db::SourceDatabase;
5use ra_prof::profile; 5use ra_prof::profile;
6use ra_syntax::{ 6use ra_syntax::{
7 ast, AstNode, Direction, Pat, PatKind, SmolStr, SyntaxElement, SyntaxKind, SyntaxKind::*, 7 ast, AstNode, Direction, SmolStr, SyntaxElement, SyntaxKind, SyntaxKind::*, TextRange, T,
8 TextRange, T,
9}; 8};
10 9
11use crate::{db::RootDatabase, FileId}; 10use crate::{db::RootDatabase, FileId};
@@ -32,7 +31,7 @@ fn is_control_keyword(kind: SyntaxKind) -> bool {
32 } 31 }
33} 32}
34 33
35fn is_variable_mutable(db: &RootDatabase, analyzer: &hir::SourceAnalyzer, pat: &Pat) -> bool { 34fn is_variable_mutable(db: &RootDatabase, analyzer: &hir::SourceAnalyzer, pat: &ast::Pat) -> bool {
36 let ty = analyzer.type_of_pat(db, pat).unwrap_or(Ty::Unknown); 35 let ty = analyzer.type_of_pat(db, pat).unwrap_or(Ty::Unknown);
37 let is_ty_mut = { 36 let is_ty_mut = {
38 if let Some((_, mutability)) = ty.as_reference() { 37 if let Some((_, mutability)) = ty.as_reference() {
@@ -46,7 +45,7 @@ fn is_variable_mutable(db: &RootDatabase, analyzer: &hir::SourceAnalyzer, pat: &
46 }; 45 };
47 46
48 let is_pat_mut = match pat.kind() { 47 let is_pat_mut = match pat.kind() {
49 PatKind::BindPat(bind_pat) => bind_pat.is_mutable(), 48 ast::PatKind::BindPat(bind_pat) => bind_pat.is_mutable(),
50 _ => false, 49 _ => false,
51 }; 50 };
52 51
@@ -137,7 +136,7 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
137 NAME => { 136 NAME => {
138 if let Some(name) = node.as_node().and_then(ast::Name::cast) { 137 if let Some(name) = node.as_node().and_then(ast::Name::cast) {
139 let analyzer = hir::SourceAnalyzer::new(db, file_id, name.syntax(), None); 138 let analyzer = hir::SourceAnalyzer::new(db, file_id, name.syntax(), None);
140 if let Some(pat) = name.syntax().ancestors().find_map(Pat::cast) { 139 if let Some(pat) = name.syntax().ancestors().find_map(ast::Pat::cast) {
141 binding_hash = Some({ 140 binding_hash = Some({
142 let text = name.syntax().text().to_smol_string(); 141 let text = name.syntax().text().to_smol_string();
143 let shadow_count = 142 let shadow_count =
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index ff347a567..0fa2fe382 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -38,7 +38,7 @@ use ra_text_edit::AtomTextEdit;
38use crate::syntax_node::GreenNode; 38use crate::syntax_node::GreenNode;
39 39
40pub use crate::{ 40pub use crate::{
41 ast::{AstNode, Pat, PatKind}, 41 ast::{AstNode, AstToken},
42 parsing::{classify_literal, tokenize, Token}, 42 parsing::{classify_literal, tokenize, Token},
43 ptr::{AstPtr, SyntaxNodePtr}, 43 ptr::{AstPtr, SyntaxNodePtr},
44 syntax_error::{Location, SyntaxError, SyntaxErrorKind}, 44 syntax_error::{Location, SyntaxError, SyntaxErrorKind},