perf: improve syntax performance again

refer: #2877
lervag · Jan 28, 2024 · c08aea6 · c08aea6
1 parent a397999
commit c08aea6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/autoload/vimtex/syntax/core.vim b/autoload/vimtex/syntax/core.vim
@@ -55,12 +55,12 @@ function! vimtex#syntax#core#init_rules() abort " {{{1
 
   syntax match texLigature "--"
   syntax match texLigature "---"
-  syntax match texLigature "``\|''\|,,"
+  syntax match texLigature "\([`',]\)\1"
   syntax match texTabularChar "&"
   syntax match texTabularChar "\\\\"
 
   " E.g.:  \$ \& \% \# \{ \} \_ \S \P
-  syntax match texSpecialChar "\\\@<!\~"
+  syntax match texSpecialChar "\~"
   syntax match texSpecialChar "\\ "
   syntax match texSpecialChar "\\[$&%#{}_@]"
   syntax match texSpecialChar "\\[SP@]\ze[^a-zA-Z@]"
@@ -2174,7 +2174,7 @@ endfunction
 
 " }}}1
 function! s:match_conceal_spacing() abort " {{{1
-  syntax match texSpecialChar "\\\@<!\~"          conceal cchar= 
+  syntax match texSpecialChar "\~"                conceal cchar= 
   syntax match texSpecialChar "\\ "               conceal cchar= 
   syntax match texSpecialChar "\\[,;:!>]"         conceal
   syntax match texSpecialChar "\\@\ze\s\+"        conceal

diff --git a/test/test-syntax/test-core.tex b/test/test-syntax/test-core.tex
@@ -129,4 +129,7 @@ \section*{Acknowledgement}
   0
 \end{tabular}
 
+%% Some basic stuff re. #2877
+foo\\~bar \~More test; in math: $f(x) ~ \~ 1$
+
 \end{document}
diff --git a/test/test-syntax/test-core.vim b/test/test-syntax/test-core.vim
@@ -21,4 +21,8 @@ call assert_true(vimtex#syntax#in('texCmdBibitem', 124, 3))
 call assert_true(vimtex#syntax#in('texBibitemArg', 124, 13))
 call assert_true(vimtex#syntax#in('texBibitemOpt', 125, 13))
 
+call assert_true(vimtex#syntax#in('texTabularChar', 133, 5))
+call assert_true(vimtex#syntax#in('texSpecialChar', 133, 6))
+call assert_true(vimtex#syntax#in('texCmdAccent', 133, 11))
+
 call vimtex#test#finished()