From 2ea1cfd7804dd57d63196e71f66c22e56cfd79a8 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Wed, 18 Dec 2019 11:36:10 +0800
Subject: [PATCH] Rename range to by_kind

---
 crates/ra_hir_expand/src/lib.rs    | 4 ++--
 crates/ra_mbe/src/syntax_bridge.rs | 2 +-
 crates/ra_mbe/src/tests.rs         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 720a29ea58d7..2fa5d51402bc 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -227,7 +227,7 @@ pub fn map_token_down(&self, token: InFile<&SyntaxToken>) -> Option<InFile<Synta
         let token_id = self.macro_arg.1.token_by_range(range)?;
         let token_id = self.macro_def.0.map_id_down(token_id);
 
-        let range = self.exp_map.range_by_token(token_id)?.range(token.value.kind())?;
+        let range = self.exp_map.range_by_token(token_id)?.by_kind(token.value.kind())?;
 
         let token = algo::find_covering_element(&self.expanded.value, range).into_token()?;
 
@@ -248,7 +248,7 @@ pub fn map_token_up(
             }
         };
 
-        let range = token_map.range_by_token(token_id)?.range(token.value.kind())?;
+        let range = token_map.range_by_token(token_id)?.by_kind(token.value.kind())?;
         let token = algo::find_covering_element(&tt.value, range + tt.value.text_range().start())
             .into_token()?;
         Some((tt.with_value(token), origin))
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index 44a51b7a5124..d585d57af1e7 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -19,7 +19,7 @@ pub enum TokenTextRange {
 }
 
 impl TokenTextRange {
-    pub fn range(self, kind: SyntaxKind) -> Option<TextRange> {
+    pub fn by_kind(self, kind: SyntaxKind) -> Option<TextRange> {
         match self {
             TokenTextRange::Token(it) => Some(it),
             TokenTextRange::Delimiter(open, close) => match kind {
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index ae7f3dfd40f9..ff225f0db21d 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -102,7 +102,7 @@ macro_rules! foobar {
     let (expansion, (token_map, content)) = expand_and_map(&rules, "foobar!(baz);");
 
     let get_text = |id, kind| -> String {
-        content[token_map.range_by_token(id).unwrap().range(kind).unwrap()].to_string()
+        content[token_map.range_by_token(id).unwrap().by_kind(kind).unwrap()].to_string()
     };
 
     assert_eq!(expansion.token_trees.len(), 4);