summaryrefslogtreecommitdiffstats
path: root/src/testdir
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2023-08-10 05:44:25 +0200
committerChristian Brabandt <cb@256bit.org>2023-08-10 06:19:18 +0200
commit6efb1980336ff324e9c57a4e282530b952fca816 (patch)
tree4b357d0ed63f01aad8196861ab5f612f00e0e04d /src/testdir
parent6019fed0c50a31f0f9bb6c80e4e2b97d3f71565a (diff)
Updated runtime filesv9.0.1683
This is a collection of various PRs from github that all require a minor patch number: 1) https://github.com/vim/vim/pull/12612 Do not conflate dictionary key with end of block 2) https://github.com/vim/vim/pull/12729: When saving and restoring 'undolevels', the constructs `&undolevels` and `:set undolevels` are problematic. The construct `&undolevels` reads an unpredictable value; it will be the local option value (if one has been set), or the global option value (otherwise), making it unsuitable for saving a value for later restoration. Similarly, if a local option value has been set for 'undolevels', temporarily modifying the option via `:set undolevels` changes the local value as well as the global value, requiring extra work to restore both values. Saving and restoring the option value in one step via the construct `:let &undolevels = &undolevels` appears to make no changes to the 'undolevels' option, but if a local option has been set to a different value than the global option, it has the unintended effect of changing the global 'undolevels' value to the local value. Update the documentation to explain these issues and recommend explicit use of global and local option values when saving and restoring. Update some unit tests to use `g:undolevels`. 3) https://github.com/vim/vim/pull/12702: Problem: Pip requirements files are not recognized. Solution: Add a pattern to match pip requirements files. 4) https://github.com/vim/vim/pull/12688: Add indent file and tests for ABB Rapid 5) https://github.com/vim/vim/pull/12668: Use Lua 5.1 numeric escapes in tests and add to CI Only Lua 5.2+ and LuaJIT understand hexadecimal escapes in strings. Lua 5.1 only supports decimal escapes: > A character in a string can also be specified by its numerical value > using the escape sequence \ddd, where ddd is a sequence of up to three > decimal digits. (Note that if a numerical escape is to be followed by a > digit, it must be expressed using exactly three digits.) Strings in Lua > can contain any 8-bit value, including embedded zeros, which can be > specified as '\0'. To make sure this works with Lua 5.4 and Lua 5.1 change the Vim CI to run with Lua 5.1 as well as Lua 5.4 6) https://github.com/vim/vim/pull/12631: Add hurl filetype detection 7) https://github.com/vim/vim/pull/12573: Problem: Files for haskell persistent library are not recognized Solution: Add pattern persistentmodels for haskell persistent library closes: #12612 closes: #12729 closes: #12702 closes: #12688 closes: #12668 closes: #12631 closes: #12573 Co-authored-by: lacygoill <lacygoill@lacygoill.me> Co-authored-by: Michael Henry <drmikehenry@drmikehenry.com> Co-authored-by: ObserverOfTime <chronobserver@disroot.org> Co-authored-by: KnoP-01 <knosowski@graeffrobotics.de> Co-authored-by: James McCoy <jamessan@jamessan.com> Co-authored-by: Jacob Pfeifer <jacob@pfeifer.dev> Co-authored-by: Borys Lykah <lykahb@fastmail.com>
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/test_filetype.vim3
-rw-r--r--src/testdir/test_lua.vim6
-rw-r--r--src/testdir/test_mapping.vim4
-rw-r--r--src/testdir/test_signs.vim4
4 files changed, 10 insertions, 7 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 25bfdeb004..e26d3a17ab 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -298,6 +298,7 @@ def s:GetFilenameChecks(): dict<list<string>>
handlebars: ['file.hbs'],
hare: ['file.ha'],
haskell: ['file.hs', 'file.hsc', 'file.hs-boot', 'file.hsig'],
+ haskellpersistent: ['file.persistentmodels'],
haste: ['file.ht'],
hastepreproc: ['file.htpp'],
hb: ['file.hb'],
@@ -316,6 +317,7 @@ def s:GetFilenameChecks(): dict<list<string>>
html: ['file.html', 'file.htm', 'file.cshtml'],
htmlm4: ['file.html.m4'],
httest: ['file.htt', 'file.htb'],
+ hurl: ['file.hurl'],
i3config: ['/home/user/.i3/config', '/home/user/.config/i3/config', '/etc/i3/config', '/etc/xdg/i3/config'],
ibasic: ['file.iba', 'file.ibi'],
icemenu: ['/.icewm/menu', 'any/.icewm/menu'],
@@ -564,6 +566,7 @@ def s:GetFilenameChecks(): dict<list<string>>
readline: ['.inputrc', 'inputrc'],
rego: ['file.rego'],
remind: ['.reminders', 'file.remind', 'file.rem', '.reminders-file'],
+ requirements: ['file.pip', 'requirements.txt'],
rescript: ['file.res', 'file.resi'],
resolv: ['resolv.conf'],
reva: ['file.frt'],
diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index 2f9e21fb62..81e9262ca2 100644
--- a/src/testdir/test_lua.vim
+++ b/src/testdir/test_lua.vim
@@ -616,10 +616,10 @@ endfunc
func Test_lua_blob()
call assert_equal(0z, luaeval('vim.blob("")'))
call assert_equal(0z31326162, luaeval('vim.blob("12ab")'))
- call assert_equal(0z00010203, luaeval('vim.blob("\x00\x01\x02\x03")'))
- call assert_equal(0z8081FEFF, luaeval('vim.blob("\x80\x81\xfe\xff")'))
+ call assert_equal(0z00010203, luaeval('vim.blob("\000\001\002\003")'))
+ call assert_equal(0z8081FEFF, luaeval('vim.blob("\128\129\254\255")'))
- lua b = vim.blob("\x00\x00\x00\x00")
+ lua b = vim.blob("\000\000\000\000")
call assert_equal(0z00000000, luaeval('b'))
call assert_equal(4, luaeval('#b'))
lua b[0], b[1], b[2], b[3] = 1, 32, 256, 0xff
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index f9c21bb073..e81173d2bc 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1341,13 +1341,13 @@ func Test_map_cmdkey_op_pending_mode()
call assert_equal(['lines', 'of test text'], getline(1, '$'))
call assert_equal(['some short '], getreg('"', 1, 1))
" create a new undo point
- let &undolevels = &undolevels
+ let &g:undolevels = &g:undolevels
call feedkeys(".", 'xt')
call assert_equal(['test text'], getline(1, '$'))
call assert_equal(['lines', 'of '], getreg('"', 1, 1))
" create a new undo point
- let &undolevels = &undolevels
+ let &g:undolevels = &g:undolevels
call feedkeys("uu", 'xt')
call assert_equal(['some short lines', 'of test text'], getline(1, '$'))
diff --git a/src/testdir/test_signs.vim b/src/testdir/test_signs.vim
index 95e8d44869..ffde9b8739 100644
--- a/src/testdir/test_signs.vim
+++ b/src/testdir/test_signs.vim
@@ -1658,7 +1658,7 @@ func Test_sign_lnum_adjust()
" Break the undo. Otherwise the undo operation below will undo all the
" changes made by this function.
- let &undolevels=&undolevels
+ let &g:undolevels=&g:undolevels
" Delete the line with the sign
call deletebufline('', 4)
@@ -1671,7 +1671,7 @@ func Test_sign_lnum_adjust()
call assert_equal(5, l[0].signs[0].lnum)
" Break the undo
- let &undolevels=&undolevels
+ let &g:undolevels=&g:undolevels
" Delete few lines at the end of the buffer including the line with the sign
" Sign line number should not change (as it is placed outside of the buffer)