diff options
author | vsrs <[email protected]> | 2020-05-08 17:34:34 +0100 |
---|---|---|
committer | vsrs <[email protected]> | 2020-05-08 17:34:34 +0100 |
commit | 0ef17ef1ee9fb0ce7149176d12f4d225f6d01401 (patch) | |
tree | fa2f168120f36f8dbef5dc1e85fea0c0071639c2 /crates/ra_ide_db/src/source_change.rs | |
parent | 1be6320ea6cf7830195f80681fa0f43cc340da7e (diff) | |
parent | d3eb9d8eafbebca7da95fa8a4813b92eb5080500 (diff) |
Merge remote-tracking branch 'upstream/master' into uniformed_debug_lens
# Conflicts:
# editors/code/src/commands/runnables.ts
Diffstat (limited to 'crates/ra_ide_db/src/source_change.rs')
-rw-r--r-- | crates/ra_ide_db/src/source_change.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_ide_db/src/source_change.rs b/crates/ra_ide_db/src/source_change.rs index 4dd01b312..af81a91a4 100644 --- a/crates/ra_ide_db/src/source_change.rs +++ b/crates/ra_ide_db/src/source_change.rs | |||
@@ -6,7 +6,7 @@ | |||
6 | use ra_db::{FileId, FilePosition, RelativePathBuf, SourceRootId}; | 6 | use ra_db::{FileId, FilePosition, RelativePathBuf, SourceRootId}; |
7 | use ra_text_edit::{TextEdit, TextSize}; | 7 | use ra_text_edit::{TextEdit, TextSize}; |
8 | 8 | ||
9 | #[derive(Debug)] | 9 | #[derive(Debug, Clone)] |
10 | pub struct SourceChange { | 10 | pub struct SourceChange { |
11 | /// For display in the undo log in the editor | 11 | /// For display in the undo log in the editor |
12 | pub label: String, | 12 | pub label: String, |
@@ -90,13 +90,13 @@ impl SourceChange { | |||
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | #[derive(Debug)] | 93 | #[derive(Debug, Clone)] |
94 | pub struct SourceFileEdit { | 94 | pub struct SourceFileEdit { |
95 | pub file_id: FileId, | 95 | pub file_id: FileId, |
96 | pub edit: TextEdit, | 96 | pub edit: TextEdit, |
97 | } | 97 | } |
98 | 98 | ||
99 | #[derive(Debug)] | 99 | #[derive(Debug, Clone)] |
100 | pub enum FileSystemEdit { | 100 | pub enum FileSystemEdit { |
101 | CreateFile { source_root: SourceRootId, path: RelativePathBuf }, | 101 | CreateFile { source_root: SourceRootId, path: RelativePathBuf }, |
102 | MoveFile { src: FileId, dst_source_root: SourceRootId, dst_path: RelativePathBuf }, | 102 | MoveFile { src: FileId, dst_source_root: SourceRootId, dst_path: RelativePathBuf }, |