Unnamed repository; edit this file 'description' to name the repository.
use utf16 instead of utf8
| -rw-r--r-- | crates/ide/src/static_index.rs | 3 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/cli/lsif.rs | 8 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/cli/lsif/lsif_types.rs | 3 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/line_index.rs | 6 |
4 files changed, 12 insertions, 8 deletions
diff --git a/crates/ide/src/static_index.rs b/crates/ide/src/static_index.rs index 1b384853be..806230544f 100644 --- a/crates/ide/src/static_index.rs +++ b/crates/ide/src/static_index.rs @@ -1,3 +1,6 @@ +//! This module provides `StaticIndex` which is used for powering +//! read-only code browsers and emitting LSIF + use hir::{db::HirDatabase, Crate, Module}; use ide_db::base_db::{FileId, SourceDatabaseExt}; use ide_db::RootDatabase; diff --git a/crates/rust-analyzer/src/cli/lsif.rs b/crates/rust-analyzer/src/cli/lsif.rs index fbd5b642a6..2ba965a15d 100644 --- a/crates/rust-analyzer/src/cli/lsif.rs +++ b/crates/rust-analyzer/src/cli/lsif.rs @@ -16,7 +16,7 @@ use crate::cli::{ load_cargo::{load_workspace, LoadCargoConfig}, Result, }; -use crate::line_index::LineIndex; +use crate::line_index::{LineEndings, LineIndex, OffsetEncoding}; use crate::to_proto; /// Need to wrap Snapshot to provide `Clone` impl for `map_with` @@ -99,7 +99,11 @@ impl flags::Lsif { .map(|it| { to_proto::folding_range( &*text, - &LineIndex::with_default_options(line_index.clone()), + &LineIndex { + index: line_index.clone(), + encoding: OffsetEncoding::Utf16, + endings: LineEndings::Unix, + }, false, it, ) diff --git a/crates/rust-analyzer/src/cli/lsif/lsif_types.rs b/crates/rust-analyzer/src/cli/lsif/lsif_types.rs index bd29fd3ad8..d84155d8a5 100644 --- a/crates/rust-analyzer/src/cli/lsif/lsif_types.rs +++ b/crates/rust-analyzer/src/cli/lsif/lsif_types.rs @@ -1,3 +1,6 @@ +//! This module provides LSIF types. This module is a temporary solution +//! and it will go to its own repository in future + use lsp_types::FoldingRange; use serde::{Deserialize, Serialize}; diff --git a/crates/rust-analyzer/src/line_index.rs b/crates/rust-analyzer/src/line_index.rs index 6d46171cc3..c116414da0 100644 --- a/crates/rust-analyzer/src/line_index.rs +++ b/crates/rust-analyzer/src/line_index.rs @@ -18,12 +18,6 @@ pub(crate) struct LineIndex { pub(crate) encoding: OffsetEncoding, } -impl LineIndex { - pub(crate) fn with_default_options(index: Arc<ide::LineIndex>) -> Self { - Self { index, endings: LineEndings::Unix, encoding: OffsetEncoding::Utf8 } - } -} - #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] pub(crate) enum LineEndings { Unix, |