kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-21 03:35:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0497: arabic support is not fully tested (#8404)

Browse Source 
Problem:    Arabic support is not fully tested.
Solution:   Add more tests for the untested functions.  Comment out
            unreachable code.
vim/vim@3ff2f09
This commit is contained in:
nthanben 2018-05-19 01:37:10 -07:00 committed by Justin M. Keyes
parent e3707c312a
commit a82ac8accb
2 changed files with 150 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/arabic.c
View File

@ -580,6 +580,9 @@ static int chg_c_a2f(int cur_c)
}
// Change shape - from Initial to Medial
// This code is unreachable, because for the relevant characters ARABIC_CHAR()
// is FALSE;
#if 0
static int chg_c_i2m(int cur_c)
{
switch (cur_c) {
@ -609,6 +612,7 @@ static int chg_c_i2m(int cur_c)
}
return 0;
}
#endif
// Change shape - from Final to Medial
static int chg_c_f2m(int cur_c)
@ -736,7 +740,11 @@ int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1,
} else if (!shape_c || A_is_f(shape_c) || A_is_s(shape_c) || prev_laa) {
curr_c = A_is_valid(next_c) ? chg_c_a2i(c) : chg_c_a2s(c);
} else if (A_is_valid(next_c)) {
#if 0
curr_c = A_is_iso(c) ? chg_c_a2m(c) : chg_c_i2m(c);
#else
curr_c = A_is_iso(c) ? chg_c_a2m(c) : 0;
#endif
} else if (A_is_valid(prev_c)) {
curr_c = chg_c_a2f(c);
} else {

143
src/nvim/testdir/test_arabic.vim
View File

@ -1,4 +1,6 @@
" Simplistic testing of Arabic mode.
" NOTE: This just checks if the code works. If you know Arabic please add
" functional tests that check the shaping works with real text.
if !has('arabic') || !has('multi_byte')
finish
@ -417,7 +419,7 @@ func Test_shape_isolated()
bwipe!
endfunc
func Test_shape_medial()
func Test_shape_iso_to_medial()
new
set arabicshape
@ -470,3 +472,142 @@ func Test_shape_medial()
bwipe!
endfunc
func Test_shape_final()
new
set arabicshape
" Shaping arabic {testchar} arabic Tests chg_c_a2f().
" pair[0] = testchar, pair[1] = current-result, pair[2] = previous-result
for pair in [[s:a_HAMZA, s:a_s_HAMZA, s:a_s_BEH],
\[s:a_ALEF_MADDA, s:a_f_ALEF_MADDA, s:a_i_BEH],
\[s:a_ALEF_HAMZA_ABOVE, s:a_f_ALEF_HAMZA_ABOVE, s:a_i_BEH],
\[s:a_WAW_HAMZA, s:a_f_WAW_HAMZA, s:a_i_BEH],
\[s:a_ALEF_HAMZA_BELOW, s:a_f_ALEF_HAMZA_BELOW, s:a_i_BEH],
\[s:a_YEH_HAMZA, s:a_f_YEH_HAMZA, s:a_i_BEH],
\[s:a_ALEF, s:a_f_ALEF, s:a_i_BEH],
\[s:a_BEH, s:a_f_BEH, s:a_i_BEH],
\[s:a_TEH_MARBUTA, s:a_f_TEH_MARBUTA, s:a_i_BEH],
\[s:a_TEH, s:a_f_TEH, s:a_i_BEH],
\[s:a_THEH, s:a_f_THEH, s:a_i_BEH],
\[s:a_JEEM, s:a_f_JEEM, s:a_i_BEH],
\[s:a_HAH, s:a_f_HAH, s:a_i_BEH],
\[s:a_KHAH, s:a_f_KHAH, s:a_i_BEH],
\[s:a_DAL, s:a_f_DAL, s:a_i_BEH],
\[s:a_THAL, s:a_f_THAL, s:a_i_BEH],
\[s:a_REH, s:a_f_REH, s:a_i_BEH],
\[s:a_ZAIN, s:a_f_ZAIN, s:a_i_BEH],
\[s:a_SEEN, s:a_f_SEEN, s:a_i_BEH],
\[s:a_SHEEN, s:a_f_SHEEN, s:a_i_BEH],
\[s:a_SAD, s:a_f_SAD, s:a_i_BEH],
\[s:a_DAD, s:a_f_DAD, s:a_i_BEH],
\[s:a_TAH, s:a_f_TAH, s:a_i_BEH],
\[s:a_ZAH, s:a_f_ZAH, s:a_i_BEH],
\[s:a_AIN, s:a_f_AIN, s:a_i_BEH],
\[s:a_GHAIN, s:a_f_GHAIN, s:a_i_BEH],
\[s:a_TATWEEL, s:a_TATWEEL, s:a_i_BEH],
\[s:a_FEH, s:a_f_FEH, s:a_i_BEH],
\[s:a_QAF, s:a_f_QAF, s:a_i_BEH],
\[s:a_KAF, s:a_f_KAF, s:a_i_BEH],
\[s:a_LAM, s:a_f_LAM, s:a_i_BEH],
\[s:a_MEEM, s:a_f_MEEM, s:a_i_BEH],
\[s:a_NOON, s:a_f_NOON, s:a_i_BEH],
\[s:a_HEH, s:a_f_HEH, s:a_i_BEH],
\[s:a_WAW, s:a_f_WAW, s:a_i_BEH],
\[s:a_ALEF_MAKSURA, s:a_f_ALEF_MAKSURA, s:a_i_BEH],
\[s:a_YEH, s:a_f_YEH, s:a_i_BEH],
\ ]
call setline(1, ' ' . pair[0] . s:a_BEH)
call assert_equal([' ' . pair[1] . pair[2]], ScreenLines(1, 3))
endfor
set arabicshape&
bwipe!
endfunc
func Test_shape_final_to_medial()
new
set arabicshape
" Shaping arabic {testchar} arabic Tests chg_c_f2m().
" This does not test much...
" pair[0] = testchar, pair[1] = current-result
for pair in [[s:a_f_YEH_HAMZA, s:a_f_BEH],
\[s:a_f_WAW_HAMZA, s:a_s_BEH],
\[s:a_f_ALEF, s:a_s_BEH],
\[s:a_f_TEH_MARBUTA, s:a_s_BEH],
\[s:a_f_DAL, s:a_s_BEH],
\[s:a_f_THAL, s:a_s_BEH],
\[s:a_f_REH, s:a_s_BEH],
\[s:a_f_ZAIN, s:a_s_BEH],
\[s:a_f_WAW, s:a_s_BEH],
\[s:a_f_ALEF_MAKSURA, s:a_s_BEH],
\[s:a_f_BEH, s:a_f_BEH],
\[s:a_f_TEH, s:a_f_BEH],
\[s:a_f_THEH, s:a_f_BEH],
\[s:a_f_JEEM, s:a_f_BEH],
\[s:a_f_HAH, s:a_f_BEH],
\[s:a_f_KHAH, s:a_f_BEH],
\[s:a_f_SEEN, s:a_f_BEH],
\[s:a_f_SHEEN, s:a_f_BEH],
\[s:a_f_SAD, s:a_f_BEH],
\[s:a_f_DAD, s:a_f_BEH],
\[s:a_f_TAH, s:a_f_BEH],
\[s:a_f_ZAH, s:a_f_BEH],
\[s:a_f_AIN, s:a_f_BEH],
\[s:a_f_GHAIN, s:a_f_BEH],
\[s:a_f_FEH, s:a_f_BEH],
\[s:a_f_QAF, s:a_f_BEH],
\[s:a_f_KAF, s:a_f_BEH],
\[s:a_f_LAM, s:a_f_BEH],
\[s:a_f_MEEM, s:a_f_BEH],
\[s:a_f_NOON, s:a_f_BEH],
\[s:a_f_HEH, s:a_f_BEH],
\[s:a_f_YEH, s:a_f_BEH],
\ ]
call setline(1, ' ' . s:a_BEH . pair[0])
call assert_equal([' ' . pair[1] . pair[0]], ScreenLines(1, 3))
endfor
set arabicshape&
bwipe!
endfunc
func Test_shape_combination_final()
new
set arabicshape
" Shaping arabic {testchar} arabic Tests chg_c_laa2f().
" pair[0] = testchar, pair[1] = current-result
for pair in [[s:a_ALEF_MADDA, s:a_f_LAM_ALEF_MADDA_ABOVE],
\ [s:a_ALEF_HAMZA_ABOVE, s:a_f_LAM_ALEF_HAMZA_ABOVE],
\ [s:a_ALEF_HAMZA_BELOW, s:a_f_LAM_ALEF_HAMZA_BELOW],
\ [s:a_ALEF, s:a_f_LAM_ALEF],
\ ]
" The test char is a composing char, put on s:a_LAM.
call setline(1, ' ' . s:a_LAM . pair[0] . s:a_BEH)
call assert_equal([' ' . pair[1] . s:a_i_BEH], ScreenLines(1, 3))
endfor
set arabicshape&
bwipe!
endfunc
func Test_shape_combination_isolated()
new
set arabicshape
" Shaping arabic {testchar} arabic Tests chg_c_laa2i().
" pair[0] = testchar, pair[1] = current-result
for pair in [[s:a_ALEF_MADDA, s:a_s_LAM_ALEF_MADDA_ABOVE],
\ [s:a_ALEF_HAMZA_ABOVE, s:a_s_LAM_ALEF_HAMZA_ABOVE],
\ [s:a_ALEF_HAMZA_BELOW, s:a_s_LAM_ALEF_HAMZA_BELOW],
\ [s:a_ALEF, s:a_s_LAM_ALEF],
\ ]
" The test char is a composing char, put on s:a_LAM.
call setline(1, ' ' . s:a_LAM . pair[0] . ' ')
call assert_equal([' ' . pair[1] . ' '], ScreenLines(1, 3))
endfor
set arabicshape&
bwipe!
endfunc