Skip to content

Commit 09eeedc

Browse files
nightwingmarijnh
nightwing
authored and
marijnh
committed
[vim] remove unnecessary uses of replace from vim test
1 parent dab6f67 commit 09eeedc

File tree

1 file changed

+34
-47
lines changed

1 file changed

+34
-47
lines changed

‎test/vim_test.js‎

Lines changed: 34 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,21 +1056,18 @@ function fillArray(val, times) {
10561056
testVim('c_visual_block', function(cm, vim, helpers) {
10571057
cm.setCursor(0, 1);
10581058
helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'c');
1059-
var replacement = fillArray('hello', 3);
1060-
cm.replaceSelections(replacement);
1059+
helpers.doKeys('hello');
10611060
eq('1hello\n5hello\nahellofg', cm.getValue());
10621061
helpers.doKeys('<Esc>');
10631062
cm.setCursor(2, 3);
10641063
helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
1065-
replacement = fillArray('world', 3);
1066-
cm.replaceSelections(replacement);
1064+
helpers.doKeys('world');
10671065
eq('1hworld\n5hworld\nahworld', cm.getValue());
10681066
}, {value: '1234\n5678\nabcdefg'});
10691067
testVim('c_visual_block_replay', function(cm, vim, helpers) {
10701068
cm.setCursor(0, 1);
10711069
helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
1072-
var replacement = fillArray('fo', 3);
1073-
cm.replaceSelections(replacement);
1070+
helpers.doKeys('fo');
10741071
eq('1fo4\n5fo8\nafodefg', cm.getValue());
10751072
helpers.doKeys('<Esc>');
10761073
cm.setCursor(0, 0);
@@ -1080,8 +1077,7 @@ testVim('c_visual_block_replay', function(cm, vim, helpers) {
10801077
testVim('I_visual_block_replay', function(cm, vim, helpers) {
10811078
cm.setCursor(0, 2);
10821079
helpers.doKeys('<C-v>', '2', 'j', 'l', 'I');
1083-
var replacement = fillArray('+-', 3);
1084-
cm.replaceSelections(replacement);
1080+
helpers.doKeys('+-')
10851081
eq('12+-34\n56+-78\nab+-cdefg\nxyz', cm.getValue());
10861082
helpers.doKeys('<Esc>');
10871083
// ensure that repeat location doesn't depend on last selection
@@ -1114,14 +1110,12 @@ testVim('D_visual_block', function(cm, vim, helpers) {
11141110
testVim('s_visual_block', function(cm, vim, helpers) {
11151111
cm.setCursor(0, 1);
11161112
helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 's');
1117-
var replacement = fillArray('hello{', 3);
1118-
cm.replaceSelections(replacement);
1113+
helpers.doKeys('hello{');
11191114
eq('1hello{\n5hello{\nahello{fg\n', cm.getValue());
11201115
helpers.doKeys('<Esc>');
11211116
cm.setCursor(2, 3);
11221117
helpers.doKeys('<C-v>', '1', 'k', 'h', 'S');
1123-
replacement = fillArray('world', 1);
1124-
cm.replaceSelections(replacement);
1118+
helpers.doKeys('world');
11251119
eq('1hello{\n world\n', cm.getValue());
11261120
}, {value: '1234\n5678\nabcdefg\n'});
11271121

@@ -1511,15 +1505,15 @@ testVim('i', function(cm, vim, helpers) {
15111505
});
15121506
testVim('i_repeat', function(cm, vim, helpers) {
15131507
helpers.doKeys('3', 'i');
1514-
cm.replaceRange('test', cm.getCursor());
1508+
helpers.doKeys('test')
15151509
helpers.doKeys('<Esc>');
15161510
eq('testtesttest', cm.getValue());
15171511
helpers.assertCursorAt(0, 11);
15181512
}, { value: '' });
15191513
testVim('i_repeat_delete', function(cm, vim, helpers) {
15201514
cm.setCursor(0, 4);
15211515
helpers.doKeys('2', 'i');
1522-
cm.replaceRange('z', cm.getCursor());
1516+
helpers.doKeys('z')
15231517
helpers.doInsertModeKeys('Backspace', 'Backspace');
15241518
helpers.doKeys('<Esc>');
15251519
eq('abe', cm.getValue());
@@ -1584,9 +1578,7 @@ testVim('A', function(cm, vim, helpers) {
15841578
testVim('A_visual_block', function(cm, vim, helpers) {
15851579
cm.setCursor(0, 1);
15861580
helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'A');
1587-
var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
1588-
replacement.pop();
1589-
cm.replaceSelections(replacement);
1581+
helpers.doKeys('hello');
15901582
eq('testhello\nmehello\npleahellose', cm.getValue());
15911583
helpers.doKeys('<Esc>');
15921584
cm.setCursor(0, 0);
@@ -1603,17 +1595,15 @@ testVim('I', function(cm, vim, helpers) {
16031595
testVim('I_repeat', function(cm, vim, helpers) {
16041596
cm.setCursor(0, 1);
16051597
helpers.doKeys('3', 'I');
1606-
cm.replaceRange('test', cm.getCursor());
1598+
helpers.doKeys('test')
16071599
helpers.doKeys('<Esc>');
16081600
eq('testtesttestblah', cm.getValue());
16091601
helpers.assertCursorAt(0, 11);
16101602
}, { value: 'blah' });
16111603
testVim('I_visual_block', function(cm, vim, helpers) {
16121604
cm.setCursor(0, 0);
16131605
helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'I');
1614-
var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
1615-
replacement.pop();
1616-
cm.replaceSelections(replacement);
1606+
helpers.doKeys('hello');
16171607
eq('hellotest\nhellome\nhelloplease', cm.getValue());
16181608
}, {value: 'test\nme\nplease'});
16191609
testVim('o', function(cm, vim, helpers) {
@@ -1626,7 +1616,7 @@ testVim('o', function(cm, vim, helpers) {
16261616
testVim('o_repeat', function(cm, vim, helpers) {
16271617
cm.setCursor(0, 0);
16281618
helpers.doKeys('3', 'o');
1629-
cm.replaceRange('test', cm.getCursor());
1619+
helpers.doKeys('test')
16301620
helpers.doKeys('<Esc>');
16311621
eq('\ntest\ntest\ntest', cm.getValue());
16321622
helpers.assertCursorAt(3, 3);
@@ -1750,8 +1740,8 @@ testVim('r_visual_block', function(cm, vim, helpers) {
17501740
eq('1 l\n5 l\nalllefg', cm.getValue());
17511741
cm.setCursor(2, 0);
17521742
helpers.doKeys('o');
1743+
helpers.doKeys('\t\t')
17531744
helpers.doKeys('<Esc>');
1754-
cm.replaceRange('\t\t', cm.getCursor());
17551745
helpers.doKeys('<C-v>', 'h', 'h', 'r', 'r');
17561746
eq('1 l\n5 l\nalllefg\nrrrrrrrr', cm.getValue());
17571747
}, {value: '1234\n5678\nabcdefg'});
@@ -2591,22 +2581,22 @@ testVim('g#', function(cm, vim, helpers) {
25912581
testVim('macro_insert', function(cm, vim, helpers) {
25922582
cm.setCursor(0, 0);
25932583
helpers.doKeys('q', 'a', '0', 'i');
2594-
cm.replaceRange('foo', cm.getCursor());
2584+
helpers.doKeys('foo')
25952585
helpers.doKeys('<Esc>');
25962586
helpers.doKeys('q', '@', 'a');
25972587
eq('foofoo', cm.getValue());
25982588
}, { value: ''});
25992589
testVim('macro_insert_repeat', function(cm, vim, helpers) {
26002590
cm.setCursor(0, 0);
26012591
helpers.doKeys('q', 'a', '$', 'a');
2602-
cm.replaceRange('larry.', cm.getCursor());
2592+
helpers.doKeys('larry.')
26032593
helpers.doKeys('<Esc>');
26042594
helpers.doKeys('a');
2605-
cm.replaceRange('curly.', cm.getCursor());
2595+
helpers.doKeys('curly.')
26062596
helpers.doKeys('<Esc>');
26072597
helpers.doKeys('q');
26082598
helpers.doKeys('a');
2609-
cm.replaceRange('moe.', cm.getCursor());
2599+
helpers.doKeys('moe.')
26102600
helpers.doKeys('<Esc>');
26112601
helpers.doKeys('@', 'a');
26122602
// At this point, the most recent edit should be the 2nd insert change
@@ -2684,10 +2674,10 @@ testVim('macro_last_run_macro', function (cm, vim, helpers) {
26842674
testVim('macro_parens', function(cm, vim, helpers) {
26852675
cm.setCursor(0, 0);
26862676
helpers.doKeys('q', 'z', 'i');
2687-
cm.replaceRange('(', cm.getCursor());
2677+
helpers.doKeys('(')
26882678
helpers.doKeys('<Esc>');
26892679
helpers.doKeys('e', 'a');
2690-
cm.replaceRange(')', cm.getCursor());
2680+
helpers.doKeys(')')
26912681
helpers.doKeys('<Esc>');
26922682
helpers.doKeys('q');
26932683
helpers.doKeys('w', '@', 'z');
@@ -2697,13 +2687,13 @@ testVim('macro_parens', function(cm, vim, helpers) {
26972687
testVim('macro_overwrite', function(cm, vim, helpers) {
26982688
cm.setCursor(0, 0);
26992689
helpers.doKeys('q', 'z', '0', 'i');
2700-
cm.replaceRange('I ', cm.getCursor());
2690+
helpers.doKeys('I ')
27012691
helpers.doKeys('<Esc>');
27022692
helpers.doKeys('q');
27032693
helpers.doKeys('e');
27042694
// Now replace the macro with something else.
27052695
helpers.doKeys('q', 'z', 'a');
2706-
cm.replaceRange('.', cm.getCursor());
2696+
helpers.doKeys('.')
27072697
helpers.doKeys('<Esc>');
27082698
helpers.doKeys('q');
27092699
helpers.doKeys('e', '@', 'z');
@@ -2802,11 +2792,11 @@ testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
28022792
testVim('macro_register', function(cm, vim, helpers) {
28032793
cm.setCursor(0, 0);
28042794
helpers.doKeys('q', 'a', 'i');
2805-
cm.replaceRange('gangnam', cm.getCursor());
2795+
helpers.doKeys('gangnam')
28062796
helpers.doKeys('<Esc>');
28072797
helpers.doKeys('q');
28082798
helpers.doKeys('q', 'b', 'o');
2809-
cm.replaceRange('style', cm.getCursor());
2799+
helpers.doKeys('style')
28102800
helpers.doKeys('<Esc>');
28112801
helpers.doKeys('q');
28122802
cm.openDialog = helpers.fakeOpenDialog('registers');
@@ -2819,7 +2809,7 @@ testVim('macro_register', function(cm, vim, helpers) {
28192809
testVim('._register', function(cm,vim,helpers) {
28202810
cm.setCursor(0,0);
28212811
helpers.doKeys('i');
2822-
cm.replaceRange('foo',cm.getCursor());
2812+
helpers.doKeys('foo')
28232813
helpers.doKeys('<Esc>');
28242814
cm.openDialog = helpers.fakeOpenDialog('registers');
28252815
cm.openNotification = helpers.fakeOpenNotification(function(text) {
@@ -3008,13 +2998,13 @@ testVim('._repeat', function(cm, vim, helpers) {
30082998
}, { value: '1 2 3 4 5 6'});
30092999
testVim('._insert', function(cm, vim, helpers) {
30103000
helpers.doKeys('i');
3011-
cm.replaceRange('test', cm.getCursor());
3001+
helpers.doKeys('test')
30123002
helpers.doKeys('<Esc>');
30133003
helpers.doKeys('.');
30143004
eq('testestt', cm.getValue());
30153005
helpers.assertCursorAt(0, 6);
30163006
helpers.doKeys('O');
3017-
cm.replaceRange('xyz', cm.getCursor());
3007+
helpers.doKeys('xyz')
30183008
helpers.doInsertModeKeys('Backspace');
30193009
helpers.doInsertModeKeys('Down');
30203010
helpers.doKeys('<Esc>');
@@ -3024,7 +3014,7 @@ testVim('._insert', function(cm, vim, helpers) {
30243014
}, { value: ''});
30253015
testVim('._insert_repeat', function(cm, vim, helpers) {
30263016
helpers.doKeys('i');
3027-
cm.replaceRange('test', cm.getCursor());
3017+
helpers.doKeys('test')
30283018
cm.setCursor(0, 4);
30293019
helpers.doKeys('<Esc>');
30303020
helpers.doKeys('2', '.');
@@ -3033,7 +3023,7 @@ testVim('._insert_repeat', function(cm, vim, helpers) {
30333023
}, { value: ''});
30343024
testVim('._repeat_insert', function(cm, vim, helpers) {
30353025
helpers.doKeys('3', 'i');
3036-
cm.replaceRange('te', cm.getCursor());
3026+
helpers.doKeys('te')
30373027
cm.setCursor(0, 2);
30383028
helpers.doKeys('<Esc>');
30393029
helpers.doKeys('.');
@@ -3042,7 +3032,7 @@ testVim('._repeat_insert', function(cm, vim, helpers) {
30423032
}, { value: ''});
30433033
testVim('._insert_o', function(cm, vim, helpers) {
30443034
helpers.doKeys('o');
3045-
cm.replaceRange('z', cm.getCursor());
3035+
helpers.doKeys('z')
30463036
cm.setCursor(1, 1);
30473037
helpers.doKeys('<Esc>');
30483038
helpers.doKeys('.');
@@ -3051,7 +3041,7 @@ testVim('._insert_o', function(cm, vim, helpers) {
30513041
}, { value: ''});
30523042
testVim('._insert_o_repeat', function(cm, vim, helpers) {
30533043
helpers.doKeys('o');
3054-
cm.replaceRange('z', cm.getCursor());
3044+
helpers.doKeys('z')
30553045
helpers.doKeys('<Esc>');
30563046
cm.setCursor(1, 0);
30573047
helpers.doKeys('2', '.');
@@ -3060,7 +3050,7 @@ testVim('._insert_o_repeat', function(cm, vim, helpers) {
30603050
}, { value: ''});
30613051
testVim('._insert_o_indent', function(cm, vim, helpers) {
30623052
helpers.doKeys('o');
3063-
cm.replaceRange('z', cm.getCursor());
3053+
helpers.doKeys('z')
30643054
helpers.doKeys('<Esc>');
30653055
cm.setCursor(1, 2);
30663056
helpers.doKeys('.');
@@ -3069,7 +3059,7 @@ testVim('._insert_o_indent', function(cm, vim, helpers) {
30693059
}, { value: '{'});
30703060
testVim('._insert_cw', function(cm, vim, helpers) {
30713061
helpers.doKeys('c', 'w');
3072-
cm.replaceRange('test', cm.getCursor());
3062+
helpers.doKeys('test')
30733063
helpers.doKeys('<Esc>');
30743064
cm.setCursor(0, 3);
30753065
helpers.doKeys('2', 'l');
@@ -3081,7 +3071,7 @@ testVim('._insert_cw_repeat', function(cm, vim, helpers) {
30813071
// For some reason, repeat cw in desktop VIM will does not repeat insert mode
30823072
// changes. Will conform to that behavior.
30833073
helpers.doKeys('c', 'w');
3084-
cm.replaceRange('test', cm.getCursor());
3074+
helpers.doKeys('test');
30853075
helpers.doKeys('<Esc>');
30863076
cm.setCursor(0, 4);
30873077
helpers.doKeys('l');
@@ -4350,10 +4340,7 @@ testVim('ex_imap', function(cm, vim, helpers) {
43504340
cm.setCursor(0, 1);
43514341
CodeMirror.Vim.map('jj', '<Esc>', 'insert');
43524342
helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
4353-
var replacement = fillArray('f', 3);
4354-
cm.replaceSelections(replacement);
4355-
var replacement = fillArray('o', 3);
4356-
cm.replaceSelections(replacement);
4343+
helpers.doKeys('f', 'o');
43574344
eq('1fo4\n5fo8\nafodefg', cm.getValue());
43584345
helpers.doKeys('j', 'j');
43594346
cm.setCursor(0, 0);

0 commit comments

Comments
 (0)