Skip to content

Commit 656ac10

Browse files
UrhengulasUrhengulas
committed
Do not extract FileId for file_system_edits
1 parent ea675ab commit 656ac10

File tree

1 file changed

+92
-160
lines changed

1 file changed

+92
-160
lines changed

‎crates/ide/src/rename.rs

+92-160
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ fn text_edit_from_self_param(self_param: &ast::SelfParam, new_name: &str) -> Opt
366366
#[cfg(test)]
367367
mod tests {
368368
use expect_test::{expect, Expect};
369-
use ide_db::source_change::{FileSystemEdit, SourceChange};
369+
use ide_db::source_change::SourceChange;
370370
use stdx::trim_indent;
371371
use test_utils::assert_eq_text;
372372
use text_edit::TextEdit;
@@ -452,22 +452,9 @@ mod tests {
452452
.map(|(id, (text_edit, _))| (id, text_edit.into_iter().collect::<Vec<_>>()))
453453
.collect::<Vec<_>>();
454454

455-
let file_system_edits = source_change
456-
.file_system_edits
457-
.into_iter()
458-
.map(|file_system_edit| {
459-
let id = match &file_system_edit {
460-
FileSystemEdit::CreateFile { .. } => unreachable!(),
461-
FileSystemEdit::MoveFile { src, .. } => src,
462-
FileSystemEdit::MoveDir { src_id, .. } => src_id,
463-
};
464-
(id.clone(), file_system_edit)
465-
})
466-
.collect::<Vec<_>>();
467-
468455
format!(
469456
"source_file_edits: {:#?}\nfile_system_edits: {:#?}\n",
470-
source_file_edits, file_system_edits
457+
source_file_edits, source_change.file_system_edits
471458
)
472459
}
473460

@@ -957,22 +944,17 @@ mod foo$0;
957944
),
958945
]
959946
file_system_edits: [
960-
(
961-
FileId(
947+
MoveFile {
948+
src: FileId(
962949
2,
963950
),
964-
MoveFile {
965-
src: FileId(
951+
dst: AnchoredPathBuf {
952+
anchor: FileId(
966953
2,
967954
),
968-
dst: AnchoredPathBuf {
969-
anchor: FileId(
970-
2,
971-
),
972-
path: "foo2.rs",
973-
},
955+
path: "foo2.rs",
974956
},
975-
),
957+
},
976958
]
977959
"#]],
978960
);
@@ -1020,22 +1002,17 @@ use crate::foo$0::FooContent;
10201002
),
10211003
]
10221004
file_system_edits: [
1023-
(
1024-
FileId(
1005+
MoveFile {
1006+
src: FileId(
10251007
1,
10261008
),
1027-
MoveFile {
1028-
src: FileId(
1009+
dst: AnchoredPathBuf {
1010+
anchor: FileId(
10291011
1,
10301012
),
1031-
dst: AnchoredPathBuf {
1032-
anchor: FileId(
1033-
1,
1034-
),
1035-
path: "quux.rs",
1036-
},
1013+
path: "quux.rs",
10371014
},
1038-
),
1015+
},
10391016
]
10401017
"#]],
10411018
);
@@ -1066,28 +1043,23 @@ mod fo$0o;
10661043
),
10671044
]
10681045
file_system_edits: [
1069-
(
1070-
FileId(
1046+
MoveDir {
1047+
src: AnchoredPathBuf {
1048+
anchor: FileId(
1049+
1,
1050+
),
1051+
path: "../foo",
1052+
},
1053+
src_id: FileId(
10711054
1,
10721055
),
1073-
MoveDir {
1074-
src: AnchoredPathBuf {
1075-
anchor: FileId(
1076-
1,
1077-
),
1078-
path: "../foo",
1079-
},
1080-
src_id: FileId(
1056+
dst: AnchoredPathBuf {
1057+
anchor: FileId(
10811058
1,
10821059
),
1083-
dst: AnchoredPathBuf {
1084-
anchor: FileId(
1085-
1,
1086-
),
1087-
path: "../foo2",
1088-
},
1060+
path: "../foo2",
10891061
},
1090-
),
1062+
},
10911063
]
10921064
"#]],
10931065
);
@@ -1119,22 +1091,17 @@ mod outer { mod fo$0o; }
11191091
),
11201092
]
11211093
file_system_edits: [
1122-
(
1123-
FileId(
1094+
MoveFile {
1095+
src: FileId(
11241096
1,
11251097
),
1126-
MoveFile {
1127-
src: FileId(
1098+
dst: AnchoredPathBuf {
1099+
anchor: FileId(
11281100
1,
11291101
),
1130-
dst: AnchoredPathBuf {
1131-
anchor: FileId(
1132-
1,
1133-
),
1134-
path: "bar.rs",
1135-
},
1102+
path: "bar.rs",
11361103
},
1137-
),
1104+
},
11381105
]
11391106
"#]],
11401107
);
@@ -1206,22 +1173,17 @@ pub mod foo$0;
12061173
),
12071174
]
12081175
file_system_edits: [
1209-
(
1210-
FileId(
1176+
MoveFile {
1177+
src: FileId(
12111178
2,
12121179
),
1213-
MoveFile {
1214-
src: FileId(
1180+
dst: AnchoredPathBuf {
1181+
anchor: FileId(
12151182
2,
12161183
),
1217-
dst: AnchoredPathBuf {
1218-
anchor: FileId(
1219-
2,
1220-
),
1221-
path: "foo2.rs",
1222-
},
1184+
path: "foo2.rs",
12231185
},
1224-
),
1186+
},
12251187
]
12261188
"#]],
12271189
);
@@ -1266,44 +1228,34 @@ mod quux;
12661228
),
12671229
]
12681230
file_system_edits: [
1269-
(
1270-
FileId(
1231+
MoveFile {
1232+
src: FileId(
12711233
1,
12721234
),
1273-
MoveFile {
1274-
src: FileId(
1235+
dst: AnchoredPathBuf {
1236+
anchor: FileId(
12751237
1,
12761238
),
1277-
dst: AnchoredPathBuf {
1278-
anchor: FileId(
1279-
1,
1280-
),
1281-
path: "foo2.rs",
1282-
},
1239+
path: "foo2.rs",
12831240
},
1284-
),
1285-
(
1286-
FileId(
1241+
},
1242+
MoveDir {
1243+
src: AnchoredPathBuf {
1244+
anchor: FileId(
1245+
1,
1246+
),
1247+
path: "foo",
1248+
},
1249+
src_id: FileId(
12871250
1,
12881251
),
1289-
MoveDir {
1290-
src: AnchoredPathBuf {
1291-
anchor: FileId(
1292-
1,
1293-
),
1294-
path: "foo",
1295-
},
1296-
src_id: FileId(
1252+
dst: AnchoredPathBuf {
1253+
anchor: FileId(
12971254
1,
12981255
),
1299-
dst: AnchoredPathBuf {
1300-
anchor: FileId(
1301-
1,
1302-
),
1303-
path: "foo2",
1304-
},
1256+
path: "foo2",
13051257
},
1306-
),
1258+
},
13071259
]
13081260
"#]],
13091261
)
@@ -1413,44 +1365,34 @@ pub fn baz() {}
14131365
),
14141366
]
14151367
file_system_edits: [
1416-
(
1417-
FileId(
1368+
MoveFile {
1369+
src: FileId(
14181370
1,
14191371
),
1420-
MoveFile {
1421-
src: FileId(
1372+
dst: AnchoredPathBuf {
1373+
anchor: FileId(
14221374
1,
14231375
),
1424-
dst: AnchoredPathBuf {
1425-
anchor: FileId(
1426-
1,
1427-
),
1428-
path: "fn.rs",
1429-
},
1376+
path: "fn.rs",
14301377
},
1431-
),
1432-
(
1433-
FileId(
1378+
},
1379+
MoveDir {
1380+
src: AnchoredPathBuf {
1381+
anchor: FileId(
1382+
1,
1383+
),
1384+
path: "foo",
1385+
},
1386+
src_id: FileId(
14341387
1,
14351388
),
1436-
MoveDir {
1437-
src: AnchoredPathBuf {
1438-
anchor: FileId(
1439-
1,
1440-
),
1441-
path: "foo",
1442-
},
1443-
src_id: FileId(
1389+
dst: AnchoredPathBuf {
1390+
anchor: FileId(
14441391
1,
14451392
),
1446-
dst: AnchoredPathBuf {
1447-
anchor: FileId(
1448-
1,
1449-
),
1450-
path: "fn",
1451-
},
1393+
path: "fn",
14521394
},
1453-
),
1395+
},
14541396
]
14551397
"#]],
14561398
);
@@ -1491,44 +1433,34 @@ pub fn baz() {}
14911433
),
14921434
]
14931435
file_system_edits: [
1494-
(
1495-
FileId(
1436+
MoveFile {
1437+
src: FileId(
14961438
1,
14971439
),
1498-
MoveFile {
1499-
src: FileId(
1440+
dst: AnchoredPathBuf {
1441+
anchor: FileId(
15001442
1,
15011443
),
1502-
dst: AnchoredPathBuf {
1503-
anchor: FileId(
1504-
1,
1505-
),
1506-
path: "foo.rs",
1507-
},
1444+
path: "foo.rs",
15081445
},
1509-
),
1510-
(
1511-
FileId(
1446+
},
1447+
MoveDir {
1448+
src: AnchoredPathBuf {
1449+
anchor: FileId(
1450+
1,
1451+
),
1452+
path: "fn",
1453+
},
1454+
src_id: FileId(
15121455
1,
15131456
),
1514-
MoveDir {
1515-
src: AnchoredPathBuf {
1516-
anchor: FileId(
1517-
1,
1518-
),
1519-
path: "fn",
1520-
},
1521-
src_id: FileId(
1457+
dst: AnchoredPathBuf {
1458+
anchor: FileId(
15221459
1,
15231460
),
1524-
dst: AnchoredPathBuf {
1525-
anchor: FileId(
1526-
1,
1527-
),
1528-
path: "foo",
1529-
},
1461+
path: "foo",
15301462
},
1531-
),
1463+
},
15321464
]
15331465
"#]],
15341466
);

0 commit comments

Comments
 (0)