diff --git a/after/syntax/php.vim b/after/syntax/php.vim index d5a47ee..17e772e 100644 --- a/after/syntax/php.vim +++ b/after/syntax/php.vim @@ -2,17 +2,18 @@ if exists('g:no_php_conceal') || !has('conceal') || &enc != 'utf-8' finish endif -syntax match phpNiceOperator "||" conceal cchar=∨ contained containedin=phpRegion -syntax match phpNiceOperator "&&" conceal cchar=∧ contained containedin=phpRegion -syntax match phpNiceOperator "!" conceal cchar=¬ contained containedin=phpRegion -syntax match phpNiceOperator "<=" conceal cchar=≤ contained containedin=phpRegion -syntax match phpNiceOperator ">=" conceal cchar=≥ contained containedin=phpRegion -syntax match phpNiceOperator "==" conceal cchar=≈ contained containedin=phpRegion -syntax match phpNiceOperator "===" conceal cchar=≡ contained containedin=phpRegion -syntax match phpNiceOperator "::" conceal cchar=∷ contained containedin=phpRegion -syntax match phpNiceOperator "!=" conceal cchar=≠ contained containedin=phpRegion -syntax match phpNiceRelation "=>" conceal cchar=⇛ contained containedin=phpRegion -syntax match phpNiceMemberSelector "\->" conceal cchar=→ contained containedin=phpRegion +syntax match phpNiceOperator "||" conceal cchar=∨ contained containedin=@phpClInside +syntax match phpNiceOperator "&&" conceal cchar=∧ contained containedin=@phpClInside +syntax match phpNiceOperator "!" conceal cchar=¬ contained containedin=@phpClInside +syntax match phpNiceOperator "<=" conceal cchar=≤ contained containedin=@phpClInside +syntax match phpNiceOperator ">=" conceal cchar=≥ contained containedin=@phpClInside +syntax match phpNiceOperator "==" conceal cchar=≈ contained containedin=@phpClInside +syntax match phpNiceOperator "===" conceal cchar=≡ contained containedin=@phpClInside +syntax match phpNiceOperator "::" conceal cchar=∷ contained containedin=@phpClInside +syntax match phpNiceOperator "!=" conceal cchar=≠ contained containedin=@phpClInside +syntax match phpNiceOperator "!==" conceal cchar=≢ contained containedin=@phpClInside +syntax match phpNiceRelation "=>" conceal cchar=⇛ contained containedin=@phpClInside +syntax match phpNiceMemberSelector "\->" conceal cchar=→ contained containedin=@phpClInside hi link phpNiceOperator phpOperator hi link phpNiceStatement phpStatement @@ -20,5 +21,3 @@ hi link phpNiceKeyword phpKeyword hi link phpNiceRelation phpRelation hi link phpNiceMemberSelector phpMemberSelector hi! link Conceal phpOperator - -setlocal conceallevel=2 diff --git a/ftplugin/php.vim b/ftplugin/php.vim new file mode 100644 index 0000000..8d24dd2 --- /dev/null +++ b/ftplugin/php.vim @@ -0,0 +1,10 @@ +let s:save_cpo = &cpoptions +set cpoptions-=C + +setlocal conceallevel=2 + +let b:undo_ftplugin = (exists("b:undo_ftplugin") ? b:undo_ftplugin . "|" : "") . + \ "setlocal conceallevel<" + +let &cpoptions = s:save_cpo +unlet s:save_cpo