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

fixup folding ranges for "lineFoldingOnly" clients #2033

Browse source
This commit is contained in:
Alex Zatelepin 2019-10-21 02:04:55 +03:00
parent 6b9bd7bdd2
commit 9d5e932626
4 changed files with 74 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -18,7 +18,7 @@ use serde_json::to_value;
use crate::{
cargo_target_spec::{runnable_args, CargoTargetSpec},
conv::{to_location, Conv, ConvWith, MapConvWith, TryConvWith, TryConvWithToVec},
conv::{to_location, Conv, ConvWith, FoldConvCtx, MapConvWith, TryConvWith, TryConvWithToVec},
req::{self, Decoration, InlayHint, InlayHintsParams, InlayKind},
world::WorldSnapshot,
LspError, Result,
@ -383,8 +383,14 @@ pub fn handle_folding_range(
) -> Result<Option<Vec<FoldingRange>>> {
let file_id = params.text_document.try_conv_with(&world)?;
let folds = world.analysis().folding_ranges(file_id)?;
let text = world.analysis().file_text(file_id)?;
let line_index = world.analysis().file_line_index(file_id)?;
let res = Some(folds.into_iter().map_conv_with(&*line_index).collect());
let ctx = FoldConvCtx {
text: &text,
line_index: &line_index,
line_folding_only: world.options.line_folding_only,
};
let res = Some(folds.into_iter().map_conv_with(&ctx).collect());
Ok(res)
}