From f6b950eaa421454ba620cdbd8b58a2629a838ce9 Mon Sep 17 00:00:00 2001 From: Renee Margaret McConahy Date: Tue, 17 Jul 2018 16:21:26 -0400 Subject: [PATCH 1/3] Highlight non-identity ("!==") operator. --- after/syntax/php.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/after/syntax/php.vim b/after/syntax/php.vim index d5a47ee..c7b68c8 100644 --- a/after/syntax/php.vim +++ b/after/syntax/php.vim @@ -11,6 +11,7 @@ syntax match phpNiceOperator "==" conceal cchar=≈ contained containedin=phpReg 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 From c6f49bd209ac9d07f5523280d1801536bfb03b05 Mon Sep 17 00:00:00 2001 From: Renee Margaret McConahy Date: Tue, 17 Jul 2018 16:28:41 -0400 Subject: [PATCH 2/3] Change containing syntax element. It appears that the @phpClInside cluster is the better target; phpRegion does not match inside a class. --- after/syntax/php.vim | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/after/syntax/php.vim b/after/syntax/php.vim index c7b68c8..231749a 100644 --- a/after/syntax/php.vim +++ b/after/syntax/php.vim @@ -2,18 +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 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 From 98802ed1c8247fe1a6a84b10955b620c81fbe4a0 Mon Sep 17 00:00:00 2001 From: Renee Margaret McConahy Date: Tue, 17 Jul 2018 16:33:40 -0400 Subject: [PATCH 3/3] Move setting to ftplugin script. The current convention appears to be to have file type settings separate from syntax definitions. It's also customary (see |undo_ftplugin) to store an undo script in a particular buffer variable: Vim executes it when changing file type. --- after/syntax/php.vim | 2 -- ftplugin/php.vim | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 ftplugin/php.vim diff --git a/after/syntax/php.vim b/after/syntax/php.vim index 231749a..17e772e 100644 --- a/after/syntax/php.vim +++ b/after/syntax/php.vim @@ -21,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