language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 23:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implement utf8 offsets

Browse source
This commit is contained in:
Aleksey Kladov 2021-02-13 00:55:27 +03:00
parent 0025836f26
commit c8b9ec8e62
5 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/rust-analyzer/src/global_state.rs
View file

@ -22,7 +22,7 @@ use crate::{
diagnostics::{CheckFixes, DiagnosticCollection},
document::DocumentData,
from_proto,
line_endings::{LineEndings, LineIndex},
line_endings::{LineEndings, LineIndex, OffsetEncoding},
main_loop::Task,
op_queue::OpQueue,
reload::SourceRootConfig,
@ -274,7 +274,7 @@ impl GlobalStateSnapshot {
pub(crate) fn file_line_index(&self, file_id: FileId) -> Cancelable<LineIndex> {
let endings = self.vfs.read().1[&file_id];
let index = self.analysis.file_line_index(file_id)?;
let res = LineIndex { index, endings };
let res = LineIndex { index, endings, encoding: OffsetEncoding::Utf16 };
Ok(res)
}