From 51632018479bab917415768797983c3f768679dd Mon Sep 17 00:00:00 2001
From: hamidreza kalbasi <hamidrezakalbasi@protonmail.com>
Date: Wed, 8 Sep 2021 20:26:06 +0430
Subject: [PATCH] use utf16 instead of utf8

---
 crates/ide/src/static_index.rs                  | 3 +++
 crates/rust-analyzer/src/cli/lsif.rs            | 8 ++++++--
 crates/rust-analyzer/src/cli/lsif/lsif_types.rs | 3 +++
 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 1b384853beb0..806230544f3b 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 fbd5b642a6b0..2ba965a15d40 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 bd29fd3ad8fb..d84155d8a5b8 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 6d46171cc3ab..c116414da01d 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,