Problem: :let-heredoc does not trim enough.
Solution: Trim indent from the contents based on the indent of the first
line. Use let-heredoc in more tests.
If {marker} is not supplied, then "." is used as the
default marker.
- Any white space characters in the lines of text are
- preserved. If "trim" is specified before {marker},
- then all the leading indentation exactly matching the
- leading indentation before `let` is stripped from the
- input lines and the line containing {marker}. Note
- that the difference between space and tab matters
- here.
+ Without "trim" any white space characters in the lines
+ of text are preserved. If "trim" is specified before
+ {marker}, then indentation is stripped so you can do: >
+ let text =<< trim END
+ if ok
+ echo 'done'
+ endif
+ END
+< Results in: ["if ok", " echo 'done'", "endif"]
+ The marker must line up with "let" and the indentation
+ of the first line is removed from all the text lines.
+ Specifically: all the leading indentation exactly
+ matching the leading indentation of the first
+ non-empty text line is stripped from the input lines.
+ All leading indentation exactly matching the leading
+ indentation before `let` is stripped from the line
+ containing {marker}. Note that the difference between
+ space and tab matters here.
If {var-name} didn't exist yet, it is created.
Cannot be followed by another command, but can be
char_u *marker;
list_T *l;
char_u *p;
- int indent_len = 0;
+ int marker_indent_len = 0;
+ int text_indent_len = 0;
+ char_u *text_indent = NULL;
if (eap->getline == NULL)
{
{
cmd = skipwhite(cmd + 4);
- // Trim the indentation from all the lines in the here document
+ // Trim the indentation from all the lines in the here document.
// The amount of indentation trimmed is the same as the indentation of
- // the :let command line.
+ // the first line after the :let command line. To find the end marker
+ // the indent of the :let command line is trimmed.
p = *eap->cmdlinep;
while (VIM_ISWHITE(*p))
{
p++;
- indent_len++;
+ marker_indent_len++;
}
+ text_indent_len = -1;
}
// The marker is the next word. Default marker is "."
for (;;)
{
- int i = 0;
+ int mi = 0;
+ int ti = 0;
theline = eap->getline(NUL, eap->cookie, 0);
- if (theline != NULL && indent_len > 0)
- {
- // trim the indent matching the first line
- if (STRNCMP(theline, *eap->cmdlinep, indent_len) == 0)
- i = indent_len;
- }
-
if (theline == NULL)
{
semsg(_("E990: Missing end marker '%s'"), marker);
break;
}
- if (STRCMP(marker, theline + i) == 0)
+
+ // with "trim": skip the indent matching the :let line to find the
+ // marker
+ if (marker_indent_len > 0
+ && STRNCMP(theline, *eap->cmdlinep, marker_indent_len) == 0)
+ mi = marker_indent_len;
+ if (STRCMP(marker, theline + mi) == 0)
{
vim_free(theline);
break;
}
- if (list_append_string(l, theline + i, -1) == FAIL)
+ if (text_indent_len == -1 && *theline != NUL)
+ {
+ // set the text indent from the first line.
+ p = theline;
+ text_indent_len = 0;
+ while (VIM_ISWHITE(*p))
+ {
+ p++;
+ text_indent_len++;
+ }
+ text_indent = vim_strnsave(theline, text_indent_len);
+ }
+ // with "trim": skip the indent matching the first line
+ if (text_indent != NULL)
+ for (ti = 0; ti < text_indent_len; ++ti)
+ if (theline[ti] != text_indent[ti])
+ break;
+
+ if (list_append_string(l, theline + ti, -1) == FAIL)
break;
vim_free(theline);
}
+ vim_free(text_indent);
return l;
}
throw 'Skipped: cannot make screendumps'
endif
-let s:common_script =<< [CODE]
+let s:common_script =<< trim [CODE]
call setline(1, ["one one one", "two tXo two", "three three three"])
set balloonevalterm balloonexpr=MyBalloonExpr() balloondelay=100
func MyBalloonExpr()
" Test for cino-E
let without_ind =<< trim [CODE]
- #ifdef __cplusplus
- extern "C" {
- #endif
- int func_a(void);
- #ifdef __cplusplus
- }
- #endif
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ int func_a(void);
+ #ifdef __cplusplus
+ }
+ #endif
[CODE]
let with_ind =<< trim [CODE]
- #ifdef __cplusplus
- extern "C" {
- #endif
- int func_a(void);
- #ifdef __cplusplus
- }
- #endif
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ int func_a(void);
+ #ifdef __cplusplus
+ }
+ #endif
[CODE]
new
setlocal cindent cinoptions=E0
endfunc
setl expandtab sw=8 indentkeys+=; indentexpr=MyIndentFunction()
let testinput =<< trim [CODE]
- var_a = something()
- b = something()
+ var_a = something()
+ b = something()
[CODE]
call setline(1, testinput)
call cursor(1, 1)
call feedkeys("^\<c-v>j$A;\<esc>", 'tnix')
- let expected =<< trim [CODE]
- var_a = something();
- b = something();
- [CODE]
+ let expected =<< [CODE]
+ var_a = something();
+b = something();
+[CODE]
call assert_equal(expected, getline(1, '$'))
%d
- let testinput =<< trim [CODE]
- var_a = something()
- b = something()
- [CODE]
+ let testinput =<< [CODE]
+ var_a = something()
+ b = something()
+[CODE]
call setline(1, testinput)
call cursor(1, 1)
call feedkeys("^\<c-v>j$A;\<esc>", 'tnix')
- let expected =<< trim [CODE]
- var_a = something();
- b = something()
- [CODE]
+ let expected =<< [CODE]
+ var_a = something();
+ b = something()
+[CODE]
call assert_equal(expected, getline(1, '$'))
bw!
endfunc
let &wm = &columns - 20
let code =<< trim [CODE]
- {
-
- /* this is
- * a real serious important big
- * comment
- */
- /* insert " about life, the universe, and the rest" after "serious" */
- }
+ {
+
+ /* this is
+ * a real serious important big
+ * comment
+ */
+ /* insert " about life, the universe, and the rest" after "serious" */
+ }
[CODE]
call append(0, code)
setl cindent ts=4 sw=4
setl cino=+20
- let code =<< trim [CODE]
- void
- foo()
- {
- if (a)
- {
- } else
- asdf;
- }
- [CODE]
+ let code =<< [CODE]
+ void
+foo()
+{
+ if (a)
+ {
+ } else
+ asdf;
+}
+[CODE]
call append(0, code)
normal gg
normal ]]=][
- let expected =<< trim [CODE]
- void
- foo()
- {
- if (a)
- {
- } else
- asdf;
- }
+ let expected =<< [CODE]
+ void
+foo()
+{
+ if (a)
+ {
+ } else
+ asdf;
+}
- [CODE]
+[CODE]
call assert_equal(expected, getline(1, '$'))
enew! | close
normal =][
let expected =<< trim [CODE]
-
+
void
func(int a
#if defined(FOO)
const n = v:null
const bl = 0zC0FFEE
const here =<< trim EOS
- hello
+ hello
EOS
call assert_true(exists('i'))
const l:n = v:null
const l:bl = 0zC0FFEE
const l:here =<< trim EOS
- hello
+ hello
EOS
call assert_fails('let l:i = 1', 'E741:')
endif
" Create a Vim script with some functions
- call writefile([
- \ 'func Foo()',
- \ ' let var1 = 1',
- \ ' let var2 = Bar(var1) + 9',
- \ ' return var2',
- \ 'endfunc',
- \ 'func Bar(var)',
- \ ' let var1 = 2 + a:var',
- \ ' let var2 = Bazz(var1) + 4',
- \ ' return var2',
- \ 'endfunc',
- \ 'func Bazz(var)',
- \ ' try',
- \ ' let var1 = 3 + a:var',
- \ ' let var3 = "another var"',
- \ ' let var3 = "value2"',
- \ ' catch',
- \ ' let var4 = "exception"',
- \ ' endtry',
- \ ' return var1',
- \ 'endfunc'], 'Xtest.vim')
+ let lines =<< trim END
+ func Foo()
+ let var1 = 1
+ let var2 = Bar(var1) + 9
+ return var2
+ endfunc
+ func Bar(var)
+ let var1 = 2 + a:var
+ let var2 = Bazz(var1) + 4
+ return var2
+ endfunc
+ func Bazz(var)
+ try
+ let var1 = 3 + a:var
+ let var3 = "another var"
+ let var3 = "value2"
+ catch
+ let var4 = "exception"
+ endtry
+ return var1
+ endfunc
+ END
+ call writefile(lines, 'Xtest.vim')
" Start Vim in a terminal
let buf = RunVimInTerminal('-S Xtest.vim', {})
" Tests for :breakadd file and :breakadd here
" Breakpoints should be set before sourcing the file
- call writefile([
- \ 'let var1 = 10',
- \ 'let var2 = 20',
- \ 'let var3 = 30',
- \ 'let var4 = 40'], 'Xtest.vim')
+ let lines =<< trim END
+ let var1 = 10
+ let var2 = 20
+ let var3 = 30
+ let var4 = 40
+ END
+ call writefile(lines, 'Xtest.vim')
" Start Vim in a terminal
let buf = RunVimInTerminal('Xtest.vim', {})
if executable('cscript')
new Xfile
wq
- call writefile([
- \ 'Set fs = CreateObject("Scripting.FileSystemObject")',
- \ 'Set ws = WScript.CreateObject("WScript.Shell")',
- \ 'Set shortcut = ws.CreateShortcut("Xlink.lnk")',
- \ 'shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile")',
- \ 'shortcut.Save'
- \], 'link.vbs')
+ let lines =<< trim END
+ Set fs = CreateObject("Scripting.FileSystemObject")
+ Set ws = WScript.CreateObject("WScript.Shell")
+ Set shortcut = ws.CreateShortcut("Xlink.lnk")
+ shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile")
+ shortcut.Save
+ END
+ call writefile(lines, 'link.vbs')
silent !cscript link.vbs
call delete('link.vbs')
call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))
func Test_gD()
let lines =<< trim [CODE]
- int x;
-
- int func(void)
- {
- return x;
- }
+ int x;
+
+ int func(void)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gD', lines, 1, 5)
func Test_gD_too()
let lines =<< trim [CODE]
- Filename x;
-
- int Filename
- int func() {
Filename x;
- return x;
+
+ int Filename
+ int func() {
+ Filename x;
+ return x;
[CODE]
call XTest_goto_decl('gD', lines, 1, 10)
func Test_gD_comment()
let lines =<< trim [CODE]
- /* int x; */
- int x;
-
- int func(void)
- {
- return x;
- }
+ /* int x; */
+ int x;
+
+ int func(void)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gD', lines, 2, 5)
func Test_gD_inline_comment()
let lines =<< trim [CODE]
- int y /* , x */;
- int x;
-
- int func(void)
- {
- return x;
- }
+ int y /* , x */;
+ int x;
+
+ int func(void)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gD', lines, 2, 5)
func Test_gD_string()
let lines =<< trim [CODE]
- char *s[] = "x";
- int x = 1;
-
- int func(void)
- {
- return x;
- }
+ char *s[] = "x";
+ int x = 1;
+
+ int func(void)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gD', lines, 2, 5)
func Test_gD_string_same_line()
let lines =<< trim [CODE]
- char *s[] = "x", int x = 1;
-
- int func(void)
- {
- return x;
- }
+ char *s[] = "x", int x = 1;
+
+ int func(void)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gD', lines, 1, 22)
func Test_gD_char()
let lines =<< trim [CODE]
- char c = 'x';
- int x = 1;
-
- int func(void)
- {
- return x;
- }
+ char c = 'x';
+ int x = 1;
+
+ int func(void)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gD', lines, 2, 5)
func Test_gd()
let lines =<< trim [CODE]
- int x;
-
- int func(int x)
- {
- return x;
- }
+ int x;
+
+ int func(int x)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 3, 14)
func Test_gd_not_local()
let lines =<< trim [CODE]
- int func1(void)
- {
- return x;
- }
-
- int func2(int x)
- {
- return x;
- }
+ int func1(void)
+ {
+ return x;
+ }
+
+ int func2(int x)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 3, 10)
func Test_gd_kr_style()
let lines =<< trim [CODE]
- int func(x)
- int x;
- {
- return x;
- }
+ int func(x)
+ int x;
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 2, 7)
func Test_gd_missing_braces()
let lines =<< trim [CODE]
- def func1(a)
- a + 1
- end
-
- a = 1
-
- def func2()
- return a
- end
+ def func1(a)
+ a + 1
+ end
+
+ a = 1
+
+ def func2()
+ return a
+ end
[CODE]
call XTest_goto_decl('gd', lines, 1, 11)
func Test_gd_comment()
let lines =<< trim [CODE]
- int func(void)
- {
- /* int x; */
- int x;
- return x;
- }
+ int func(void)
+ {
+ /* int x; */
+ int x;
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 4, 7)
func Test_gd_comment_in_string()
let lines =<< trim [CODE]
- int func(void)
- {
- char *s ="//"; int x;
- int x;
- return x;
- }
+ int func(void)
+ {
+ char *s ="//"; int x;
+ int x;
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 3, 22)
func Test_gd_string_in_comment()
set comments=
let lines =<< trim [CODE]
- int func(void)
- {
- /* " */ int x;
- int x;
- return x;
- }
+ int func(void)
+ {
+ /* " */ int x;
+ int x;
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 3, 15)
func Test_gd_inline_comment()
let lines =<< trim [CODE]
- int func(/* x is an int */ int x)
- {
- return x;
- }
+ int func(/* x is an int */ int x)
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 1, 32)
func Test_gd_inline_comment_only()
let lines =<< trim [CODE]
- int func(void) /* one lonely x */
- {
- return x;
- }
+ int func(void) /* one lonely x */
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 3, 10)
func Test_gd_inline_comment_body()
let lines =<< trim [CODE]
- int func(void)
- {
- int y /* , x */;
-
- for (/* int x = 0 */; y < 2; y++);
-
- int x = 0;
-
- return x;
- }
+ int func(void)
+ {
+ int y /* , x */;
+
+ for (/* int x = 0 */; y < 2; y++);
+
+ int x = 0;
+
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 7, 7)
func Test_gd_trailing_multiline_comment()
let lines =<< trim [CODE]
- int func(int x) /* x is an int */
- {
- return x;
- }
+ int func(int x) /* x is an int */
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 1, 14)
func Test_gd_trailing_comment()
let lines =<< trim [CODE]
- int func(int x) // x is an int
- {
- return x;
- }
+ int func(int x) // x is an int
+ {
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 1, 14)
func Test_gd_string()
let lines =<< trim [CODE]
- int func(void)
- {
- char *s = "x";
- int x = 1;
-
- return x;
- }
+ int func(void)
+ {
+ char *s = "x";
+ int x = 1;
+
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 4, 7)
endfunc
func Test_gd_string_only()
let lines =<< trim [CODE]
- int func(void)
- {
- char *s = "x";
-
- return x;
- }
+ int func(void)
+ {
+ char *s = "x";
+
+ return x;
+ }
[CODE]
call XTest_goto_decl('gd', lines, 5, 10)
func Test_gd_local_block()
let lines =<< trim [CODE]
int main()
- {
- char *a = "NOT NULL";
- if(a)
- {
- char *b = a;
- printf("%s\n", b);
- }
- else
{
- char *b = "NULL";
- return b;
+ char *a = "NOT NULL";
+ if(a)
+ {
+ char *b = a;
+ printf("%s\n", b);
+ }
+ else
+ {
+ char *b = "NULL";
+ return b;
+ }
+
+ return 0;
}
-
- return 0;
- }
[CODE]
call XTest_goto_decl('1gd', lines, 11, 11)
func Test_gui_dash_g()
let cmd = GetVimCommand('Xscriptgui')
call writefile([""], "Xtestgui")
- call writefile([
- \ 'au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")',
- \ 'au GUIEnter * qall',
- \ ], 'Xscriptgui')
+ let lines =<< trim END
+ au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")
+ au GUIEnter * qall
+ END
+ call writefile(lines, 'Xscriptgui')
call system(cmd . ' -g')
call WaitForAssert({-> assert_equal(['insertmode: 0'], readfile('Xtestgui'))})
func Test_gui_dash_y()
let cmd = GetVimCommand('Xscriptgui')
call writefile([""], "Xtestgui")
- call writefile([
- \ 'au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")',
- \ 'au GUIEnter * qall',
- \ ], 'Xscriptgui')
+ let lines =<< trim END
+ au GUIEnter * call writefile(["insertmode: " . &insertmode], "Xtestgui")
+ au GUIEnter * qall
+ END
+ call writefile(lines, 'Xscriptgui')
call system(cmd . ' -y')
call WaitForAssert({-> assert_equal(['insertmode: 1'], readfile('Xtestgui'))})
throw 'Skipped: cannot make screendumps'
endif
- call writefile([
- \ 'set cursorline cursorcolumn rnu',
- \ 'call setline(1, ["","1111111111","22222222222","3 here 3",""])',
- \ 'set wincolor=Pmenu',
- \ '/here',
- \ ], 'Xtest_wincolor')
+ let lines =<< trim END
+ set cursorline cursorcolumn rnu
+ call setline(1, ["","1111111111","22222222222","3 here 3",""])
+ set wincolor=Pmenu
+ /here
+ END
+ call writefile(lines, 'Xtest_wincolor')
let buf = RunVimInTerminal('-S Xtest_wincolor', {'rows': 8})
call term_wait(buf)
call term_sendkeys(buf, "2G5lvj")
" Expected output
let expected =<< trim [DATA]
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- zx cvn. as dfg? hjkl iop! ert ernop
- zx cvn. as dfg? hjkl iop! ert ernop
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ zx cvn. as dfg? hjkl iop! ert ernop
+ zx cvn. as dfg? hjkl iop! ert ernop
[DATA]
call assert_equal(expected, getline(1, '$'))
" Expected output
let expected =<< trim [DATA]
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- zx cvn. as dfg? hjkl iop! ert enop
- zx cvn. as dfg? hjkl iop! ert ernop
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ zx cvn. as dfg? hjkl iop! ert enop
+ zx cvn. as dfg? hjkl iop! ert ernop
[DATA]
" Expected output
let expected =<< trim [DATA]
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf. asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- asdfasdf asdf
- zx cvn. as dfg? hjkl iop! ert a
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf. asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ asdfasdf asdf
+ zx cvn. as dfg? hjkl iop! ert a
[DATA]
call assert_equal(expected, getline(1, '$'))
" Expected output
let expected =<< trim [CODE]
-{
-/* Make sure the previous comment leader is not removed. */
-/* Make sure the previous comment leader is not removed. */
-// Should the next comment leader be left alone? Yes.
-// Should the next comment leader be left alone? Yes.
-/* Here the comment leader should be left intact. */ // And so should this one.
-/* Here the comment leader should be left intact. */ // And so should this one.
-if (condition) // Remove the next comment leader! OK, I will.
-action();
-if (condition) // Remove the next comment leader! OK, I will.
-action();
-}
+ {
+ /* Make sure the previous comment leader is not removed. */
+ /* Make sure the previous comment leader is not removed. */
+ // Should the next comment leader be left alone? Yes.
+ // Should the next comment leader be left alone? Yes.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ }
[CODE]
call assert_equal(expected, getline(1, '$'))
exe "normal oSome code!\<CR>// Make sure backspacing does not remove this comment leader.\<Esc>0i\<C-H>\<Esc>"
" Expected output
- let expected =<< [CODE]
-{
-/* Make sure the previous comment leader is not removed. */
-/* Make sure the previous comment leader is not removed. */
-/* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
-/* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
-// Should the next comment leader be left alone? Yes.
-// Should the next comment leader be left alone? Yes.
-/* Here the comment leader should be left intact. */ // And so should this one.
-/* Here the comment leader should be left intact. */ // And so should this one.
-if (condition) // Remove the next comment leader! OK, I will.
- action();
-if (condition) // Remove the next comment leader! OK, I will.
- action();
-int i = 7 /* foo *// 3 // comment
- ;
-int i = 7 /* foo *// 3 // comment
- ;
-># 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.
-># 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.
-
-Some code!// Make sure backspacing does not remove this comment leader.
-}
-[CODE]
+ let expected =<< trim [CODE]
+ {
+ /* Make sure the previous comment leader is not removed. */
+ /* Make sure the previous comment leader is not removed. */
+ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
+ /* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
+ // Should the next comment leader be left alone? Yes.
+ // Should the next comment leader be left alone? Yes.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ /* Here the comment leader should be left intact. */ // And so should this one.
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ if (condition) // Remove the next comment leader! OK, I will.
+ action();
+ int i = 7 /* foo *// 3 // comment
+ ;
+ int i = 7 /* foo *// 3 // comment
+ ;
+ ># 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.
+ ># 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.
+
+ Some code!// Make sure backspacing does not remove this comment leader.
+ }
+ [CODE]
call assert_equal(expected, getline(1, '$'))
close!
END
call assert_equal(['Line1', ' Line2', "\tLine3", ' END'], var1)
+ let var1 =<< trim !!!
+ Line1
+ line2
+ Line3
+ !!!
+ !!!
+ call assert_equal(['Line1', ' line2', "\tLine3", '!!!',], var1)
+
let var1 =<< trim
Line1
.
- call assert_equal([' Line1'], var1)
+ call assert_equal(['Line1'], var1)
" ignore "endfunc"
let var1 =<< END
" Case: if a local variable captures a:000, funccall object will be free
" just after it finishes.
let testfile = 'Xtest.vim'
- call writefile([
- \ 'func s:f(...)',
- \ ' let x = a:000',
- \ 'endfunc',
- \ 'for _ in range(10000)',
- \ ' call s:f(0)',
- \ 'endfor',
- \ ], testfile)
+ let lines =<< trim END
+ func s:f(...)
+ let x = a:000
+ endfunc
+ for _ in range(10000)
+ call s:f(0)
+ endfor
+ END
+ call writefile(lines, testfile)
let vim = s:vim_new()
call vim.start('--clean', '-c', 'set noswapfile', testfile)
" free until garbage collector runs, but after that memory usage doesn't
" increase so much even when rerun Xtest.vim since system memory caches.
let testfile = 'Xtest.vim'
- call writefile([
- \ 'func s:f()',
- \ ' let x = l:',
- \ 'endfunc',
- \ 'for _ in range(10000)',
- \ ' call s:f()',
- \ 'endfor',
- \ ], testfile)
+ let lines =<< trim END
+ func s:f()
+ let x = l:
+ endfunc
+ for _ in range(10000)
+ call s:f()
+ endfor
+ END
+ call writefile(lines, testfile)
let vim = s:vim_new()
call vim.start('--clean', '-c', 'set noswapfile', testfile)
" Set custom statusline built by user-defined function.
let testfile = 'Xtest.vim'
- call writefile([
- \ 'func StatusLine() abort',
- \ ' return ""',
- \ 'endfunc',
- \ 'set statusline=%!StatusLine()',
- \ 'set laststatus=2',
- \ ], testfile)
+ let lines =<< trim END
+ func StatusLine() abort
+ return ""
+ endfunc
+ set statusline=%!StatusLine()
+ set laststatus=2
+ END
+ call writefile(lines, testfile)
let rows = 10
let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
" Set custom statusline built by user-defined function.
let testfile = 'Xtest.vim'
- call writefile([
- \ 'set laststatus=2',
- \ 'inoremap <Esc> <Esc>00',
- \ ], testfile)
+ let lines =<< trim END
+ set laststatus=2
+ inoremap <Esc> <Esc>00
+ END
+ call writefile(lines, testfile)
let rows = 10
let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
mksession! test_mks.out
let li = filter(readfile('test_mks.out'), 'v:val =~# "\\(^ *normal! 0\\|^ *exe ''normal!\\)"')
let expected =<< trim [DATA]
- normal! 016|
- normal! 016|
- normal! 016|
- normal! 08|
- normal! 08|
- normal! 016|
- normal! 016|
- normal! 016|
- exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
- exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
- exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
- exe 'normal! ' . s:c . '|zs' . 8 . '|'
normal! 08|
- exe 'normal! ' . s:c . '|zs' . 8 . '|'
normal! 08|
- exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
- exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
- exe 'normal! ' . s:c . '|zs' . 16 . '|'
- normal! 016|
- exe 'normal! ' . s:c . '|zs' . 16 . '|'
normal! 016|
+ exe 'normal! ' . s:c . '|zs' . 16 . '|'
+ normal! 016|
+ exe 'normal! ' . s:c . '|zs' . 16 . '|'
+ normal! 016|
+ exe 'normal! ' . s:c . '|zs' . 16 . '|'
+ normal! 016|
+ exe 'normal! ' . s:c . '|zs' . 8 . '|'
+ normal! 08|
+ exe 'normal! ' . s:c . '|zs' . 8 . '|'
+ normal! 08|
+ exe 'normal! ' . s:c . '|zs' . 16 . '|'
+ normal! 016|
+ exe 'normal! ' . s:c . '|zs' . 16 . '|'
+ normal! 016|
+ exe 'normal! ' . s:c . '|zs' . 16 . '|'
+ normal! 016|
+ exe 'normal! ' . s:c . '|zs' . 16 . '|'
+ normal! 016|
[DATA]
call assert_equal(expected, li)
fun! Test_normal29_brace()
" basic test for { and } movements
let text =<< trim [DATA]
- A paragraph begins after each empty line, and also at each of a set of
- paragraph macros, specified by the pairs of characters in the 'paragraphs'
- option. The default is "IPLPPPQPP TPHPLIPpLpItpplpipbp", which corresponds to
- the macros ".IP", ".LP", etc. (These are nroff macros, so the dot must be in
- the first column). A section boundary is also a paragraph boundary.
- Note that a blank line (only containing white space) is NOT a paragraph
- boundary.
-
-
- Also note that this does not include a '{' or '}' in the first column. When
- the '{' flag is in 'cpoptions' then '{' in the first column is used as a
- paragraph boundary |posix|.
- {
- This is no paragraph
- unless the '{' is set
- in 'cpoptions'
- }
- .IP
- The nroff macros IP separates a paragraph
- That means, it must be a '.'
- followed by IP
- .LPIt does not matter, if afterwards some
- more characters follow.
- .SHAlso section boundaries from the nroff
- macros terminate a paragraph. That means
- a character like this:
- .NH
- End of text here
+ A paragraph begins after each empty line, and also at each of a set of
+ paragraph macros, specified by the pairs of characters in the 'paragraphs'
+ option. The default is "IPLPPPQPP TPHPLIPpLpItpplpipbp", which corresponds to
+ the macros ".IP", ".LP", etc. (These are nroff macros, so the dot must be in
+ the first column). A section boundary is also a paragraph boundary.
+ Note that a blank line (only containing white space) is NOT a paragraph
+ boundary.
+
+
+ Also note that this does not include a '{' or '}' in the first column. When
+ the '{' flag is in 'cpoptions' then '{' in the first column is used as a
+ paragraph boundary |posix|.
+ {
+ This is no paragraph
+ unless the '{' is set
+ in 'cpoptions'
+ }
+ .IP
+ The nroff macros IP separates a paragraph
+ That means, it must be a '.'
+ followed by IP
+ .LPIt does not matter, if afterwards some
+ more characters follow.
+ .SHAlso section boundaries from the nroff
+ macros terminate a paragraph. That means
+ a character like this:
+ .NH
+ End of text here
[DATA]
new
norm! 0d2}
let expected =<< trim [DATA]
- .IP
- The nroff macros IP separates a paragraph
- That means, it must be a '.'
- followed by IP
- .LPIt does not matter, if afterwards some
- more characters follow.
- .SHAlso section boundaries from the nroff
- macros terminate a paragraph. That means
- a character like this:
- .NH
- End of text here
+ .IP
+ The nroff macros IP separates a paragraph
+ That means, it must be a '.'
+ followed by IP
+ .LPIt does not matter, if afterwards some
+ more characters follow.
+ .SHAlso section boundaries from the nroff
+ macros terminate a paragraph. That means
+ a character like this:
+ .NH
+ End of text here
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! 0d}
let expected =<< trim [DATA]
- .LPIt does not matter, if afterwards some
- more characters follow.
- .SHAlso section boundaries from the nroff
- macros terminate a paragraph. That means
- a character like this:
- .NH
- End of text here
-
+ .LPIt does not matter, if afterwards some
+ more characters follow.
+ .SHAlso section boundaries from the nroff
+ macros terminate a paragraph. That means
+ a character like this:
+ .NH
+ End of text here
+
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! d{
let expected =<< trim [DATA]
- .LPIt does not matter, if afterwards some
- more characters follow.
- .SHAlso section boundaries from the nroff
- macros terminate a paragraph. That means
- a character like this:
+ .LPIt does not matter, if afterwards some
+ more characters follow.
+ .SHAlso section boundaries from the nroff
+ macros terminate a paragraph. That means
+ a character like this:
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! d{
let expected =<< trim [DATA]
- .LPIt does not matter, if afterwards some
- more characters follow.
+ .LPIt does not matter, if afterwards some
+ more characters follow.
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! 0d2}
let expected =<< trim [DATA]
- {
- This is no paragraph
- unless the '{' is set
- in 'cpoptions'
- }
- .IP
- The nroff macros IP separates a paragraph
- That means, it must be a '.'
- followed by IP
- .LPIt does not matter, if afterwards some
- more characters follow.
- .SHAlso section boundaries from the nroff
- macros terminate a paragraph. That means
- a character like this:
- .NH
- End of text here
+ {
+ This is no paragraph
+ unless the '{' is set
+ in 'cpoptions'
+ }
+ .IP
+ The nroff macros IP separates a paragraph
+ That means, it must be a '.'
+ followed by IP
+ .LPIt does not matter, if afterwards some
+ more characters follow.
+ .SHAlso section boundaries from the nroff
+ macros terminate a paragraph. That means
+ a character like this:
+ .NH
+ End of text here
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! d}
let expected =<< trim [DATA]
- {
- This is no paragraph
- unless the '{' is set
- in 'cpoptions'
- }
- .IP
- The nroff macros IP separates a paragraph
- That means, it must be a '.'
- followed by IP
- .LPIt does not matter, if afterwards some
- more characters follow.
- .SHAlso section boundaries from the nroff
- macros terminate a paragraph. That means
- a character like this:
- .NH
- End of text here
+ {
+ This is no paragraph
+ unless the '{' is set
+ in 'cpoptions'
+ }
+ .IP
+ The nroff macros IP separates a paragraph
+ That means, it must be a '.'
+ followed by IP
+ .LPIt does not matter, if afterwards some
+ more characters follow.
+ .SHAlso section boundaries from the nroff
+ macros terminate a paragraph. That means
+ a character like this:
+ .NH
+ End of text here
[DATA]
call assert_equal(expected, getline(1, '$'))
norm! d5}
let expected =<< trim [DATA]
- {
- This is no paragraph
- unless the '{' is set
- in 'cpoptions'
- }
+ {
+ This is no paragraph
+ unless the '{' is set
+ in 'cpoptions'
+ }
[DATA]
call assert_equal(expected, getline(1, '$'))
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
- call writefile([
- \ 'set previewheight=9',
- \ 'silent! pedit',
- \ 'call setline(1, map(repeat(["ab"], 10), "v:val. v:key"))',
- \ 'exec "norm! G\<C-E>\<C-E>"',
- \ ], 'Xscript')
+ let lines =<< trim END
+ set previewheight=9
+ silent! pedit
+ call setline(1, map(repeat(["ab"], 10), "v:val. v:key"))
+ exec "norm! G\<C-E>\<C-E>"
+ END
+ call writefile(lines, 'Xscript')
let buf = RunVimInTerminal('-S Xscript', {})
" Test that popup and previewwindow do not overlap.
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
- call writefile([
- \ '123456789_123456789_123456789_a',
- \ '123456789_123456789_123456789_b',
- \ ' 123',
- \ ], 'Xtest')
+ let lines =<< trim END
+ 123456789_123456789_123456789_a
+ 123456789_123456789_123456789_b
+ 123
+ END
+ call writefile(lines, 'Xtest')
let buf = RunVimInTerminal('Xtest', {})
call term_sendkeys(buf, ":vsplit\<CR>")
throw 'Skipped: cannot make screendumps and/or menu feature missing'
endif
- call writefile([
- \ 'one two three four five',
- \ 'and one two Xthree four five',
- \ 'one more two three four five',
- \ ], 'Xtest')
+ let lines =<< trim END
+ one two three four five
+ and one two Xthree four five
+ one more two three four five
+ END
+ call writefile(lines, 'Xtest')
let buf = RunVimInTerminal('Xtest', {})
call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>")
call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>")
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
- call writefile([
- \ "call setline(1, range(1, 100))",
- \ "hi PopupColor1 ctermbg=lightblue",
- \ "hi PopupColor2 ctermbg=lightcyan",
- \ "hi Comment ctermfg=red",
- \ "call prop_type_add('comment', {'highlight': 'Comment'})",
- \ "let winid = popup_create('hello there', {'line': 3, 'col': 11, 'minwidth': 20, 'highlight': 'PopupColor1'})",
- \ "let winid2 = popup_create(['another one', 'another two', 'another three'], {'line': 3, 'col': 25, 'minwidth': 20})",
- \ "call setwinvar(winid2, '&wincolor', 'PopupColor2')",
- \], 'XtestPopup')
+ let lines =<< trim END
+ call setline(1, range(1, 100))
+ hi PopupColor1 ctermbg=lightblue
+ hi PopupColor2 ctermbg=lightcyan
+ hi Comment ctermfg=red
+ call prop_type_add('comment', {'highlight': 'Comment'})
+ let winid = popup_create('hello there', {'line': 3, 'col': 11, 'minwidth': 20, 'highlight': 'PopupColor1'})
+ let winid2 = popup_create(['another one', 'another two', 'another three'], {'line': 3, 'col': 25, 'minwidth': 20})
+ call setwinvar(winid2, '&wincolor', 'PopupColor2')
+ END
+ call writefile(lines, 'XtestPopup')
let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
call VerifyScreenDump(buf, 'Test_popupwin_01', {})
endif
for iter in range(0, 1)
- call writefile([iter == 1 ? '' : 'set enc=latin1',
- \ "call setline(1, range(1, 100))",
- \ "call popup_create('hello border', {'line': 2, 'col': 3, 'border': []})",
- \ "call popup_create('hello padding', {'line': 2, 'col': 23, 'padding': []})",
- \ "call popup_create('hello both', {'line': 2, 'col': 43, 'border': [], 'padding': []})",
- \ "call popup_create('border TL', {'line': 6, 'col': 3, 'border': [1, 0, 0, 4]})",
- \ "call popup_create('paddings', {'line': 6, 'col': 23, 'padding': [1, 3, 2, 4]})",
- \ "call popup_create('wrapped longer text', {'line': 8, 'col': 55, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})",
- \ "call popup_create('right aligned text', {'line': 11, 'col': 56, 'wrap': 0, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})",
- \], 'XtestPopupBorder')
+ let lines =<< trim END
+ call setline(1, range(1, 100))
+ call popup_create('hello border', {'line': 2, 'col': 3, 'border': []})
+ call popup_create('hello padding', {'line': 2, 'col': 23, 'padding': []})
+ call popup_create('hello both', {'line': 2, 'col': 43, 'border': [], 'padding': []})
+ call popup_create('border TL', {'line': 6, 'col': 3, 'border': [1, 0, 0, 4]})
+ call popup_create('paddings', {'line': 6, 'col': 23, 'padding': [1, 3, 2, 4]})
+ call popup_create('wrapped longer text', {'line': 8, 'col': 55, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})
+ call popup_create('right aligned text', {'line': 11, 'col': 56, 'wrap': 0, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})
+ END
+ call insert(lines, iter == 1 ? '' : 'set enc=latin1')
+ call writefile(lines, 'XtestPopupBorder')
let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 15})
call VerifyScreenDump(buf, 'Test_popupwin_2' .. iter, {})
call delete('XtestPopupBorder')
endfor
- call writefile([
- \ "call setline(1, range(1, 100))",
- \ "hi BlueColor ctermbg=lightblue",
- \ "hi TopColor ctermbg=253",
- \ "hi RightColor ctermbg=245",
- \ "hi BottomColor ctermbg=240",
- \ "hi LeftColor ctermbg=248",
- \ "call popup_create('hello border', {'line': 2, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor']})",
- \ "call popup_create(['hello border', 'and more'], {'line': 2, 'col': 23, 'border': [], 'borderhighlight': ['TopColor', 'RightColor', 'BottomColor', 'LeftColor']})",
- \ "call popup_create(['hello border', 'lines only'], {'line': 2, 'col': 43, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x']})",
- \ "call popup_create(['hello border', 'with corners'], {'line': 2, 'col': 60, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x', '#']})",
- \ "let winid = popup_create(['hello border', 'with numbers'], {'line': 6, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['0', '1', '2', '3', '4', '5', '6', '7']})",
- \ "call popup_create(['hello border', 'just blanks'], {'line': 7, 'col': 23, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': [' ']})",
- \], 'XtestPopupBorder')
+ let lines =<< trim END
+ call setline(1, range(1, 100))
+ hi BlueColor ctermbg=lightblue
+ hi TopColor ctermbg=253
+ hi RightColor ctermbg=245
+ hi BottomColor ctermbg=240
+ hi LeftColor ctermbg=248
+ call popup_create('hello border', {'line': 2, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor']})
+ call popup_create(['hello border', 'and more'], {'line': 2, 'col': 23, 'border': [], 'borderhighlight': ['TopColor', 'RightColor', 'BottomColor', 'LeftColor']})
+ call popup_create(['hello border', 'lines only'], {'line': 2, 'col': 43, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x']})
+ call popup_create(['hello border', 'with corners'], {'line': 2, 'col': 60, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x', '#']})
+ let winid = popup_create(['hello border', 'with numbers'], {'line': 6, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['0', '1', '2', '3', '4', '5', '6', '7']})
+ call popup_create(['hello border', 'just blanks'], {'line': 7, 'col': 23, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': [' ']})
+ END
+ call writefile(lines, 'XtestPopupBorder')
let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 12})
call VerifyScreenDump(buf, 'Test_popupwin_22', {})
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
- call writefile([
- \ "call setline(1, range(1, 100))",
- \ "hi PopupColor ctermbg=lightblue",
- \ "let winid = popup_create([",
- \ "\\ '#include <stdio.h>',",
- \ "\\ 'int main(void)',",
- \ "\\ '{',",
- \ "\\ ' printf(123);',",
- \ "\\ '}',",
- \ "\\], {'line': 3, 'col': 25, 'highlight': 'PopupColor'})",
- \ "call win_execute(winid, 'set syntax=cpp')",
- \], 'XtestPopup')
+ let lines =<< trim END
+ call setline(1, range(1, 100))
+ hi PopupColor ctermbg=lightblue
+ let winid = popup_create([
+ \ '#include <stdio.h>',
+ \ 'int main(void)',
+ \ '{',
+ \ ' printf(123);',
+ \ '}',
+ \], {'line': 3, 'col': 25, 'highlight': 'PopupColor'})
+ call win_execute(winid, 'set syntax=cpp')
+ END
+ call writefile(lines, 'XtestPopup')
let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
call VerifyScreenDump(buf, 'Test_popupwin_10', {})
call delete('XtestPopupDrag')
endfunc
+func Test_popup_with_mask()
+ if !CanRunVimInTerminal()
+ throw 'Skipped: cannot make screendumps'
+ endif
+ let lines =<< trim END
+ call setline(1, repeat([join(range(1, 40), '')], 10))
+ hi PopupColor ctermbg=lightgrey
+ let winid = popup_create([
+ \ 'some text',
+ \ 'another line',
+ \], {
+ \ 'line': 2,
+ \ 'col': 10,
+ \ 'zindex': 90,
+ \ 'padding': [],
+ \ 'highlight': 'PopupColor',
+ \ 'mask': [[1,1,1,1], [-5,-1,4,4], [7,9,2,3], [2,4,3,3]]})
+ call popup_create([
+ \ 'xxxxxxxxx',
+ \ 'yyyyyyyyy',
+ \], {
+ \ 'line': 3,
+ \ 'col': 18,
+ \ 'zindex': 20})
+ END
+ call writefile(lines, 'XtestPopupMask')
+ let buf = RunVimInTerminal('-S XtestPopupMask', {'rows': 10})
+ call VerifyScreenDump(buf, 'Test_popupwin_mask_1', {})
+
+ call term_sendkeys(buf, ":call popup_move(winid, {'col': 11, 'line': 3})\<CR>")
+ call VerifyScreenDump(buf, 'Test_popupwin_mask_2', {})
+
+ " clean up
+ call StopVimInTerminal(buf)
+ call delete('XtestPopupMask')
+endfunc
+
func Test_popup_select()
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
func Test_profile_file()
let lines =<< trim [CODE]
- func! Foo()
- endfunc
- for i in range(10)
- " a comment
+ func! Foo()
+ endfunc
+ for i in range(10)
+ " a comment
+ call Foo()
+ endfor
call Foo()
- endfor
- call Foo()
[CODE]
call writefile(lines, 'Xprofile_file.vim')
endif
let l =<< trim [DATA]
- "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
- "Xtestfile", line 6 col 19; this is an error
- gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c
- Xtestfile:9: parse error before `asd'
- make: *** [vim] Error 1
- in file "Xtestfile" linenr 10: there is an error
-
- 2 returned
- "Xtestfile", line 11 col 1; this is an error
- "Xtestfile", line 12 col 2; this is another error
- "Xtestfile", line 14:10; this is an error in column 10
- =Xtestfile=, line 15:10; this is another error, but in vcol 10 this time
- "Xtestfile", linenr 16: yet another problem
- Error in "Xtestfile" at line 17:
- x should be a dot
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
- ^
- Error in "Xtestfile" at line 18:
- x should be a dot
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
- .............^
- Error in "Xtestfile" at line 19:
- x should be a dot
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
- --------------^
- Error in "Xtestfile" at line 20:
- x should be a dot
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
- ^
-
- Does anyone know what is the problem and how to correction it?
- "Xtestfile", line 21 col 9: What is the title of the quickfix window?
- "Xtestfile", line 22 col 9: What is the title of the quickfix window?
+ "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
+ "Xtestfile", line 6 col 19; this is an error
+ gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c
+ Xtestfile:9: parse error before `asd'
+ make: *** [vim] Error 1
+ in file "Xtestfile" linenr 10: there is an error
+
+ 2 returned
+ "Xtestfile", line 11 col 1; this is an error
+ "Xtestfile", line 12 col 2; this is another error
+ "Xtestfile", line 14:10; this is an error in column 10
+ =Xtestfile=, line 15:10; this is another error, but in vcol 10 this time
+ "Xtestfile", linenr 16: yet another problem
+ Error in "Xtestfile" at line 17:
+ x should be a dot
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
+ ^
+ Error in "Xtestfile" at line 18:
+ x should be a dot
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
+ .............^
+ Error in "Xtestfile" at line 19:
+ x should be a dot
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
+ --------------^
+ Error in "Xtestfile" at line 20:
+ x should be a dot
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
+ ^
+
+ Does anyone know what is the problem and how to correction it?
+ "Xtestfile", line 21 col 9: What is the title of the quickfix window?
+ "Xtestfile", line 22 col 9: What is the title of the quickfix window?
[DATA]
call writefile(l, 'Xerrorfile1')
call writefile(l[:-2], 'Xerrorfile2')
- let m =<< trim [DATA]
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 4
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 6
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 9
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 10
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 12
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 14
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 15
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 21
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 22
- [DATA]
+ let m =<< [DATA]
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 4
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 6
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 9
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 10
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 12
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 14
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 15
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 21
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 22
+[DATA]
call writefile(m, 'Xtestfile')
let save_efm = &efm
" Test for %P, %Q and %t format specifiers
let lines =<< trim [DATA]
- [Xtestfile1]
- (1,17) error: ';' missing
- (21,2) warning: variable 'z' not defined
- (67,3) error: end of file found before string ended
- --
-
- [Xtestfile2]
- --
-
- [Xtestfile3]
- NEW compiler v1.1
- (2,2) warning: variable 'x' not defined
- (67,3) warning: 's' already defined
- --
+ [Xtestfile1]
+ (1,17) error: ';' missing
+ (21,2) warning: variable 'z' not defined
+ (67,3) error: end of file found before string ended
+ --
+
+ [Xtestfile2]
+ --
+
+ [Xtestfile3]
+ NEW compiler v1.1
+ (2,2) warning: variable 'x' not defined
+ (67,3) warning: 's' already defined
+ --
[DATA]
set efm=%+P[%f]%r,(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%+Q--%r
" Tests for %E, %C and %Z format specifiers
let lines =<< trim [DATA]
- Error 275
- line 42
- column 3
- ' ' expected after '--'
+ Error 275
+ line 42
+ column 3
+ ' ' expected after '--'
[DATA]
set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m
" Test for %>
let lines =<< trim [DATA]
- Error in line 147 of foo.c:
- unknown variable 'i'
+ Error in line 147 of foo.c:
+ unknown variable 'i'
[DATA]
set efm=unknown\ variable\ %m,%E%>Error\ in\ line\ %l\ of\ %f:,%Z%m
" Test for %A, %C and other formats
let lines =<< trim [DATA]
- ==============================================================
- FAIL: testGetTypeIdCachesResult (dbfacadeTest.DjsDBFacadeTest)
- --------------------------------------------------------------
- Traceback (most recent call last):
- File "unittests/dbfacadeTest.py", line 89, in testFoo
- self.assertEquals(34, dtid)
- File "/usr/lib/python2.2/unittest.py", line 286, in
- failUnlessEqual
- raise self.failureException, \\
- AssertionError: 34 != 33
-
- --------------------------------------------------------------
- Ran 27 tests in 0.063s
+ ==============================================================
+ FAIL: testGetTypeIdCachesResult (dbfacadeTest.DjsDBFacadeTest)
+ --------------------------------------------------------------
+ Traceback (most recent call last):
+ File "unittests/dbfacadeTest.py", line 89, in testFoo
+ self.assertEquals(34, dtid)
+ File "/usr/lib/python2.2/unittest.py", line 286, in
+ failUnlessEqual
+ raise self.failureException, \\
+ AssertionError: 34 != 33
+
+ --------------------------------------------------------------
+ Ran 27 tests in 0.063s
[DATA]
set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m
exe '0r! ' . s:xxd_cmd . ' -i XXDfile'
$d
let expected =<< trim [CODE]
- unsigned char XXDfile[] = {
- 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
- };
- unsigned int XXDfile_len = 11;
+ unsigned char XXDfile[] = {
+ 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
+ };
+ unsigned int XXDfile_len = 11;
[CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
exe '0r! ' . s:xxd_cmd . ' -i ' . arg . ' XXDfile'
$d
let expected =<< trim [CODE]
- unsigned char XXDFILE[] = {
- 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
- };
- unsigned int XXDFILE_LEN = 11;
+ unsigned char XXDFILE[] = {
+ 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
+ };
+ unsigned int XXDFILE_LEN = 11;
[CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
endfor
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1585,
/**/
1584,
/**/
projects / vim / commitdiff