Prepare for utf-8 offsets

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 {
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub struct LineCol {
+pub struct LineColUtf16 {
     /// Zero-based
     pub line: u32,
     /// Zero-based
-    pub col_utf16: u32,
+    pub col: u32,
 }
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -88,17 +88,17 @@ impl LineIndex {
         LineIndex { newlines, utf16_lines }
     }
 
-    pub fn line_col(&self, offset: TextSize) -> LineCol {
+    pub fn line_col(&self, offset: TextSize) -> LineColUtf16 {
         let line = partition_point(&self.newlines, |&it| it <= offset) - 1;
         let line_start_offset = self.newlines[line];
         let col = offset - line_start_offset;
 
-        LineCol { line: line as u32, col_utf16: self.utf8_to_utf16_col(line as u32, col) as u32 }
+        LineColUtf16 { line: line as u32, col: self.utf8_to_utf16_col(line as u32, col) as u32 }
     }
 
-    pub fn offset(&self, line_col: LineCol) -> TextSize {
+    pub fn offset(&self, line_col: LineColUtf16) -> TextSize {
         //FIXME: return Result
-        let col = self.utf16_to_utf8_col(line_col.line, line_col.col_utf16);
+        let col = self.utf16_to_utf8_col(line_col.line, line_col.col);
         self.newlines[line_col.line as usize] + col
     }
 
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::*;
 fn test_line_index() {
     let text = "hello\nworld";
     let index = LineIndex::new(text);
-    assert_eq!(index.line_col(0.into()), LineCol { line: 0, col_utf16: 0 });
-    assert_eq!(index.line_col(1.into()), LineCol { line: 0, col_utf16: 1 });
-    assert_eq!(index.line_col(5.into()), LineCol { line: 0, col_utf16: 5 });
-    assert_eq!(index.line_col(6.into()), LineCol { line: 1, col_utf16: 0 });
-    assert_eq!(index.line_col(7.into()), LineCol { line: 1, col_utf16: 1 });
-    assert_eq!(index.line_col(8.into()), LineCol { line: 1, col_utf16: 2 });
-    assert_eq!(index.line_col(10.into()), LineCol { line: 1, col_utf16: 4 });
-    assert_eq!(index.line_col(11.into()), LineCol { line: 1, col_utf16: 5 });
-    assert_eq!(index.line_col(12.into()), LineCol { line: 1, col_utf16: 6 });
+    assert_eq!(index.line_col(0.into()), LineColUtf16 { line: 0, col: 0 });
+    assert_eq!(index.line_col(1.into()), LineColUtf16 { line: 0, col: 1 });
+    assert_eq!(index.line_col(5.into()), LineColUtf16 { line: 0, col: 5 });
+    assert_eq!(index.line_col(6.into()), LineColUtf16 { line: 1, col: 0 });
+    assert_eq!(index.line_col(7.into()), LineColUtf16 { line: 1, col: 1 });
+    assert_eq!(index.line_col(8.into()), LineColUtf16 { line: 1, col: 2 });
+    assert_eq!(index.line_col(10.into()), LineColUtf16 { line: 1, col: 4 });
+    assert_eq!(index.line_col(11.into()), LineColUtf16 { line: 1, col: 5 });
+    assert_eq!(index.line_col(12.into()), LineColUtf16 { line: 1, col: 6 });
 
     let text = "\nhello\nworld";
     let index = LineIndex::new(text);
-    assert_eq!(index.line_col(0.into()), LineCol { line: 0, col_utf16: 0 });
-    assert_eq!(index.line_col(1.into()), LineCol { line: 1, col_utf16: 0 });
-    assert_eq!(index.line_col(2.into()), LineCol { line: 1, col_utf16: 1 });
-    assert_eq!(index.line_col(6.into()), LineCol { line: 1, col_utf16: 5 });
-    assert_eq!(index.line_col(7.into()), LineCol { line: 2, col_utf16: 0 });
+    assert_eq!(index.line_col(0.into()), LineColUtf16 { line: 0, col: 0 });
+    assert_eq!(index.line_col(1.into()), LineColUtf16 { line: 1, col: 0 });
+    assert_eq!(index.line_col(2.into()), LineColUtf16 { line: 1, col: 1 });
+    assert_eq!(index.line_col(6.into()), LineColUtf16 { line: 1, col: 5 });
+    assert_eq!(index.line_col(7.into()), LineColUtf16 { line: 2, col: 0 });
 }
 
 #[test]