diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_analysis/src/imp.rs | 4 | ||||
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index 704648b59..86d9cecd2 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs | |||
@@ -27,7 +27,7 @@ use crate::{ | |||
27 | input::{FilesDatabase, SourceRoot, SourceRootId, WORKSPACE}, | 27 | input::{FilesDatabase, SourceRoot, SourceRootId, WORKSPACE}, |
28 | symbol_index::SymbolIndex, | 28 | symbol_index::SymbolIndex, |
29 | AnalysisChange, Cancelable, CrateGraph, CrateId, Diagnostic, FileId, FileResolver, | 29 | AnalysisChange, Cancelable, CrateGraph, CrateId, Diagnostic, FileId, FileResolver, |
30 | FileSystemEdit, Position, Query, SourceChange, SourceFileEdit, | 30 | FileSystemEdit, FilePosition, Query, SourceChange, SourceFileEdit, |
31 | }; | 31 | }; |
32 | 32 | ||
33 | #[derive(Clone, Debug)] | 33 | #[derive(Clone, Debug)] |
@@ -568,7 +568,7 @@ impl SourceChange { | |||
568 | file_system_edits: vec![], | 568 | file_system_edits: vec![], |
569 | cursor_position: edit | 569 | cursor_position: edit |
570 | .cursor_position | 570 | .cursor_position |
571 | .map(|offset| Position { offset, file_id }), | 571 | .map(|offset| FilePosition { offset, file_id }), |
572 | } | 572 | } |
573 | } | 573 | } |
574 | } | 574 | } |
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index fee382151..3bbe61917 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -120,17 +120,17 @@ impl AnalysisHost { | |||
120 | } | 120 | } |
121 | 121 | ||
122 | #[derive(Debug)] | 122 | #[derive(Debug)] |
123 | pub struct FilePosition { | ||
124 | pub file_id: FileId, | ||
125 | pub offset: TextUnit, | ||
126 | } | ||
127 | |||
128 | #[derive(Debug)] | ||
123 | pub struct SourceChange { | 129 | pub struct SourceChange { |
124 | pub label: String, | 130 | pub label: String, |
125 | pub source_file_edits: Vec<SourceFileEdit>, | 131 | pub source_file_edits: Vec<SourceFileEdit>, |
126 | pub file_system_edits: Vec<FileSystemEdit>, | 132 | pub file_system_edits: Vec<FileSystemEdit>, |
127 | pub cursor_position: Option<Position>, | 133 | pub cursor_position: Option<FilePosition>, |
128 | } | ||
129 | |||
130 | #[derive(Debug)] | ||
131 | pub struct Position { | ||
132 | pub file_id: FileId, | ||
133 | pub offset: TextUnit, | ||
134 | } | 134 | } |
135 | 135 | ||
136 | #[derive(Debug)] | 136 | #[derive(Debug)] |