Mercurial > vim
view src/testdir/test_conceal.vim @ 33278:b5ed566262d3 v9.0.1906
patch 9.0.1906: Vim9: Interfaces should not support class methods and variables
Commit: https://github.com/vim/vim/commit/92d9ee5f4ca0d2de04c39afbafc7609da43fb2e9
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Sun Sep 17 17:03:19 2023 +0200
patch 9.0.1906: Vim9: Interfaces should not support class methods and variables
Problem: Vim9: Interfaces should not support class methods and
variables
Solution: Make sure interface follow the interface specification
Vim9 interface changes to follow the new interface specification:
1) An interface can have only read-only and read-write instance
variables.
2) An interface can have only public instance methods.
3) An interface cannot have class variables and class methods.
4) An interface cannot have private instance variables and private
instance methods.
5) A interface can extend another interface using "extends". The
sub-interface gets all the variables and methods in the super
interface.
That means:
- Interfaces should not support class methods and variables.
- Adjust error numbers and add additional tests.
- Interface methods can be defined in one of the super classes.
- Interface variables can be defined in one of the super classes.
and instance variables can be repeated in sub interfaces.
- Check the class variable types with the type in interface.
closes: #13100
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 17 Sep 2023 17:15:06 +0200 |
parents | 7a1a9ce831c3 |
children | 33cb93a8d573 |
line wrap: on
line source
" Tests for 'conceal'. source check.vim CheckFeature conceal source screendump.vim source view_util.vim func Test_conceal_two_windows() CheckScreendump let code =<< trim [CODE] let lines = ["one one one one one", "two |hidden| here", "three |hidden| three"] call setline(1, lines) syntax match test /|hidden|/ conceal set conceallevel=2 set concealcursor= exe "normal /here\r" new call setline(1, lines) call setline(4, "Second window") syntax match test /|hidden|/ conceal set conceallevel=2 set concealcursor=nc exe "normal /here\r" [CODE] call writefile(code, 'XTest_conceal', 'D') " Check that cursor line is concealed let buf = RunVimInTerminal('-S XTest_conceal', {}) call VerifyScreenDump(buf, 'Test_conceal_two_windows_01', {}) " Check that with concealed text vertical cursor movement is correct. call term_sendkeys(buf, "k") call VerifyScreenDump(buf, 'Test_conceal_two_windows_02', {}) " Check that with cursor line is not concealed call term_sendkeys(buf, "j") call term_sendkeys(buf, ":set concealcursor=\r") call VerifyScreenDump(buf, 'Test_conceal_two_windows_03', {}) " Check that with cursor line is not concealed when moving cursor down call term_sendkeys(buf, "j") call VerifyScreenDump(buf, 'Test_conceal_two_windows_04', {}) " Check that with cursor line is not concealed when switching windows call term_sendkeys(buf, "\<C-W>\<C-W>") call VerifyScreenDump(buf, 'Test_conceal_two_windows_05', {}) " Check that with cursor line is only concealed in Normal mode call term_sendkeys(buf, ":set concealcursor=n\r") call VerifyScreenDump(buf, 'Test_conceal_two_windows_06n', {}) call term_sendkeys(buf, "a") call VerifyScreenDump(buf, 'Test_conceal_two_windows_06i', {}) call term_sendkeys(buf, "\<Esc>/e") call VerifyScreenDump(buf, 'Test_conceal_two_windows_06c', {}) call term_sendkeys(buf, "\<Esc>v") call VerifyScreenDump(buf, 'Test_conceal_two_windows_06v', {}) call term_sendkeys(buf, "\<Esc>") " Check that with cursor line is only concealed in Insert mode call term_sendkeys(buf, ":set concealcursor=i\r") call VerifyScreenDump(buf, 'Test_conceal_two_windows_07n', {}) call term_sendkeys(buf, "14|a") call VerifyScreenDump(buf, 'Test_conceal_two_windows_07i', {}) call term_sendkeys(buf, "\<Esc>") call VerifyScreenDump(buf, 'Test_conceal_two_windows_07in', {}) call term_sendkeys(buf, "/e") call VerifyScreenDump(buf, 'Test_conceal_two_windows_07c', {}) call term_sendkeys(buf, "\<Esc>v") call VerifyScreenDump(buf, 'Test_conceal_two_windows_07v', {}) call term_sendkeys(buf, "\<Esc>") " Check that with cursor line is only concealed in Command mode call term_sendkeys(buf, ":set concealcursor=c\r") call VerifyScreenDump(buf, 'Test_conceal_two_windows_08n', {}) call term_sendkeys(buf, "a") call VerifyScreenDump(buf, 'Test_conceal_two_windows_08i', {}) call term_sendkeys(buf, "\<Esc>/e") call VerifyScreenDump(buf, 'Test_conceal_two_windows_08c', {}) call term_sendkeys(buf, "\<Esc>v") call VerifyScreenDump(buf, 'Test_conceal_two_windows_08v', {}) call term_sendkeys(buf, "\<Esc>") " Check that with cursor line is only concealed in Visual mode call term_sendkeys(buf, ":set concealcursor=v\r") call VerifyScreenDump(buf, 'Test_conceal_two_windows_09n', {}) call term_sendkeys(buf, "a") call VerifyScreenDump(buf, 'Test_conceal_two_windows_09i', {}) call term_sendkeys(buf, "\<Esc>/e") call VerifyScreenDump(buf, 'Test_conceal_two_windows_09c', {}) call term_sendkeys(buf, "\<Esc>v") call VerifyScreenDump(buf, 'Test_conceal_two_windows_09v', {}) call term_sendkeys(buf, "\<Esc>") " Check moving the cursor while in insert mode. call term_sendkeys(buf, ":set concealcursor=\r") call term_sendkeys(buf, "a") call VerifyScreenDump(buf, 'Test_conceal_two_windows_10', {}) call term_sendkeys(buf, "\<Down>") call VerifyScreenDump(buf, 'Test_conceal_two_windows_11', {}) call term_sendkeys(buf, "\<Esc>") " Check the "o" command call VerifyScreenDump(buf, 'Test_conceal_two_windows_12', {}) call term_sendkeys(buf, "o") call VerifyScreenDump(buf, 'Test_conceal_two_windows_13', {}) call term_sendkeys(buf, "\<Esc>") " clean up call StopVimInTerminal(buf) endfunc func Test_conceal_with_cursorline() CheckScreendump " Opens a help window, where 'conceal' is set, switches to the other window " where 'cursorline' needs to be updated when the cursor moves. let code =<< trim [CODE] set cursorline normal othis is a test new call setline(1, ["one", "two", "three", "four", "five"]) set ft=help normal M [CODE] call writefile(code, 'XTest_conceal_cul', 'D') let buf = RunVimInTerminal('-S XTest_conceal_cul', {}) call VerifyScreenDump(buf, 'Test_conceal_cul_01', {}) call term_sendkeys(buf, ":wincmd w\r") call VerifyScreenDump(buf, 'Test_conceal_cul_02', {}) call term_sendkeys(buf, "k") call VerifyScreenDump(buf, 'Test_conceal_cul_03', {}) " clean up call StopVimInTerminal(buf) endfunc func Test_conceal_with_cursorcolumn() CheckScreendump " Check that cursorcolumn and colorcolumn don't get broken in presence of " wrapped lines containing concealed text let code =<< trim [CODE] let lines = ["one one one |hidden| one one one one one one one one", \ "two two two two |hidden| here two two", \ "three |hidden| three three three three three three three three"] call setline(1, lines) set wrap linebreak set showbreak=\ >>>\ syntax match test /|hidden|/ conceal set conceallevel=2 set concealcursor= exe "normal /here\r" set cursorcolumn set colorcolumn=50 [CODE] call writefile(code, 'XTest_conceal_cuc', 'D') let buf = RunVimInTerminal('-S XTest_conceal_cuc', {'rows': 10, 'cols': 40}) call VerifyScreenDump(buf, 'Test_conceal_cuc_01', {}) " move cursor to the end of line (the cursor jumps to the next screen line) call term_sendkeys(buf, "$") call VerifyScreenDump(buf, 'Test_conceal_cuc_02', {}) " clean up call StopVimInTerminal(buf) endfunc func Test_conceal_resize_term() CheckScreendump let code =<< trim [CODE] call setline(1, '`one` `two` `three` `four` `five`, the backticks should be concealed') setl cocu=n cole=3 syn region CommentCodeSpan matchgroup=Comment start=/`/ end=/`/ concealends normal fb [CODE] call writefile(code, 'XTest_conceal_resize', 'D') let buf = RunVimInTerminal('-S XTest_conceal_resize', {'rows': 6}) call VerifyScreenDump(buf, 'Test_conceal_resize_01', {}) call win_execute(buf->win_findbuf()[0], 'wincmd +') call VerifyScreenDump(buf, 'Test_conceal_resize_02', {}) " clean up call StopVimInTerminal(buf) endfunc func Test_conceal_linebreak() CheckScreendump let code =<< trim [CODE] vim9script &wrap = true &conceallevel = 2 &concealcursor = 'nc' &linebreak = true &showbreak = '+ ' var line: string = 'a`a`a`a`' .. 'a'->repeat(&columns - 15) .. ' b`b`' .. 'b'->repeat(&columns - 10) .. ' cccccc' ['x'->repeat(&columns), '', line]->setline(1) syntax region CodeSpan matchgroup=Delimiter start=/\z(`\+\)/ end=/\z1/ concealends [CODE] call writefile(code, 'XTest_conceal_linebreak', 'D') let buf = RunVimInTerminal('-S XTest_conceal_linebreak', {'rows': 8}) call VerifyScreenDump(buf, 'Test_conceal_linebreak_1', {}) " clean up call StopVimInTerminal(buf) endfunc " Tests for correct display (cursor column position) with +conceal and " tabulators. Need to run this test in a separate Vim instance. Otherwise the " screen is not updated (lazy redraw) and the cursor position is wrong. func Test_conceal_cursor_pos() let code =<< trim [CODE] :let l = ['start:', '.concealed. text', "|concealed|\ttext"] :let l += ['', "\t.concealed.\ttext", "\t|concealed|\ttext", ''] :let l += [".a.\t.b.\t.c.\t.d.", "|a|\t|b|\t|c|\t|d|"] :call append(0, l) :call cursor(1, 1) :" Conceal settings. :set conceallevel=2 :set concealcursor=nc :syntax match test /|/ conceal :" Save current cursor position. Only works in <expr> mode, can't be used :" with :normal because it moves the cursor to the command line. Thanks :" to ZyX <zyx.vim@gmail.com> for the idea to use an <expr> mapping. :let curpos = [] :nnoremap <expr> GG ":let curpos += ['".screenrow().":".screencol()."']\n" :normal ztj GGk :" We should end up in the same column when running these commands on the :" two lines. :normal ft GGk :normal $ GGk :normal 0j GGk :normal ft GGk :normal $ GGk :normal 0j0j GGk :" Same for next test block. :normal ft GGk :normal $ GGk :normal 0j GGk :normal ft GGk :normal $ GGk :normal 0j0j GGk :" And check W with multiple tabs and conceals in a line. :normal W GGk :normal W GGk :normal W GGk :normal $ GGk :normal 0j GGk :normal W GGk :normal W GGk :normal W GGk :normal $ GGk :set lbr :normal $ GGk :set list listchars=tab:>- :normal 0 GGk :normal W GGk :normal W GGk :normal W GGk :normal $ GGk :call writefile(curpos, 'Xconceal_curpos.out') :q! [CODE] call writefile(code, 'XTest_conceal_curpos', 'D') if RunVim([], [], '-s XTest_conceal_curpos') call assert_equal([ \ '2:1', '2:17', '2:20', '3:1', '3:17', '3:20', '5:8', '5:25', \ '5:28', '6:8', '6:25', '6:28', '8:1', '8:9', '8:17', '8:25', \ '8:27', '9:1', '9:9', '9:17', '9:25', '9:26', '9:26', '9:1', \ '9:9', '9:17', '9:25', '9:26'], readfile('Xconceal_curpos.out')) endif call delete('Xconceal_curpos.out') endfunc func Test_conceal_eol() new! setlocal concealcursor=n conceallevel=1 call setline(1, ["x", ""]) call matchaddpos('Conceal', [[2, 1, 1]], 2, -1, {'conceal': 1}) redraw! call assert_notequal(screenchar(1, 1), screenchar(2, 2)) call assert_equal(screenattr(1, 1), screenattr(1, 2)) call assert_equal(screenattr(1, 2), screenattr(2, 2)) call assert_equal(screenattr(2, 1), screenattr(2, 2)) set list redraw! call assert_equal(screenattr(1, 1), screenattr(2, 2)) call assert_notequal(screenattr(1, 1), screenattr(1, 2)) call assert_notequal(screenattr(1, 2), screenattr(2, 1)) set nolist endfunc func Test_conceal_mouse_click() enew! set mouse=a setlocal conceallevel=2 concealcursor=nc syn match Concealed "this" conceal hi link Concealed Search call setline(1, 'conceal this click here') redraw call assert_equal(['conceal click here '], ScreenLines(1, 20)) " click on the space between "this" and "click" puts cursor there call test_setmouse(1, 9) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 13, 0, 13], getcurpos()) " click on 'h' of "here" puts cursor there call test_setmouse(1, 16) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 20, 0, 20], getcurpos()) " click on 'e' of "here" puts cursor there call test_setmouse(1, 19) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 23, 0, 23], getcurpos()) " click after end of line puts cursor on 'e' without 'virtualedit' call test_setmouse(1, 20) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 23, 0, 24], getcurpos()) call test_setmouse(1, 21) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 23, 0, 25], getcurpos()) call test_setmouse(1, 22) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 23, 0, 26], getcurpos()) call test_setmouse(1, 31) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 23, 0, 35], getcurpos()) call test_setmouse(1, 32) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 23, 0, 36], getcurpos()) set virtualedit=all redraw " click on the space between "this" and "click" puts cursor there call test_setmouse(1, 9) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 13, 0, 13], getcurpos()) " click on 'h' of "here" puts cursor there call test_setmouse(1, 16) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 20, 0, 20], getcurpos()) " click on 'e' of "here" puts cursor there call test_setmouse(1, 19) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 23, 0, 23], getcurpos()) " click after end of line puts cursor there without 'virtualedit' call test_setmouse(1, 20) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 24, 0, 24], getcurpos()) call test_setmouse(1, 21) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 24, 1, 25], getcurpos()) call test_setmouse(1, 22) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 24, 2, 26], getcurpos()) call test_setmouse(1, 31) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 24, 11, 35], getcurpos()) call test_setmouse(1, 32) call feedkeys("\<LeftMouse>", "tx") call assert_equal([0, 1, 24, 12, 36], getcurpos()) bwipe! set mouse& virtualedit& endfunc " vim: shiftwidth=2 sts=2 expandtab