mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-11 15:37:29 +02:00
Merge remote-tracking branch 'vim/master'
This commit is contained in:
Kazuki Sakamoto
@@ -24,7 +24,9 @@ static int chg_c_a2s(int cur_c);
|
||||
static int chg_c_a2i(int cur_c);
|
||||
static int chg_c_a2m(int cur_c);
|
||||
static int chg_c_a2f(int cur_c);
|
||||
#if 0
|
||||
static int chg_c_i2m(int cur_c);
|
||||
#endif
|
||||
static int chg_c_f2m(int cur_c);
|
||||
static int chg_c_laa2i(int hid_c);
|
||||
static int chg_c_laa2f(int hid_c);
|
||||
@@ -418,7 +420,10 @@ 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)
|
||||
{
|
||||
@@ -450,6 +455,7 @@ chg_c_i2m(int cur_c)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ -608,7 +614,11 @@ arabic_shape(
|
||||
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
|
||||
|
||||
+142
-1
@@ -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
|
||||
|
||||
@@ -9,8 +9,8 @@ func! Test_address_fold()
|
||||
call setline(1, ['int FuncName() {/*{{{*/', 1, 2, 3, 4, 5, '}/*}}}*/',
|
||||
\ 'after fold 1', 'after fold 2', 'after fold 3'])
|
||||
setl fen fdm=marker
|
||||
" The next ccommands should all copy the same part of the buffer,
|
||||
" regardless of the adressing type, since the part to be copied
|
||||
" The next commands should all copy the same part of the buffer,
|
||||
" regardless of the addressing type, since the part to be copied
|
||||
" is folded away
|
||||
:1y
|
||||
call assert_equal(['int FuncName() {/*{{{*/', '1', '2', '3', '4', '5', '}/*}}}*/'], getreg(0,1,1))
|
||||
@@ -360,3 +360,56 @@ func! Test_move_folds_around_indent()
|
||||
call assert_equal([0, 1, 1, 1, 1, 0, 0, 0, 1, 1], map(range(1, line('$')), 'foldlevel(v:val)'))
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
func Test_folddoopen_folddoclosed()
|
||||
new
|
||||
call setline(1, range(1, 9))
|
||||
set foldmethod=manual
|
||||
1,3 fold
|
||||
6,8 fold
|
||||
|
||||
" Test without range.
|
||||
folddoopen s/$/o/
|
||||
folddoclosed s/$/c/
|
||||
call assert_equal(['1c', '2c', '3c',
|
||||
\ '4o', '5o',
|
||||
\ '6c', '7c', '8c',
|
||||
\ '9o'], getline(1, '$'))
|
||||
|
||||
" Test with range.
|
||||
call setline(1, range(1, 9))
|
||||
1,8 folddoopen s/$/o/
|
||||
4,$ folddoclosed s/$/c/
|
||||
call assert_equal(['1', '2', '3',
|
||||
\ '4o', '5o',
|
||||
\ '6c', '7c', '8c',
|
||||
\ '9'], getline(1, '$'))
|
||||
|
||||
set foldmethod&
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
func Test_fold_error()
|
||||
new
|
||||
call setline(1, [1, 2])
|
||||
|
||||
for fm in ['indent', 'expr', 'syntax', 'diff']
|
||||
exe 'set foldmethod=' . fm
|
||||
call assert_fails('norm zf', 'E350:')
|
||||
call assert_fails('norm zd', 'E351:')
|
||||
call assert_fails('norm zE', 'E352:')
|
||||
endfor
|
||||
|
||||
set foldmethod=manual
|
||||
call assert_fails('norm zd', 'E490:')
|
||||
call assert_fails('norm zo', 'E490:')
|
||||
call assert_fails('3fold', 'E16:')
|
||||
|
||||
set foldmethod=marker
|
||||
set nomodifiable
|
||||
call assert_fails('1,2fold', 'E21:')
|
||||
|
||||
set modifiable&
|
||||
set foldmethod&
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
@@ -779,6 +779,10 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
497,
|
||||
/**/
|
||||
496,
|
||||
/**/
|
||||
495,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user