From aa628f474947c46871e1ec82f87be5fc99974b36 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 21 Dec 2018 11:15:23 +0300 Subject: fix SourceFileEdit name --- crates/ra_analysis/src/imp.rs | 4 ++-- crates/ra_analysis/src/lib.rs | 4 ++-- crates/ra_lsp_server/src/conv.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates') diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index b44d9297a..cefe5a748 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs @@ -25,7 +25,7 @@ use crate::{ db, symbol_index::{SymbolIndex, SymbolsDatabase, LibrarySymbolsQuery}, AnalysisChange, RootChange, Cancelable, CrateId, Diagnostic, FileId, - FileSystemEdit, FilePosition, Query, SourceChange, SourceFileNodeEdit, + FileSystemEdit, FilePosition, Query, SourceChange, SourceFileEdit, ReferenceResolution, }; @@ -518,7 +518,7 @@ impl AnalysisImpl { impl SourceChange { pub(crate) fn from_local_edit(file_id: FileId, label: &str, edit: LocalEdit) -> SourceChange { - let file_edit = SourceFileNodeEdit { + let file_edit = SourceFileEdit { file_id, edits: edit.edit.into_atoms(), }; diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index a1d462528..d5725ef2e 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs @@ -159,13 +159,13 @@ impl AnalysisHost { #[derive(Debug)] pub struct SourceChange { pub label: String, - pub source_file_edits: Vec, + pub source_file_edits: Vec, pub file_system_edits: Vec, pub cursor_position: Option, } #[derive(Debug)] -pub struct SourceFileNodeEdit { +pub struct SourceFileEdit { pub file_id: FileId, pub edits: Vec, } diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs index 7467f472c..198dbfc49 100644 --- a/crates/ra_lsp_server/src/conv.rs +++ b/crates/ra_lsp_server/src/conv.rs @@ -2,7 +2,7 @@ use languageserver_types::{ self, Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier, TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier, }; -use ra_analysis::{FileId, FileSystemEdit, SourceChange, SourceFileNodeEdit, FilePosition}; +use ra_analysis::{FileId, FileSystemEdit, SourceChange, SourceFileEdit, FilePosition}; use ra_editor::{LineCol, LineIndex}; use ra_text_edit::{AtomTextEdit, TextEdit}; use ra_syntax::{SyntaxKind, TextRange, TextUnit}; @@ -256,7 +256,7 @@ fn translate_offset_with_edit( } } -impl TryConvWith for SourceFileNodeEdit { +impl TryConvWith for SourceFileEdit { type Ctx = ServerWorld; type Output = TextDocumentEdit; fn try_conv_with(self, world: &ServerWorld) -> Result { -- cgit v1.2.3