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

upstream text-utils to text_unit

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-08 21:50:04 +03:00
parent c9e42fcf24
commit f553837c1c
10 changed files with 20 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,8 +11,7 @@ use languageserver_types::{
use ra_analysis::{
FileId, FilePosition, FileRange, FoldKind, Query, RunnableKind, Severity, SourceChange,
};
use ra_syntax::{text_utils::intersect, TextUnit, AstNode};
use ra_text_edit::text_utils::contains_offset_nonstrict;
use ra_syntax::{TextUnit, AstNode};
use rustc_hash::FxHashMap;
use serde_json::to_value;
use std::io::Write;
@ -248,7 +247,7 @@ pub fn handle_runnables(
let mut res = Vec::new();
for runnable in world.analysis().runnables(file_id)? {
if let Some(offset) = offset {
if !contains_offset_nonstrict(runnable.range, offset) {
if !runnable.range.contains_inclusive(offset) {
continue;
}
}
@ -650,7 +649,7 @@ pub fn handle_code_action(
.diagnostics(file_id)?
.into_iter()
.filter_map(|d| Some((d.range, d.fix?)))
.filter(|(diag_range, _fix)| intersect(*diag_range, range).is_some())
.filter(|(diag_range, _fix)| diag_range.intersection(&range).is_some())
.map(|(_range, fix)| fix);
let mut res = Vec::new();