diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-12 07:52:38 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-12 07:52:38 +0000 |
| commit | 0156a538089828340a823ed02da8970bf4f1175b (patch) | |
| tree | 07c4eacaad717ea802ab26972f45223281f2c9c1 /crates/ra_lsp_server/src/main_loop | |
| parent | f655f993fe6d9faa81b0e776b9b24308d2ea1c68 (diff) | |
| parent | 0527e3b283af0153cf13fa64fe73862a5b7655c8 (diff) | |
Merge #276
276: Extract and rename AtomEdit and Edit into ra_text_edit r=matklad a=vemoo
As discused in #105
Co-authored-by: Bernardo <berublan@gmail.com>
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop')
| -rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 92e92f836..21ca22c5c 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
| @@ -9,7 +9,8 @@ use languageserver_types::{ | |||
| 9 | WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents, | 9 | WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents, |
| 10 | }; | 10 | }; |
| 11 | use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition}; | 11 | use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition}; |
| 12 | use ra_syntax::{TextUnit, text_utils::{contains_offset_nonstrict, intersect}}; | 12 | use ra_syntax::{TextUnit, text_utils::intersect}; |
| 13 | use ra_text_edit::text_utils::contains_offset_nonstrict; | ||
| 13 | use rustc_hash::FxHashMap; | 14 | use rustc_hash::FxHashMap; |
| 14 | use serde_json::to_value; | 15 | use serde_json::to_value; |
| 15 | 16 | ||