From 1aacd2fbae61f2c9649f23b5a0c07f08fefc30f5 Mon Sep 17 00:00:00 2001 From: Chin Leung Date: Fri, 29 Sep 2017 09:59:07 -0400 Subject: [PATCH 1/4] Added more operator conceal --- syntax/javascript.vim | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/syntax/javascript.vim b/syntax/javascript.vim index fabfce28..0b195b10 100644 --- a/syntax/javascript.vim +++ b/syntax/javascript.vim @@ -178,8 +178,17 @@ syntax match jsArrowFuncArgs /([^()]*)\s*\(=>\)\@=/ contains=jsFuncArgs skipe exe 'syntax match jsFunction /\/ skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '') exe 'syntax match jsArrowFunction /=>/ skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '') -exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/ skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '').(' contains=jsArrowFuncArgs') +exe 'syntax match jsArrowFunction /()\s*\(=>\)\@=/ skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '') exe 'syntax match jsArrowFunction /_\s*\(=>\)\@=/ skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '') +exe 'syntax match jsComparison /==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_double_equal') ? 'conceal cchar=' . g:javascript_conceal_double_equal : '') +exe 'syntax match jsComparison /===/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_triple_equal') ? 'conceal cchar=' . g:javascript_conceal_triple_equal : '') +exe 'syntax match jsComparison /||/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_or_comparison') ? 'conceal cchar=' . g:javascript_conceal_or_operator : '') +exe 'syntax match jsComparison /&&/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_and_operator : '') +exe 'syntax match jsComparison /!/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_not_operator : '') +exe 'syntax match jsComparison />=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_greater_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_greater_equal_operator : '') +exe 'syntax match jsComparison /<=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_less_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_less_equal_operator : '') +exe 'syntax match jsComparison /!=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_equal_operator : '') +exe 'syntax match jsComparison /!==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_strict_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_strict_equal_operator : '') " Classes syntax keyword jsClassKeyword contained class From 02b6903bd398b8053696fa0bae601ccb1e6dcd15 Mon Sep 17 00:00:00 2001 From: Chin Leung Date: Fri, 29 Jun 2018 09:32:31 -0400 Subject: [PATCH 2/4] Documented new conceal options --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index b60614f9..c8f1889f 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,15 @@ variables: let g:javascript_conceal_arrow_function = "⇒" let g:javascript_conceal_noarg_arrow_function = "🞅" let g:javascript_conceal_underscore_arrow_function = "🞅" + let g:javascript_conceal_double_equal = "≈" + let g:javascript_conceal_triple_equal = "≡" + let g:javascript_conceal_or_operator = "∨" + let g:javascript_conceal_and_operator = "∧" + let g:javascript_conceal_not_operator = "¬" + let g:javascript_conceal_greater_equal_operator = "≥" + let g:javascript_conceal_less_equal_operator = "≤" + let g:javascript_conceal_not_equal_operator = "≠" + let g:javascript_conceal_not_strict_equal_operator = "≢" You can enable concealing within VIM with: From 329a15fab35b0ea050475fbec8d5587e34581529 Mon Sep 17 00:00:00 2001 From: Chin Leung Date: Fri, 29 Sep 2017 09:59:07 -0400 Subject: [PATCH 3/4] Added more operator conceal --- syntax/javascript.vim | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/syntax/javascript.vim b/syntax/javascript.vim index 9225c21e..dda53088 100644 --- a/syntax/javascript.vim +++ b/syntax/javascript.vim @@ -174,6 +174,15 @@ exe 'syntax match jsFunction /\/ skipwhite skipempty nextgroup=jsGene exe 'syntax match jsArrowFunction /=>/ skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '') exe 'syntax match jsArrowFunction /()\ze\s*=>/ skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '') exe 'syntax match jsArrowFunction /_\ze\s*=>/ skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '') +exe 'syntax match jsComparison /==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_double_equal') ? 'conceal cchar=' . g:javascript_conceal_double_equal : '') +exe 'syntax match jsComparison /===/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_triple_equal') ? 'conceal cchar=' . g:javascript_conceal_triple_equal : '') +exe 'syntax match jsComparison /||/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_or_comparison') ? 'conceal cchar=' . g:javascript_conceal_or_operator : '') +exe 'syntax match jsComparison /&&/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_and_operator : '') +exe 'syntax match jsComparison /!/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_and_comparison') ? 'conceal cchar=' . g:javascript_conceal_not_operator : '') +exe 'syntax match jsComparison />=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_greater_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_greater_equal_operator : '') +exe 'syntax match jsComparison /<=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_less_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_less_equal_operator : '') +exe 'syntax match jsComparison /!=/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_equal_operator : '') +exe 'syntax match jsComparison /!==/ skipwhite skipempty containedin=jsParenIfElse '.(exists('g:javascript_conceal_not_strict_equal_operator') ? 'conceal cchar=' . g:javascript_conceal_not_strict_equal_operator : '') " Classes syntax keyword jsClassKeyword contained class From 7292e495c654c35d48f1af8523d4ee86f3afa4de Mon Sep 17 00:00:00 2001 From: Chin Leung Date: Fri, 29 Jun 2018 09:32:31 -0400 Subject: [PATCH 4/4] Documented new conceal options --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index b9ac49f4..e688ce46 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,15 @@ variables: let g:javascript_conceal_arrow_function = "⇒" let g:javascript_conceal_noarg_arrow_function = "🞅" let g:javascript_conceal_underscore_arrow_function = "🞅" + let g:javascript_conceal_double_equal = "≈" + let g:javascript_conceal_triple_equal = "≡" + let g:javascript_conceal_or_operator = "∨" + let g:javascript_conceal_and_operator = "∧" + let g:javascript_conceal_not_operator = "¬" + let g:javascript_conceal_greater_equal_operator = "≥" + let g:javascript_conceal_less_equal_operator = "≤" + let g:javascript_conceal_not_equal_operator = "≠" + let g:javascript_conceal_not_strict_equal_operator = "≢" You can enable concealing within VIM with: