nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-12 08:36:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix SourceFileEdit name

Browse Source
This commit is contained in:
Aleksey Kladov 2018-12-21 11:15:23 +03:00
parent f897de5b78
commit aa628f4749
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_analysis/src/imp.rs
View File

@ -25,7 +25,7 @@ use crate::{
db, db,
symbol_index::{SymbolIndex, SymbolsDatabase, LibrarySymbolsQuery}, symbol_index::{SymbolIndex, SymbolsDatabase, LibrarySymbolsQuery},
AnalysisChange, RootChange, Cancelable, CrateId, Diagnostic, FileId, AnalysisChange, RootChange, Cancelable, CrateId, Diagnostic, FileId,
FileSystemEdit, FilePosition, Query, SourceChange, SourceFileNodeEdit, FileSystemEdit, FilePosition, Query, SourceChange, SourceFileEdit,
ReferenceResolution, ReferenceResolution,
}; };
@ -518,7 +518,7 @@ impl AnalysisImpl {
impl SourceChange { impl SourceChange {
pub(crate) fn from_local_edit(file_id: FileId, label: &str, edit: LocalEdit) -> 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, file_id,
edits: edit.edit.into_atoms(), edits: edit.edit.into_atoms(),
}; };

4
crates/ra_analysis/src/lib.rs
View File

@ -159,13 +159,13 @@ impl AnalysisHost {
#[derive(Debug)] #[derive(Debug)]
pub struct SourceChange { pub struct SourceChange {
pub label: String, pub label: String,
pub source_file_edits: Vec<SourceFileNodeEdit>, pub source_file_edits: Vec<SourceFileEdit>,
pub file_system_edits: Vec<FileSystemEdit>, pub file_system_edits: Vec<FileSystemEdit>,
pub cursor_position: Option<FilePosition>, pub cursor_position: Option<FilePosition>,
} }
#[derive(Debug)] #[derive(Debug)]
pub struct SourceFileNodeEdit { pub struct SourceFileEdit {
pub file_id: FileId, pub file_id: FileId,
pub edits: Vec<AtomTextEdit>, pub edits: Vec<AtomTextEdit>,
} }

4
crates/ra_lsp_server/src/conv.rs
View File

@ -2,7 +2,7 @@ use languageserver_types::{
self, Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier, self, Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier, 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_editor::{LineCol, LineIndex};
use ra_text_edit::{AtomTextEdit, TextEdit}; use ra_text_edit::{AtomTextEdit, TextEdit};
use ra_syntax::{SyntaxKind, TextRange, TextUnit}; 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 Ctx = ServerWorld;
type Output = TextDocumentEdit; type Output = TextDocumentEdit;
fn try_conv_with(self, world: &ServerWorld) -> Result<TextDocumentEdit> { fn try_conv_with(self, world: &ServerWorld) -> Result<TextDocumentEdit> {