Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Review

This commit is contained in:
konstin 2023-09-26 14:21:03 +02:00
parent 59c37d0cd8
commit 5be2ec5ced
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ruff_source_file/src/locator.rs
View File

@ -504,17 +504,13 @@ impl<'a> Locator<'a> {
/// assert_eq!(&source[TextRange::new(offset, source.text_len())], "腐'"); /// assert_eq!(&source[TextRange::new(offset, source.text_len())], "腐'");
/// ``` /// ```
pub fn convert_row_and_column_utf16(&self, row: usize, column: usize) -> Option<TextSize> { pub fn convert_row_and_column_utf16(&self, row: usize, column: usize) -> Option<TextSize> {
let line_range = *self.to_index().line_range(row) let line_range = self
let line_contents = &self.contents[TextRange::from(line_start..next_line_start)]; .to_index()
.line_range(OneIndexed::from_zero_indexed(row), self.contents);
let mut len_bytes = TextSize::default(); let mut len_bytes = TextSize::default();
let mut len_utf16 = 0; let mut len_utf16 = 0;
for char in line_contents for char in self.contents[line_range].chars() {
.chars()
// Since the range goes to the next line start, `line_contents` contains the line
// break
.take_while(|c| *c != '\n' && *c != '\r')
{
// This check must be first for the 0 column case // This check must be first for the 0 column case
if len_utf16 >= column { if len_utf16 >= column {
break; break;
@ -526,7 +522,7 @@ impl<'a> Locator<'a> {
return None; return None;
} }
Some(line_start + len_bytes) Some(line_range.start() + len_bytes)
} }
/// Take the source code between the given [`TextRange`]. /// Take the source code between the given [`TextRange`].