From 64a6ee45351a71cdeb1d1dddc8fc746abdcff07b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 9 Jan 2021 14:44:01 +0300
Subject: Shorten frequent names

---
 crates/ide/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ide/src/lib.rs')

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index cea2a13c8..674c72c23 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -76,7 +76,7 @@ pub use crate::{
     references::{rename::RenameError, Declaration, ReferenceSearchResult},
     runnables::{Runnable, RunnableKind, TestId},
     syntax_highlighting::{
-        tags::{Highlight, HighlightModifier, HighlightModifiers, HighlightTag},
+        tags::{Highlight, HlMod, HlMods, HlTag},
         HighlightedRange,
     },
 };
-- 
cgit v1.2.3


From 3dfa2768acdd6bbf0e6999cdc4eb5cf0718b95a4 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 9 Jan 2021 14:48:15 +0300
Subject: Shorten names

---
 crates/ide/src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'crates/ide/src/lib.rs')

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 674c72c23..409507bd0 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -77,7 +77,7 @@ pub use crate::{
     runnables::{Runnable, RunnableKind, TestId},
     syntax_highlighting::{
         tags::{Highlight, HlMod, HlMods, HlTag},
-        HighlightedRange,
+        HlRange,
     },
 };
 pub use assists::{Assist, AssistConfig, AssistId, AssistKind, InsertUseConfig};
@@ -449,12 +449,12 @@ impl Analysis {
     }
 
     /// Computes syntax highlighting for the given file
-    pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> {
+    pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HlRange>> {
         self.with_db(|db| syntax_highlighting::highlight(db, file_id, None, false))
     }
 
     /// Computes syntax highlighting for the given file range.
-    pub fn highlight_range(&self, frange: FileRange) -> Cancelable<Vec<HighlightedRange>> {
+    pub fn highlight_range(&self, frange: FileRange) -> Cancelable<Vec<HlRange>> {
         self.with_db(|db| {
             syntax_highlighting::highlight(db, frange.file_id, Some(frange.range), false)
         })
-- 
cgit v1.2.3