From f50df3925b7c909d1cda4c868d8c7ba38189aabe Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 21 Jun 2016 21:33:34 +0200 Subject: [PATCH 1/3] patch 7.4.1950 Problem: Quickfix long lines test not executed for buffer. Solution: Call the function to test long lines. (Yegappan Lakshmanan) --- src/testdir/test_quickfix.vim | 1 + src/version.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index 56bf9cb28f..211ccc2b56 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1006,6 +1006,7 @@ function s:long_lines_tests(cchar) " buffer exe 'edit' testfile exe 'Xbuffer' bufnr('%') + call XLongLinesTests(a:cchar) endfunction function Test_long_lines() diff --git a/src/version.c b/src/version.c index a99c93f1e5..c74b155122 100644 --- a/src/version.c +++ b/src/version.c @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1950, /**/ 1949, /**/ From 85babd6db65afb0eb06a7a9a0778d692248c5c2b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 21 Jun 2016 22:59:28 +0200 Subject: [PATCH 2/3] patch 7.4.1951 Problem: Ruby test is old style. Solution: Convert to a new style test. (Ken Takata) --- src/Makefile | 5 ++++- src/testdir/Make_all.mak | 2 +- src/testdir/test_ruby.in | 25 ------------------------- src/testdir/test_ruby.ok | 3 --- src/testdir/test_ruby.vim | 34 ++++++++++++++++++++++++++++++++++ src/version.c | 2 ++ 6 files changed, 41 insertions(+), 30 deletions(-) delete mode 100644 src/testdir/test_ruby.in delete mode 100644 src/testdir/test_ruby.ok create mode 100644 src/testdir/test_ruby.vim diff --git a/src/Makefile b/src/Makefile index 5b510e0ebd..76b16b667c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1986,7 +1986,6 @@ test1 \ test_marks \ test_nested_function \ test_options \ - test_ruby \ test_search_mbyte \ test_signs \ test_tagcase \ @@ -2015,6 +2014,7 @@ test_arglist \ test_backspace_opt \ test_cdo \ test_channel \ + test_cmdline \ test_cursor_func \ test_delete \ test_ex_undo \ @@ -2035,6 +2035,7 @@ test_arglist \ test_json \ test_langmap \ test_lispwords \ + test_man \ test_matchadd_conceal \ test_matchadd_conceal_utf8 \ test_matchstrpos \ @@ -2047,12 +2048,14 @@ test_arglist \ test_regexp_latin \ test_regexp_utf8 \ test_reltime \ + test_ruby \ test_searchpos \ test_set \ test_sort \ test_statusline \ test_syn_attr \ test_syntax \ + test_usercommands \ test_tabline \ test_tagjump \ test_timers \ diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index 2dbdc32735..a22a76f058 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -106,7 +106,6 @@ SCRIPTS_ALL = \ test_marks.out \ test_nested_function.out \ test_options.out \ - test_ruby.out \ test_search_mbyte.out \ test_signs.out \ test_tagcase.out \ @@ -180,6 +179,7 @@ NEW_TESTS = test_arglist.res \ test_packadd.res \ test_perl.res \ test_quickfix.res \ + test_ruby.res \ test_syntax.res \ test_usercommands.res \ test_viminfo.res \ diff --git a/src/testdir/test_ruby.in b/src/testdir/test_ruby.in deleted file mode 100644 index 71d21eb230..0000000000 --- a/src/testdir/test_ruby.in +++ /dev/null @@ -1,25 +0,0 @@ -Tests for ruby interface. vim: set ft=vim : - -STARTTEST -:so small.vim -:set nocompatible viminfo+=nviminfo -:if !has('ruby') | e! test.ok | wq! test.out | endif -:" change buffer contents -:ruby VIM.command("normal /^1\n") -:ruby $curbuf.line = "1 changed line 1" -:" evaluate a List -:ruby VIM.command("normal /^2\n") -:let l = ["abc", "def"] -:ruby << EOF -curline = $curbuf.line_number -l = VIM.evaluate("l"); -$curbuf.append(curline, l.join("\n")) -EOF -:normal j -:.rubydo $_ = $_.gsub(/\n/, '/') -:?^1?,$w! test.out -:qa! -ENDTEST - -1 line 1 -2 line 2 diff --git a/src/testdir/test_ruby.ok b/src/testdir/test_ruby.ok deleted file mode 100644 index a217efd412..0000000000 --- a/src/testdir/test_ruby.ok +++ /dev/null @@ -1,3 +0,0 @@ -1 changed line 1 -2 line 2 -abc/def diff --git a/src/testdir/test_ruby.vim b/src/testdir/test_ruby.vim new file mode 100644 index 0000000000..106ccb48c3 --- /dev/null +++ b/src/testdir/test_ruby.vim @@ -0,0 +1,34 @@ +" Tests for ruby interface + +if !has('ruby') + finish +end + +func Test_ruby_change_buffer() + call setline(line('$'), ['1 line 1']) + ruby Vim.command("normal /^1\n") + ruby $curbuf.line = "1 changed line 1" + call assert_equal('1 changed line 1', getline('$')) +endfunc + +func Test_ruby_evaluate_list() + call setline(line('$'), ['2 line 2']) + ruby Vim.command("normal /^2\n") + let l = ["abc", "def"] + ruby << EOF + curline = $curbuf.line_number + l = Vim.evaluate("l"); + $curbuf.append(curline, l.join("\n")) +EOF + normal j + .rubydo $_ = $_.gsub(/\n/, '/') + call assert_equal('abc/def', getline('$')) +endfunc + +func Test_ruby_evaluate_dict() + let d = {'a': 'foo', 'b': 123} + redir => l:out + ruby d = Vim.evaluate("d"); print d + redir END + call assert_equal(['{"a"=>"foo", "b"=>123}'], split(l:out, "\n")) +endfunc diff --git a/src/version.c b/src/version.c index c74b155122..3e0fc90ba0 100644 --- a/src/version.c +++ b/src/version.c @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1951, /**/ 1950, /**/ From b12e7ef956e0b0344778b7ef93d41f4b4ed2a670 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 21 Jun 2016 23:42:20 +0200 Subject: [PATCH 3/3] patch 7.4.1952 Problem: Cscope interface does not support finding assignments. Solution: Add the "a" command. (ppettina, closes #882) --- src/if_cscope.c | 17 ++++++++++++----- src/version.c | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/if_cscope.c b/src/if_cscope.c index 2f75390b9a..c3b36bca0d 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -70,7 +70,7 @@ static cscmd_T cs_cmds[] = { "add", cs_add, N_("Add a new database"), "add file|dir [pre-path] [flags]", 0 }, { "find", cs_find, - N_("Query for a pattern"), "find c|d|e|f|g|i|s|t name", 1 }, + N_("Query for a pattern"), "find c|d|e|f|g|i|s|t|a name", 1 }, { "help", cs_help, N_("Show this message"), "help", 0 }, { "kill", cs_kill, @@ -126,12 +126,12 @@ get_cscope_name(expand_T *xp UNUSED, int idx) { const char *query_type[] = { - "c", "d", "e", "f", "g", "i", "s", "t", NULL + "c", "d", "e", "f", "g", "i", "s", "t", "a", NULL }; /* Complete with query type of ":cscope find {query_type}". - * {query_type} can be letters (c, d, ... t) or numbers (0, 1, - * ..., 8) but only complete with letters, since numbers are + * {query_type} can be letters (c, d, ... a) or numbers (0, 1, + * ..., 9) but only complete with letters, since numbers are * redundant. */ return (char_u *)query_type[idx]; } @@ -791,6 +791,9 @@ cs_create_cmd(char *csoption, char *pattern) case '8' : case 'i' : search = 8; break; + case '9' : case 'a' : + search = 9; + break; default : (void)EMSG(_("E561: unknown cscope search type")); cs_usage_msg(Find); @@ -1151,6 +1154,9 @@ cs_find_common( case '8' : cmdletter = 'i'; break; + case '9' : + cmdletter = 'a'; + break; default : cmdletter = opt[0]; } @@ -1352,7 +1358,8 @@ cs_help(exarg_T *eap UNUSED) " g: Find this definition\n" " i: Find files #including this file\n" " s: Find this C symbol\n" - " t: Find this text string\n")); + " t: Find this text string\n" + " a: Find assignments to this symbol\n")); cmdp++; } diff --git a/src/version.c b/src/version.c index 3e0fc90ba0..320247c94b 100644 --- a/src/version.c +++ b/src/version.c @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1952, /**/ 1951, /**/