From 6fb52af521ab8ca2fdd3ea7cfa95eaebd0cba1fc Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 9 Jan 2021 14:41:31 +0300 Subject: Rename dummy -> none --- crates/ide/src/syntax_highlighting/highlights.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ide/src/syntax_highlighting/highlights.rs') diff --git a/crates/ide/src/syntax_highlighting/highlights.rs b/crates/ide/src/syntax_highlighting/highlights.rs index 3e733c87c..7ff1593ae 100644 --- a/crates/ide/src/syntax_highlighting/highlights.rs +++ b/crates/ide/src/syntax_highlighting/highlights.rs @@ -20,7 +20,7 @@ impl Highlights { Highlights { root: Node::new(HighlightedRange { range, - highlight: HighlightTag::Dummy.into(), + highlight: HighlightTag::None.into(), binding_hash: None, }), } -- cgit v1.2.3 From 64a6ee45351a71cdeb1d1dddc8fc746abdcff07b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 9 Jan 2021 14:44:01 +0300 Subject: Shorten frequent names --- crates/ide/src/syntax_highlighting/highlights.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ide/src/syntax_highlighting/highlights.rs') diff --git a/crates/ide/src/syntax_highlighting/highlights.rs b/crates/ide/src/syntax_highlighting/highlights.rs index 7ff1593ae..f52076509 100644 --- a/crates/ide/src/syntax_highlighting/highlights.rs +++ b/crates/ide/src/syntax_highlighting/highlights.rs @@ -4,7 +4,7 @@ use std::{cmp::Ordering, iter}; use stdx::equal_range_by; use syntax::TextRange; -use crate::{HighlightTag, HighlightedRange}; +use crate::{HighlightedRange, HlTag}; pub(super) struct Highlights { root: Node, @@ -20,7 +20,7 @@ impl Highlights { Highlights { root: Node::new(HighlightedRange { range, - highlight: HighlightTag::None.into(), + highlight: HlTag::None.into(), binding_hash: None, }), } -- cgit v1.2.3 From 3dfa2768acdd6bbf0e6999cdc4eb5cf0718b95a4 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 9 Jan 2021 14:48:15 +0300 Subject: Shorten names --- crates/ide/src/syntax_highlighting/highlights.rs | 61 ++++++++++-------------- 1 file changed, 26 insertions(+), 35 deletions(-) (limited to 'crates/ide/src/syntax_highlighting/highlights.rs') diff --git a/crates/ide/src/syntax_highlighting/highlights.rs b/crates/ide/src/syntax_highlighting/highlights.rs index f52076509..11c11ed28 100644 --- a/crates/ide/src/syntax_highlighting/highlights.rs +++ b/crates/ide/src/syntax_highlighting/highlights.rs @@ -4,33 +4,29 @@ use std::{cmp::Ordering, iter}; use stdx::equal_range_by; use syntax::TextRange; -use crate::{HighlightedRange, HlTag}; +use crate::{HlRange, HlTag}; pub(super) struct Highlights { root: Node, } struct Node { - highlighted_range: HighlightedRange, + hl_range: HlRange, nested: Vec, } impl Highlights { pub(super) fn new(range: TextRange) -> Highlights { Highlights { - root: Node::new(HighlightedRange { - range, - highlight: HlTag::None.into(), - binding_hash: None, - }), + root: Node::new(HlRange { range, highlight: HlTag::None.into(), binding_hash: None }), } } - pub(super) fn add(&mut self, highlighted_range: HighlightedRange) { - self.root.add(highlighted_range); + pub(super) fn add(&mut self, hl_range: HlRange) { + self.root.add(hl_range); } - pub(super) fn to_vec(self) -> Vec { + pub(super) fn to_vec(self) -> Vec { let mut res = Vec::new(); self.root.flatten(&mut res); res @@ -38,59 +34,54 @@ impl Highlights { } impl Node { - fn new(highlighted_range: HighlightedRange) -> Node { - Node { highlighted_range, nested: Vec::new() } + fn new(hl_range: HlRange) -> Node { + Node { hl_range, nested: Vec::new() } } - fn add(&mut self, highlighted_range: HighlightedRange) { - assert!(self.highlighted_range.range.contains_range(highlighted_range.range)); + fn add(&mut self, hl_range: HlRange) { + assert!(self.hl_range.range.contains_range(hl_range.range)); // Fast path if let Some(last) = self.nested.last_mut() { - if last.highlighted_range.range.contains_range(highlighted_range.range) { - return last.add(highlighted_range); + if last.hl_range.range.contains_range(hl_range.range) { + return last.add(hl_range); } - if last.highlighted_range.range.end() <= highlighted_range.range.start() { - return self.nested.push(Node::new(highlighted_range)); + if last.hl_range.range.end() <= hl_range.range.start() { + return self.nested.push(Node::new(hl_range)); } } - let (start, len) = equal_range_by(&self.nested, |n| { - ordering(n.highlighted_range.range, highlighted_range.range) - }); + let (start, len) = + equal_range_by(&self.nested, |n| ordering(n.hl_range.range, hl_range.range)); - if len == 1 - && self.nested[start].highlighted_range.range.contains_range(highlighted_range.range) - { - return self.nested[start].add(highlighted_range); + if len == 1 && self.nested[start].hl_range.range.contains_range(hl_range.range) { + return self.nested[start].add(hl_range); } let nested = self .nested - .splice(start..start + len, iter::once(Node::new(highlighted_range))) + .splice(start..start + len, iter::once(Node::new(hl_range))) .collect::>(); self.nested[start].nested = nested; } - fn flatten(&self, acc: &mut Vec) { - let mut start = self.highlighted_range.range.start(); + fn flatten(&self, acc: &mut Vec) { + let mut start = self.hl_range.range.start(); let mut nested = self.nested.iter(); loop { let next = nested.next(); - let end = next.map_or(self.highlighted_range.range.end(), |it| { - it.highlighted_range.range.start() - }); + let end = next.map_or(self.hl_range.range.end(), |it| it.hl_range.range.start()); if start < end { - acc.push(HighlightedRange { + acc.push(HlRange { range: TextRange::new(start, end), - highlight: self.highlighted_range.highlight, - binding_hash: self.highlighted_range.binding_hash, + highlight: self.hl_range.highlight, + binding_hash: self.hl_range.binding_hash, }); } start = match next { Some(child) => { child.flatten(acc); - child.highlighted_range.range.end() + child.hl_range.range.end() } None => break, } -- cgit v1.2.3