diff options
| author | Dominique Pelle <dominique.pelle@gmail.com> | 2021-09-03 16:50:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-03 16:50:16 +0200 |
| commit | af631f61bc42d0dddafe1bc0c06872cf3aaeb239 (patch) | |
| tree | 0be46923b58b0da3b81eda61443d93bb3554709d /src | |
| parent | 03d257998b6343fc91f9dfd5ffc92eebe98d4d24 (diff) | |
| download | vim-git-af631f61bc42d0dddafe1bc0c06872cf3aaeb239.tar.gz | |
patch 8.2.3398: html text objects are not fully testedv8.2.3398
Problem: Html text objects are not fully tested.
Solution: Add tests for dbcs encoding and different number of backslashes.
(Dominique Pellé, closes #8831)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_textobjects.vim | 208 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 116 insertions, 94 deletions
diff --git a/src/testdir/test_textobjects.vim b/src/testdir/test_textobjects.vim index 088b5d2f5..16070b1c8 100644 --- a/src/testdir/test_textobjects.vim +++ b/src/testdir/test_textobjects.vim @@ -88,101 +88,107 @@ endfunc " Tests for string and html text objects func Test_string_html_objects() - enew! - let t = '"wo\"rd\\" foo' - put =t - normal! da" - call assert_equal('foo', getline('.')) - - let t = "'foo' 'bar' 'piep'" - put =t - normal! 0va'a'rx - call assert_equal("xxxxxxxxxxxx'piep'", getline('.')) - - let t = "bla bla `quote` blah" - put =t - normal! 02f`da` - call assert_equal("bla bla blah", getline('.')) - - let t = 'out " in "noXno"' - put =t - normal! 0fXdi" - call assert_equal('out " in ""', getline('.')) - - let t = "\"'\" 'blah' rep 'buh'" - put =t - normal! 03f'vi'ry - call assert_equal("\"'\" 'blah'yyyyy'buh'", getline('.')) - - set quoteescape=+*- - let t = "bla `s*`d-`+++`l**` b`la" - put =t - normal! di` - call assert_equal("bla `` b`la", getline('.')) - - let t = 'voo "nah" sdf " asdf" sdf " sdf" sd' - put =t - normal! $F"va"oha"i"rz - call assert_equal('voo "zzzzzzzzzzzzzzzzzzzzzzzzzzzzsd', getline('.')) - - let t = "-<b>asdf<i>Xasdf</i>asdf</b>-" - put =t - normal! fXdit - call assert_equal('-<b>asdf<i></i>asdf</b>-', getline('.')) - - let t = "-<b>asdX<i>a<i />sdf</i>asdf</b>-" - put =t - normal! 0fXdit - call assert_equal('-<b></b>-', getline('.')) - - let t = "-<b>asdf<i>Xasdf</i>asdf</b>-" - put =t - normal! fXdat - call assert_equal('-<b>asdfasdf</b>-', getline('.')) - - let t = "-<b>asdX<i>as<b />df</i>asdf</b>-" - put =t - normal! 0fXdat - call assert_equal('--', getline('.')) - - let t = "-<b>\ninnertext object\n</b>" - put =t - normal! dit - call assert_equal('-<b></b>', getline('.')) - - " copy the tag block from leading indentation before the start tag - let t = " <b>\ntext\n</b>" - $put =t - normal! 2kvaty - call assert_equal("<b>\ntext\n</b>", @") - - " copy the tag block from the end tag - let t = "<title>\nwelcome\n</title>" - $put =t - normal! $vaty - call assert_equal("<title>\nwelcome\n</title>", @") - - " copy the outer tag block from a tag without an end tag - let t = "<html>\n<title>welcome\n</html>" - $put =t - normal! k$vaty - call assert_equal("<html>\n<title>welcome\n</html>", @") - - " nested tag that has < in a different line from > - let t = "<div><div\n></div></div>" - $put =t - normal! k0vaty - call assert_equal("<div><div\n></div></div>", @") - - " nested tag with attribute that has < in a different line from > - let t = "<div><div\nattr=\"attr\"\n></div></div>" - $put =t - normal! 2k0vaty - call assert_equal("<div><div\nattr=\"attr\"\n></div></div>", @") - - set quoteescape& - enew! + for e in ['utf-8', 'latin1', 'cp932'] + enew! + exe 'set enc=' .. e + + let t = '"wo\"rd\\" foo' + put =t + normal! da" + call assert_equal('foo', getline('.'), e) + + let t = "'foo' 'bar' 'piep'" + put =t + normal! 0va'a'rx + call assert_equal("xxxxxxxxxxxx'piep'", getline('.'), e) + + let t = "bla bla `quote` blah" + put =t + normal! 02f`da` + call assert_equal("bla bla blah", getline('.'), e) + + let t = 'out " in "noXno"' + put =t + normal! 0fXdi" + call assert_equal('out " in ""', getline('.'), e) + + let t = "\"'\" 'blah' rep 'buh'" + put =t + normal! 03f'vi'ry + call assert_equal("\"'\" 'blah'yyyyy'buh'", getline('.'), e) + + set quoteescape=+*- + let t = "bla `s*`d-`+++`l**` b`la" + put =t + normal! di` + call assert_equal("bla `` b`la", getline('.'), e) + + let t = 'voo "nah" sdf " asdf" sdf " sdf" sd' + put =t + normal! $F"va"oha"i"rz + call assert_equal('voo "zzzzzzzzzzzzzzzzzzzzzzzzzzzzsd', getline('.'), e) + + let t = "-<b>asdf<i>Xasdf</i>asdf</b>-" + put =t + normal! fXdit + call assert_equal('-<b>asdf<i></i>asdf</b>-', getline('.'), e) + + let t = "-<b>asdX<i>a<i />sdf</i>asdf</b>-" + put =t + normal! 0fXdit + call assert_equal('-<b></b>-', getline('.'), e) + + let t = "-<b>asdf<i>Xasdf</i>asdf</b>-" + put =t + normal! fXdat + call assert_equal('-<b>asdfasdf</b>-', getline('.'), e) + + let t = "-<b>asdX<i>as<b />df</i>asdf</b>-" + put =t + normal! 0fXdat + call assert_equal('--', getline('.'), e) + + let t = "-<b>\ninnertext object\n</b>" + put =t + normal! dit + call assert_equal('-<b></b>', getline('.'), e) + + " copy the tag block from leading indentation before the start tag + let t = " <b>\ntext\n</b>" + $put =t + normal! 2kvaty + call assert_equal("<b>\ntext\n</b>", @", e) + + " copy the tag block from the end tag + let t = "<title>\nwelcome\n</title>" + $put =t + normal! $vaty + call assert_equal("<title>\nwelcome\n</title>", @", e) + + " copy the outer tag block from a tag without an end tag + let t = "<html>\n<title>welcome\n</html>" + $put =t + normal! k$vaty + call assert_equal("<html>\n<title>welcome\n</html>", @", e) + + " nested tag that has < in a different line from > + let t = "<div><div\n></div></div>" + $put =t + normal! k0vaty + call assert_equal("<div><div\n></div></div>", @", e) + + " nested tag with attribute that has < in a different line from > + let t = "<div><div\nattr=\"attr\"\n></div></div>" + $put =t + normal! 2k0vaty + call assert_equal("<div><div\nattr=\"attr\"\n></div></div>", @", e) + + set quoteescape& + endfor + + set enc=utf-8 + bwipe! endfunc func Test_empty_html_tag() @@ -561,6 +567,20 @@ func Test_textobj_quote() normal 0ya' call assert_equal(" 'special'", @") + " quoted string with odd or even number of backslashes. + call setline(1, 'char *s = "foo\"bar"') + normal $hhyi" + call assert_equal('foo\"bar', @") + call setline(1, 'char *s = "foo\\"bar"') + normal $hhyi" + call assert_equal('bar', @") + call setline(1, 'char *s = "foo\\\"bar"') + normal $hhyi" + call assert_equal('foo\\\"bar', @") + call setline(1, 'char *s = "foo\\\\"bar"') + normal $hhyi" + call assert_equal('bar', @") + close! endfunc diff --git a/src/version.c b/src/version.c index 8aaf163e1..732ddee41 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3398, +/**/ 3397, /**/ 3396, |