squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Simplify

Browse source
This commit is contained in:
Aleksey Kladov 2021-01-09 15:54:38 +03:00
parent d4fb7476ef
commit 62b17bac92
2 changed files with 30 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ide/src/syntax_highlighting.rs
View file

@ -33,7 +33,7 @@ use crate::{
pub(crate) use html::highlight_as_html;
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Copy)]
pub struct HlRange {
pub range: TextRange,
pub highlight: Highlight,

82
crates/ide/src/syntax_highlighting/injection.rs
View file

@ -21,20 +21,42 @@ pub(super) fn highlight_injection(
if !active_parameter.name.starts_with("ra_fixture") {
return None;
}
let value = literal.value()?;
let marker_info = MarkerInfo::new(&*value);
let (analysis, tmp_file_id) = Analysis::from_single_file(marker_info.cleaned_text.clone());
if let Some(range) = literal.open_quote_text_range() {
hl.add(HlRange { range, highlight: HlTag::StringLiteral.into(), binding_hash: None })
}
let mut inj = Injector::default();
let mut text = &*value;
let mut offset: TextSize = 0.into();
while !text.is_empty() {
let marker = "$0";
let idx = text.find(marker).unwrap_or(text.len());
let (chunk, next) = text.split_at(idx);
inj.add(chunk, TextRange::at(offset, TextSize::of(chunk)));
text = next;
offset += TextSize::of(chunk);
if let Some(next) = text.strip_prefix(marker) {
text = next;
let marker_len = TextSize::of(marker);
offset += marker_len;
}
}
let (analysis, tmp_file_id) = Analysis::from_single_file(inj.text().to_string());
for mut hl_range in analysis.highlight(tmp_file_id).unwrap() {
let range = marker_info.map_range_up(hl_range.range);
if let Some(range) = literal.map_range_up(range) {
hl_range.range = range;
hl.add(hl_range);
for range in inj.map_range_up(hl_range.range) {
if let Some(range) = literal.map_range_up(range) {
hl_range.range = range;
hl.add(hl_range.clone());
}
}
}
@ -45,52 +67,6 @@ pub(super) fn highlight_injection(
Some(())
}
/// Data to remove `$0` from string and map ranges
#[derive(Default, Debug)]
struct MarkerInfo {
cleaned_text: String,
markers: Vec<TextRange>,
}
impl MarkerInfo {
fn new(mut text: &str) -> Self {
let marker = "$0";
let mut res = MarkerInfo::default();
let mut offset: TextSize = 0.into();
while !text.is_empty() {
let idx = text.find(marker).unwrap_or(text.len());
let (chunk, next) = text.split_at(idx);
text = next;
res.cleaned_text.push_str(chunk);
offset += TextSize::of(chunk);
if let Some(next) = text.strip_prefix(marker) {
text = next;
let marker_len = TextSize::of(marker);
res.markers.push(TextRange::at(offset, marker_len));
offset += marker_len;
}
}
res
}
fn map_range_up(&self, range: TextRange) -> TextRange {
TextRange::new(
self.map_offset_up(range.start(), true),
self.map_offset_up(range.end(), false),
)
}
fn map_offset_up(&self, mut offset: TextSize, start: bool) -> TextSize {
for r in &self.markers {
if r.start() < offset || (start && r.start() == offset) {
offset += r.len()
}
}
offset
}
}
const RUSTDOC_FENCE: &'static str = "```";
const RUSTDOC_FENCE_TOKENS: &[&'static str] = &[
"",