Skip to content

Fix highlighting inside classes; add missing non-identity operator; other tweaks. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nepella wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix highlighting inside classes; add missing non-identity operator; other tweaks. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6b950e
Highlight non-identity ("!==") operator.
nepella Jul 17, 2018
c6f49bd
Change containing syntax element.
nepella Jul 17, 2018
98802ed
Move setting to ftplugin script.
nepella Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions after/syntax/php.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@ 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
hi link phpNiceKeyword phpKeyword
hi link phpNiceRelation phpRelation
hi link phpNiceMemberSelector phpMemberSelector
hi! link Conceal phpOperator

setlocal conceallevel=2
10 changes: 10 additions & 0 deletions ftplugin/php.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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