From 232cce9abe830d7826e08134089b3f039ca744fc Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 14 Sep 2019 16:31:54 -0400
Subject: vim-patch:8.0.1448: segfault with exception inside :rubyfile command

Problem:    Segmentation fault when Ruby throws an exception inside :rubyfile
            command.
Solution:   Use rb_protect() instead of rb_load_protect(). (ujihisa,
            closes vim/vim#2147, greywolf, closes vim/vim#2512, vim/vim#2511)
https://github.com/vim/vim/commit/37badc898b8d167e11553b6d05908ffd35928a6e
---
 src/nvim/testdir/test_ruby.vim | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/nvim/testdir/test_ruby.vim

(limited to 'src/nvim/testdir/test_ruby.vim')

diff --git a/src/nvim/testdir/test_ruby.vim b/src/nvim/testdir/test_ruby.vim
new file mode 100644
index 0000000000..0017f73aef
--- /dev/null
+++ b/src/nvim/testdir/test_ruby.vim
@@ -0,0 +1,59 @@
+" 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
+
+func Test_rubydo()
+  " Check deleting lines does not trigger ml_get error.
+  new
+  call setline(1, ['one', 'two', 'three'])
+  rubydo Vim.command("%d_")
+  bwipe!
+
+  " Check switching to another buffer does not trigger ml_get error.
+  new
+  let wincount = winnr('$')
+  call setline(1, ['one', 'two', 'three'])
+  rubydo Vim.command("new")
+  call assert_equal(wincount + 1, winnr('$'))
+  bwipe!
+  bwipe!
+endfunc
+
+func Test_rubyfile()
+  " Check :rubyfile does not SEGV with Ruby level exception but just fails
+  let tempfile = tempname() . '.rb'
+  call writefile(['raise "vim!"'], tempfile)
+  call assert_fails('rubyfile ' . tempfile)
+  call delete(tempfile)
+endfunc
-- 
cgit 


From 67bede0b270600deeef23db28216cd88f03eb8a7 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 14 Sep 2019 17:00:52 -0400
Subject: test/old: skip failing ruby tests

These tests didn't pass in https://github.com/neovim/neovim/pull/9245
---
 src/nvim/testdir/test_ruby.vim | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/nvim/testdir/test_ruby.vim')

diff --git a/src/nvim/testdir/test_ruby.vim b/src/nvim/testdir/test_ruby.vim
index 0017f73aef..01901d5db3 100644
--- a/src/nvim/testdir/test_ruby.vim
+++ b/src/nvim/testdir/test_ruby.vim
@@ -12,6 +12,7 @@ func Test_ruby_change_buffer()
 endfunc
 
 func Test_ruby_evaluate_list()
+  throw 'skipped: TODO: '
   call setline(line('$'), ['2 line 2'])
   ruby Vim.command("normal /^2\n")
   let l = ["abc", "def"]
@@ -34,6 +35,7 @@ func Test_ruby_evaluate_dict()
 endfunc
 
 func Test_rubydo()
+  throw 'skipped: TODO: '
   " Check deleting lines does not trigger ml_get error.
   new
   call setline(1, ['one', 'two', 'three'])
-- 
cgit 


From ce3d9503b2f47f592be5cee51af4f78285c69506 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 14 Sep 2019 17:44:29 -0400
Subject: vim-patch:8.1.0212: preferred cursor column not set in interfaces

Problem:    Preferred cursor column not set in interfaces.
Solution:   Set w_set_curswant when setting the cursor. (David Hotham,
            closes vim/vim#3060)
https://github.com/vim/vim/commit/53901442f37a59e5495165f91db5574c0b43ab04

This contains test_ruby changes only.
test_python changes were ported before.
---
 src/nvim/testdir/test_ruby.vim | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/nvim/testdir/test_ruby.vim')

diff --git a/src/nvim/testdir/test_ruby.vim b/src/nvim/testdir/test_ruby.vim
index 01901d5db3..ef1a2d25b7 100644
--- a/src/nvim/testdir/test_ruby.vim
+++ b/src/nvim/testdir/test_ruby.vim
@@ -59,3 +59,16 @@ func Test_rubyfile()
   call assert_fails('rubyfile ' . tempfile)
   call delete(tempfile)
 endfunc
+
+func Test_set_cursor()
+  " Check that setting the cursor position works.
+  new
+  call setline(1, ['first line', 'second line'])
+  normal gg
+  rubydo $curwin.cursor = [1, 5]
+  call assert_equal([1, 6], [line('.'), col('.')])
+
+  " Check that movement after setting cursor position keeps current column.
+  normal j
+  call assert_equal([2, 6], [line('.'), col('.')])
+endfunc
-- 
cgit