diff options
Diffstat (limited to 'crates/ide_db/src')
-rw-r--r-- | crates/ide_db/src/line_index.rs | 12 | ||||
-rw-r--r-- | crates/ide_db/src/line_index/tests.rs | 28 |
2 files changed, 20 insertions, 20 deletions
diff --git a/crates/ide_db/src/line_index.rs b/crates/ide_db/src/line_index.rs index 41226305e..490c172e3 100644 --- a/crates/ide_db/src/line_index.rs +++ b/crates/ide_db/src/line_index.rs | |||
@@ -15,11 +15,11 @@ pub struct LineIndex { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | 17 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] |
18 | pub struct LineCol { | 18 | pub struct LineColUtf16 { |
19 | /// Zero-based | 19 | /// Zero-based |
20 | pub line: u32, | 20 | pub line: u32, |
21 | /// Zero-based | 21 | /// Zero-based |
22 | pub col_utf16: u32, | 22 | pub col: u32, |
23 | } | 23 | } |
24 | 24 | ||
25 | #[derive(Clone, Debug, Hash, PartialEq, Eq)] | 25 | #[derive(Clone, Debug, Hash, PartialEq, Eq)] |
@@ -88,17 +88,17 @@ impl LineIndex { | |||
88 | LineIndex { newlines, utf16_lines } | 88 | LineIndex { newlines, utf16_lines } |
89 | } | 89 | } |
90 | 90 | ||
91 | pub fn line_col(&self, offset: TextSize) -> LineCol { | 91 | pub fn line_col(&self, offset: TextSize) -> LineColUtf16 { |
92 | let line = partition_point(&self.newlines, |&it| it <= offset) - 1; | 92 | let line = partition_point(&self.newlines, |&it| it <= offset) - 1; |
93 | let line_start_offset = self.newlines[line]; | 93 | let line_start_offset = self.newlines[line]; |
94 | let col = offset - line_start_offset; | 94 | let col = offset - line_start_offset; |
95 | 95 | ||
96 | LineCol { line: line as u32, col_utf16: self.utf8_to_utf16_col(line as u32, col) as u32 } | 96 | LineColUtf16 { line: line as u32, col: self.utf8_to_utf16_col(line as u32, col) as u32 } |
97 | } | 97 | } |
98 | 98 | ||
99 | pub fn offset(&self, line_col: LineCol) -> TextSize { | 99 | pub fn offset(&self, line_col: LineColUtf16) -> TextSize { |
100 | //FIXME: return Result | 100 | //FIXME: return Result |
101 | let col = self.utf16_to_utf8_col(line_col.line, line_col.col_utf16); | 101 | let col = self.utf16_to_utf8_col(line_col.line, line_col.col); |
102 | self.newlines[line_col.line as usize] + col | 102 | self.newlines[line_col.line as usize] + col |
103 | } | 103 | } |
104 | 104 | ||
diff --git a/crates/ide_db/src/line_index/tests.rs b/crates/ide_db/src/line_index/tests.rs index 05f7484e8..1a109654e 100644 --- a/crates/ide_db/src/line_index/tests.rs +++ b/crates/ide_db/src/line_index/tests.rs | |||
@@ -4,23 +4,23 @@ use super::*; | |||
4 | fn test_line_index() { | 4 | fn test_line_index() { |
5 | let text = "hello\nworld"; | 5 | let text = "hello\nworld"; |
6 | let index = LineIndex::new(text); | 6 | let index = LineIndex::new(text); |
7 | assert_eq!(index.line_col(0.into()), LineCol { line: 0, col_utf16: 0 }); | 7 | assert_eq!(index.line_col(0.into()), LineColUtf16 { line: 0, col: 0 }); |
8 | assert_eq!(index.line_col(1.into()), LineCol { line: 0, col_utf16: 1 }); | 8 | assert_eq!(index.line_col(1.into()), LineColUtf16 { line: 0, col: 1 }); |
9 | assert_eq!(index.line_col(5.into()), LineCol { line: 0, col_utf16: 5 }); | 9 | assert_eq!(index.line_col(5.into()), LineColUtf16 { line: 0, col: 5 }); |
10 | assert_eq!(index.line_col(6.into()), LineCol { line: 1, col_utf16: 0 }); | 10 | assert_eq!(index.line_col(6.into()), LineColUtf16 { line: 1, col: 0 }); |
11 | assert_eq!(index.line_col(7.into()), LineCol { line: 1, col_utf16: 1 }); | 11 | assert_eq!(index.line_col(7.into()), LineColUtf16 { line: 1, col: 1 }); |
12 | assert_eq!(index.line_col(8.into()), LineCol { line: 1, col_utf16: 2 }); | 12 | assert_eq!(index.line_col(8.into()), LineColUtf16 { line: 1, col: 2 }); |
13 | assert_eq!(index.line_col(10.into()), LineCol { line: 1, col_utf16: 4 }); | 13 | assert_eq!(index.line_col(10.into()), LineColUtf16 { line: 1, col: 4 }); |
14 | assert_eq!(index.line_col(11.into()), LineCol { line: 1, col_utf16: 5 }); | 14 | assert_eq!(index.line_col(11.into()), LineColUtf16 { line: 1, col: 5 }); |
15 | assert_eq!(index.line_col(12.into()), LineCol { line: 1, col_utf16: 6 }); | 15 | assert_eq!(index.line_col(12.into()), LineColUtf16 { line: 1, col: 6 }); |
16 | 16 | ||
17 | let text = "\nhello\nworld"; | 17 | let text = "\nhello\nworld"; |
18 | let index = LineIndex::new(text); | 18 | let index = LineIndex::new(text); |
19 | assert_eq!(index.line_col(0.into()), LineCol { line: 0, col_utf16: 0 }); | 19 | assert_eq!(index.line_col(0.into()), LineColUtf16 { line: 0, col: 0 }); |
20 | assert_eq!(index.line_col(1.into()), LineCol { line: 1, col_utf16: 0 }); | 20 | assert_eq!(index.line_col(1.into()), LineColUtf16 { line: 1, col: 0 }); |
21 | assert_eq!(index.line_col(2.into()), LineCol { line: 1, col_utf16: 1 }); | 21 | assert_eq!(index.line_col(2.into()), LineColUtf16 { line: 1, col: 1 }); |
22 | assert_eq!(index.line_col(6.into()), LineCol { line: 1, col_utf16: 5 }); | 22 | assert_eq!(index.line_col(6.into()), LineColUtf16 { line: 1, col: 5 }); |
23 | assert_eq!(index.line_col(7.into()), LineCol { line: 2, col_utf16: 0 }); | 23 | assert_eq!(index.line_col(7.into()), LineColUtf16 { line: 2, col: 0 }); |
24 | } | 24 | } |
25 | 25 | ||
26 | #[test] | 26 | #[test] |