-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Perf] refactor highlight lines module & add relative highlight range…
… argument (#48) * [Perf] refactor highlight lines module * [Feat] add relative highlight range argument
- Loading branch information
Showing
4 changed files
with
117 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,102 @@ | ||
| use anyhow::bail; | ||
| use codesnap::config::HighlightLine; | ||
|
|
||
| use crate::range::Range; | ||
|
|
||
| pub fn create_highlight_lines_by_range( | ||
| range: &str, | ||
| highlight_color: &str, | ||
| code_snippet: &str, | ||
| ) -> anyhow::Result<Vec<HighlightLine>> { | ||
| let Range(start, end) = Range::from_str(&range)?.parse_range(code_snippet)?; | ||
|
|
||
| Ok(vec![HighlightLine::Range( | ||
| start as u32, | ||
| end as u32, | ||
| highlight_color.to_string(), | ||
| )]) | ||
| pub struct HighlightLineRange { | ||
| code_snippet_range: Range<usize>, | ||
| code_snippet: String, | ||
| is_relative_highlight_range: bool, | ||
| } | ||
|
|
||
| pub fn create_highlight_lines_by_opt_range( | ||
| range: &Option<String>, | ||
| highlight_color: &str, | ||
| code_snippet: &str, | ||
| ) -> anyhow::Result<Vec<HighlightLine>> { | ||
| match range { | ||
| Some(ref range) => create_highlight_lines_by_range(range, highlight_color, code_snippet), | ||
| None => Ok(vec![]), | ||
| impl HighlightLineRange { | ||
| pub fn from( | ||
| code_snippet_range: Range<usize>, | ||
| code_snippet: &str, | ||
| is_relative_highlight_range: bool, | ||
| ) -> anyhow::Result<Self> { | ||
| Ok(HighlightLineRange { | ||
| code_snippet_range, | ||
| code_snippet: code_snippet.to_string(), | ||
| is_relative_highlight_range, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| pub fn create_highlight_lines_by_ranges( | ||
| ranges: &Vec<String>, | ||
| highlight_color: &str, | ||
| code_snippet: &str, | ||
| ) -> anyhow::Result<Vec<HighlightLine>> { | ||
| ranges.iter().try_fold(vec![], |mut acc, range| { | ||
| acc.extend(create_highlight_lines_by_range( | ||
| range, | ||
| highlight_color, | ||
| code_snippet, | ||
| )?); | ||
| Ok(acc) | ||
| }) | ||
| fn get_absolute_highlight_range( | ||
| &self, | ||
| Range(start, end): Range<usize>, | ||
| ) -> anyhow::Result<(usize, usize)> { | ||
| // let Range(start, end) = Range::from_str(&raw_range)?.parse_range(&self.code_snippet)?; | ||
| let Range(code_snippet_start, code_snippet_end) = self.code_snippet_range; | ||
| let offset_start = code_snippet_start - 1; | ||
|
|
||
| if start < code_snippet_start { | ||
| bail!( | ||
| "The highlight start range should be greater than or equal to {}", | ||
| code_snippet_start | ||
| ); | ||
| } | ||
|
|
||
| if end > code_snippet_end { | ||
| bail!( | ||
| "The highlight end range should be less than or equal to {}", | ||
| code_snippet_end | ||
| ); | ||
| } | ||
|
|
||
| // Users may specify a range to generate snapshot from a part of the whole code snippet, | ||
| // however the highlight range line number is start from already sliced code snippet | ||
| // so we need to known the start range to calculate the correct highlight range line number | ||
| let start = start - offset_start; | ||
| let end = end - offset_start; | ||
|
|
||
| Ok((start, end)) | ||
| } | ||
|
|
||
| fn get_relative_highlight_range( | ||
| &self, | ||
| Range(start, end): Range<usize>, | ||
| ) -> anyhow::Result<(usize, usize)> { | ||
| let Range(code_snippet_start, code_snippet_end) = self.code_snippet_range; | ||
| let code_snippet_range_size = code_snippet_end - code_snippet_start; | ||
|
|
||
| if end > code_snippet_range_size + 1 { | ||
| bail!( | ||
| "The highlight end range should be less than or equal to {}", | ||
| code_snippet_range_size | ||
| ); | ||
| } | ||
|
|
||
| Ok((start, end)) | ||
| } | ||
|
|
||
| pub fn create_highlight_lines( | ||
| &self, | ||
| raw_range: &str, | ||
| highlight_color: &str, | ||
| ) -> anyhow::Result<Vec<HighlightLine>> { | ||
| let Range(start, end) = Range::from_str(&raw_range)?.parse_range(&self.code_snippet)?; | ||
| let (start, end) = if self.is_relative_highlight_range { | ||
| self.get_relative_highlight_range(Range(start, end)) | ||
| } else { | ||
| self.get_absolute_highlight_range(Range(start, end)) | ||
| }?; | ||
|
|
||
| Ok(vec![HighlightLine::Range( | ||
| start as u32, | ||
| end as u32, | ||
| highlight_color.to_string(), | ||
| )]) | ||
| } | ||
|
|
||
| pub fn create_multiple_highlight_lines( | ||
| &self, | ||
| raw_ranges: &Vec<String>, | ||
| highlight_color: &str, | ||
| ) -> anyhow::Result<Vec<HighlightLine>> { | ||
| raw_ranges.iter().try_fold(vec![], |mut acc, range| { | ||
| acc.extend(self.create_highlight_lines(range, highlight_color)?); | ||
| Ok(acc) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters