Skip to content

Commit c59ae2b

Browse files
mrubensmrubens
committed
Revert test changes
1 parent e256776 commit c59ae2b

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎src/core/diff/strategies/__tests__/multi-search-replace.test.ts‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ function five() {
903903
const diff =
904904
"<<<<<<< SEARCH\n" +
905905
"before\n" +
906-
"\\<<<<<<<\n" +
906+
"\\<<<<<<< SEARCH\n" +
907907
"after\n" +
908908
"=======\n" +
909909
"new content\n" +
@@ -926,11 +926,11 @@ function five() {
926926
})
927927

928928
it("processes escaped search marker in content", async () => {
929-
const originalContent = "before\n<<<<<<<\nafter\n"
929+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
930930
const diffContent =
931931
"<<<<<<< SEARCH\n" +
932932
"before\n" +
933-
"\\<<<<<<<\n" +
933+
"\\<<<<<<< SEARCH\n" +
934934
"after\n" +
935935
"=======\n" +
936936
"unchanged\n" +
@@ -960,11 +960,11 @@ function five() {
960960
})
961961

962962
it("processes escaped search marker in content", async () => {
963-
const originalContent = "before\n<<<<<<<\nafter\n"
963+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
964964
const diffContent =
965965
"<<<<<<< SEARCH\n" +
966966
"before\n" +
967-
"\\<<<<<<<\n" +
967+
"\\<<<<<<< SEARCH\n" +
968968
"after\n" +
969969
"=======\n" +
970970
"unchanged\n" +
@@ -994,12 +994,12 @@ function five() {
994994
})
995995

996996
it("processes escaped search marker in content", async () => {
997-
const originalContent = "before\n<<<<<<<\nafter\n"
997+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
998998
const diffContent =
999999
"test.ts\n" +
10001000
"<<<<<<< SEARCH\n" +
10011001
"before\n" +
1002-
"\\<<<<<<<\n" +
1002+
"\\<<<<<<< SEARCH\n" +
10031003
"after\n" +
10041004
"=======\n" +
10051005
"unchanged\n" +
@@ -1012,12 +1012,12 @@ function five() {
10121012
})
10131013

10141014
it("processes escaped search marker in content", async () => {
1015-
const originalContent = "before\n<<<<<<<\nafter\n"
1015+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
10161016
const diffContent =
10171017
"test.ts\n" +
10181018
"<<<<<<< SEARCH\n" +
10191019
"before\n" +
1020-
"\\<<<<<<<\n" +
1020+
"\\<<<<<<< SEARCH\n" +
10211021
"after\n" +
10221022
"=======\n" +
10231023
"unchanged\n" +
@@ -1047,11 +1047,11 @@ function five() {
10471047
})
10481048

10491049
it("processes escaped search marker in content", async () => {
1050-
const originalContent = "before\n<<<<<<<\nafter\n"
1050+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
10511051
const diffContent =
10521052
"<<<<<<< SEARCH\n" +
10531053
"before\n" +
1054-
"\\<<<<<<<\n" +
1054+
"\\<<<<<<< SEARCH\n" +
10551055
"after\n" +
10561056
"=======\n" +
10571057
"unchanged\n" +
@@ -1064,11 +1064,11 @@ function five() {
10641064
})
10651065

10661066
it("processes escaped search marker in content", async () => {
1067-
const originalContent = "before\n<<<<<<<\nafter\n"
1067+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
10681068
const diffContent =
10691069
"<<<<<<< SEARCH\n" +
10701070
"before\n" +
1071-
"\\<<<<<<<\n" +
1071+
"\\<<<<<<< SEARCH\n" +
10721072
"after\n" +
10731073
"=======\n" +
10741074
"unchanged\n" +
@@ -1081,11 +1081,11 @@ function five() {
10811081
})
10821082

10831083
it("processes escaped search marker in content", async () => {
1084-
const originalContent = "before\n<<<<<<<\nafter\n"
1084+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
10851085
const diffContent =
10861086
"<<<<<<< SEARCH\n" +
10871087
"before\n" +
1088-
"\\<<<<<<<\n" +
1088+
"\\<<<<<<< SEARCH\n" +
10891089
"after\n" +
10901090
"=======\n" +
10911091
"unchanged\n" +
@@ -1118,7 +1118,7 @@ function five() {
11181118
const diff =
11191119
"<<<<<<< SEARCH\n" +
11201120
"before\n" +
1121-
"\\<<<<<<<\n" +
1121+
"\\<<<<<<< SEARCH\n" +
11221122
"after\n" +
11231123
"=======\n" +
11241124
"new content\n" +
@@ -1142,7 +1142,7 @@ function five() {
11421142
const diff =
11431143
"<<<<<<< SEARCH\n" +
11441144
"before\n" +
1145-
"\\<<<<<<<\n" +
1145+
"\\<<<<<<< SEARCH\n" +
11461146
"after\n" +
11471147
"=======\n" +
11481148
"new content\n" +
@@ -1154,7 +1154,7 @@ function five() {
11541154
const diff =
11551155
"<<<<<<< SEARCH\n" +
11561156
"before\n" +
1157-
"\\<<<<<<<\n" +
1157+
"\\<<<<<<< SEARCH\n" +
11581158
"after\n" +
11591159
"=======\n" +
11601160
"new content\n" +
@@ -1178,7 +1178,7 @@ function five() {
11781178
const diff =
11791179
"<<<<<<< SEARCH\n" +
11801180
"before\n" +
1181-
"\\>>>>>>>\n" +
1181+
"\\>>>>>>> REPLACE\n" +
11821182
"after\n" +
11831183
"=======\n" +
11841184
"new content\n" +
@@ -1202,7 +1202,7 @@ function five() {
12021202
const diff =
12031203
"<<<<<<< SEARCH\n" +
12041204
"before\n" +
1205-
"\\>>>>>>>\n" +
1205+
"\\>>>>>>> REPLACE\n" +
12061206
"after\n" +
12071207
"=======\n" +
12081208
"new content\n" +
@@ -1214,7 +1214,7 @@ function five() {
12141214
const diff =
12151215
"<<<<<<< SEARCH\n" +
12161216
"before\n" +
1217-
"\\>>>>>>>\n" +
1217+
"\\>>>>>>> REPLACE\n" +
12181218
"after\n" +
12191219
"=======\n" +
12201220
"new content\n" +
@@ -1223,11 +1223,11 @@ function five() {
12231223
})
12241224

12251225
it("processes escaped search marker in content", async () => {
1226-
const originalContent = "before\n<<<<<<<\nafter\n"
1226+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
12271227
const diffContent =
12281228
"<<<<<<< SEARCH\n" +
12291229
"before\n" +
1230-
"\\<<<<<<<\n" +
1230+
"\\<<<<<<< SEARCH\n" +
12311231
"after\n" +
12321232
"=======\n" +
12331233
"replaced content\n" +
@@ -1240,11 +1240,11 @@ function five() {
12401240
})
12411241

12421242
it("processes escaped replace marker in content", async () => {
1243-
const originalContent = "before\n>>>>>>>\nafter\n"
1243+
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
12441244
const diffContent =
12451245
"<<<<<<< SEARCH\n" +
12461246
"before\n" +
1247-
"\\>>>>>>>\n" +
1247+
"\\>>>>>>> REPLACE\n" +
12481248
"after\n" +
12491249
"=======\n" +
12501250
"unchanged\n" +
@@ -1257,12 +1257,12 @@ function five() {
12571257
})
12581258

12591259
it("processes multiple escaped markers in content", async () => {
1260-
const originalContent = "<<<<<<<\n=======\n>>>>>>>\n"
1260+
const originalContent = "<<<<<<< SEARCH\n=======\n>>>>>>> REPLACE\n"
12611261
const diffContent =
12621262
"<<<<<<< SEARCH\n" +
1263-
"\\<<<<<<<\n" +
1263+
"\\<<<<<<< SEARCH\n" +
12641264
"\\=======\n" +
1265-
"\\>>>>>>>\n" +
1265+
"\\>>>>>>> REPLACE\n" +
12661266
"=======\n" +
12671267
"unchanged\n" +
12681268
">>>>>>> REPLACE"
@@ -1291,11 +1291,11 @@ function five() {
12911291
})
12921292

12931293
it("processes escaped search marker in content", async () => {
1294-
const originalContent = "before\n<<<<<<<\nafter\n"
1294+
const originalContent = "before\n<<<<<<< SEARCH\nafter\n"
12951295
const diffContent =
12961296
"<<<<<<< SEARCH\n" +
12971297
"before\n" +
1298-
"\\<<<<<<<\n" +
1298+
"\\<<<<<<< SEARCH\n" +
12991299
"after\n" +
13001300
"=======\n" +
13011301
"unchanged\n" +
@@ -1308,11 +1308,11 @@ function five() {
13081308
})
13091309

13101310
it("processes escaped replace marker in content", async () => {
1311-
const originalContent = "before\n>>>>>>>\nafter\n"
1311+
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
13121312
const diffContent =
13131313
"<<<<<<< SEARCH\n" +
13141314
"before\n" +
1315-
"\\>>>>>>>\n" +
1315+
"\\>>>>>>> REPLACE\n" +
13161316
"after\n" +
13171317
"=======\n" +
13181318
"unchanged\n" +
@@ -1343,11 +1343,11 @@ function five() {
13431343
})
13441344

13451345
it("processes escaped replace marker in content", async () => {
1346-
const originalContent = "before\n>>>>>>>\nafter\n"
1346+
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
13471347
const diffContent =
13481348
"<<<<<<< SEARCH\n" +
13491349
"before\n" +
1350-
"\\>>>>>>>\n" +
1350+
"\\>>>>>>> REPLACE\n" +
13511351
"after\n" +
13521352
"=======\n" +
13531353
"unchanged\n" +
@@ -1360,12 +1360,12 @@ function five() {
13601360
})
13611361

13621362
it("processes multiple escaped markers in content", async () => {
1363-
const originalContent = "<<<<<<<\n=======\n>>>>>>>\n"
1363+
const originalContent = "<<<<<<< SEARCH\n=======\n>>>>>>> REPLACE\n"
13641364
const diffContent =
13651365
"<<<<<<< SEARCH\n" +
1366-
"\\<<<<<<<\n" +
1366+
"\\<<<<<<< SEARCH\n" +
13671367
"\\=======\n" +
1368-
"\\>>>>>>>\n" +
1368+
"\\>>>>>>> REPLACE\n" +
13691369
"=======\n" +
13701370
"unchanged\n" +
13711371
">>>>>>> REPLACE"
@@ -1377,11 +1377,11 @@ function five() {
13771377
})
13781378

13791379
it("processes escaped replace marker in content", async () => {
1380-
const originalContent = "before\n>>>>>>>\nafter\n"
1380+
const originalContent = "before\n>>>>>>> REPLACE\nafter\n"
13811381
const diffContent =
13821382
"<<<<<<< SEARCH\n" +
13831383
"before\n" +
1384-
"\\>>>>>>>\n" +
1384+
"\\>>>>>>> REPLACE\n" +
13851385
"after\n" +
13861386
"=======\n" +
13871387
"unchanged\n" +
@@ -1394,12 +1394,12 @@ function five() {
13941394
})
13951395

13961396
it("processes multiple escaped markers in content", async () => {
1397-
const originalContent = "<<<<<<<\n=======\n>>>>>>>\n"
1397+
const originalContent = "<<<<<<< SEARCH\n=======\n>>>>>>> REPLACE\n"
13981398
const diffContent =
13991399
"<<<<<<< SEARCH\n" +
1400-
"\\<<<<<<<\n" +
1400+
"\\<<<<<<< SEARCH\n" +
14011401
"\\=======\n" +
1402-
"\\>>>>>>>\n" +
1402+
"\\>>>>>>> REPLACE\n" +
14031403
"=======\n" +
14041404
"unchanged\n" +
14051405
">>>>>>> REPLACE"
@@ -1414,7 +1414,7 @@ function five() {
14141414
const diff =
14151415
"<<<<<<< SEARCH\n" +
14161416
"before\n" +
1417-
"\\>>>>>>>\n" +
1417+
"\\>>>>>>> REPLACE\n" +
14181418
"after\n" +
14191419
"=======\n" +
14201420
"new content\n" +
@@ -1426,9 +1426,9 @@ function five() {
14261426
it("allows multiple escaped markers in content", () => {
14271427
const diff =
14281428
"<<<<<<< SEARCH\n" +
1429-
"\\<<<<<<<\n" +
1429+
"\\<<<<<<< SEARCH\n" +
14301430
"\\=======\n" +
1431-
"\\>>>>>>>\n" +
1431+
"\\>>>>>>> REPLACE\n" +
14321432
"=======\n" +
14331433
"new content\n" +
14341434
">>>>>>> REPLACE"

0 commit comments

Comments
 (0)