annotate src/testdir/test29.ok @ 15062:3a94f7918980 v8.1.0542

patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account commit https://github.com/vim/vim/commit/f951416a8396a54bbbe21de1a8b16716428549f2 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 22 03:08:29 2018 +0100 patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account Problem: shiftwidth() does not take 'vartabstop' into account. Solution: Use the cursor position or a position explicitly passed. Also make >> and << work better with 'vartabstop'. (Christian Brabandt)
author Bram Moolenaar <Bram@vim.org>
date Thu, 22 Nov 2018 03:15:10 +0100
parents 81c26975e8f9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 asdfasdf asdf
2291
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
15 zx cvn. as dfg? hjkl iop! ert ernop
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
16 zx cvn. as dfg? hjkl iop! ert ernop
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
17
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 asdfasdf. asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 asdfasdf asdf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 asdfasdf asdf
2291
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
32 zx cvn. as dfg? hjkl iop! ert enop
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
33 zx cvn. as dfg? hjkl iop! ert ernop
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
34
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
35 asdfasdf. asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
36 asdfasdf. asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
37 asdfasdf. asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
38 asdfasdf. asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
39 asdfasdf. asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
40 asdfasdf. asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
41 asdfasdf. asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
42 asdfasdf asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
43 asdfasdf asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
44 asdfasdf asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
45 asdfasdf asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
46 asdfasdf asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
47 asdfasdf asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
48 asdfasdf asdf
f412e141c821 Improve test for joining lines. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents: 7
diff changeset
49 zx cvn. as dfg? hjkl iop! ert a
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
50
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
51
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
52 {
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
53 /* Make sure the previous comment leader is not removed. */
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
54 /* Make sure the previous comment leader is not removed. */
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
55 // Should the next comment leader be left alone? Yes.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
56 // Should the next comment leader be left alone? Yes.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
57 /* Here the comment leader should be left intact. */ // And so should this one.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
58 /* Here the comment leader should be left intact. */ // And so should this one.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
59 if (condition) // Remove the next comment leader! OK, I will.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
60 action();
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
61 if (condition) // Remove the next comment leader! OK, I will.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
62 action();
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
63 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
64
5852
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
65 1 this shouldn't be deleted
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
66 2 this shouldn't be deleted
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
67 3 this shouldn't be deleted
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
68 4 this should be deleted3
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
69
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
70 6 this shouldn't be deleted vim5
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
71 7 this shouldn't be deleted vim6
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
72 8 this shouldn't be deleted (not touched yet) vim7
81c26975e8f9 updated for version 7.4.269
Bram Moolenaar <bram@vim.org>
parents: 3580
diff changeset
73
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
74
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
75 {
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
76 /* Make sure the previous comment leader is not removed. */
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
77 /* Make sure the previous comment leader is not removed. */
3580
297771eff080 updated for version 7.3.550
Bram Moolenaar <bram@vim.org>
parents: 3562
diff changeset
78 /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
297771eff080 updated for version 7.3.550
Bram Moolenaar <bram@vim.org>
parents: 3562
diff changeset
79 /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
3562
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
80 // Should the next comment leader be left alone? Yes.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
81 // Should the next comment leader be left alone? Yes.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
82 /* Here the comment leader should be left intact. */ // And so should this one.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
83 /* Here the comment leader should be left intact. */ // And so should this one.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
84 if (condition) // Remove the next comment leader! OK, I will.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
85 action();
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
86 if (condition) // Remove the next comment leader! OK, I will.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
87 action();
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
88 int i = 7 /* foo *// 3 // comment
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
89 ;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
90 int i = 7 /* foo *// 3 // comment
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
91 ;
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
92 ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
93 ># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
94
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
95 Some code!// Make sure backspacing does not remove this comment leader.
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
96 }
5c1aaf9b4b1b updated for version 7.3.541
Bram Moolenaar <bram@vim.org>
parents: 2291
diff changeset
97