fix SourceFileEdit name

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index b44d9297a90969db75fa1f013b7b8ef145514efe..cefe5a748ecd2636a080782f60dcc1bb30453754 100644 (file)
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -25,7 +25,7 @@
     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 @@ fn index_resolve(&self, name_ref: ast::NameRef) -> Cancelable<Vec<(FileId, FileS
 
 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 a1d462528d60c943f8392f6d6750ea7e279604b2..d5725ef2e5dde28ffa29aa5f8a796a202dc37bdc 100644 (file)
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -159,13 +159,13 @@ pub fn apply_change(&mut self, change: AnalysisChange) {
 #[derive(Debug)]
 pub struct SourceChange {
     pub label: String,
-    pub source_file_edits: Vec<SourceFileNodeEdit>,
+    pub source_file_edits: Vec<SourceFileEdit>,
     pub file_system_edits: Vec<FileSystemEdit>,
     pub cursor_position: Option<FilePosition>,
 }
 
 #[derive(Debug)]
-pub struct SourceFileNodeEdit {
+pub struct SourceFileEdit {
     pub file_id: FileId,
     pub edits: Vec<AtomTextEdit>,
 }

diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index 7467f472cb4fb552cd3da7f7aa95c56423594873..198dbfc4951763ef96a0154637cef0bbd281b0ec 100644 (file)
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -2,7 +2,7 @@
     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<TextDocumentEdit> {