[vim/vim] runtime/syntax/vim: Fix vimOper ordinal, repeat count. (#7966)
Tsuyoshi CHO
Problem
Below code highlight do not work expect result.
if &filetype !~# '^v' echo 1 endif
Solution
This PR fix below:
- vim operator
!~=do not highlight, fix vimOper order. - vim operator do not have
==??/==##and other, use?instead{0,2}
I'm created PR reason: #7464
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/7966
Commit Summary
- vim operator syntax fix
File Changes
- M runtime/syntax/vim.vim (4)
Patch Links:
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
codecov[bot]
Codecov Report
Merging #7966 (bbedbda) into master (c80f647) will decrease coverage by
86.60%.
The diff coverage is0.00%.
@@ Coverage Diff @@ ## master #7966 +/- ## =========================================== - Coverage 89.09% 2.49% -86.61% =========================================== Files 148 146 -2 Lines 165201 160138 -5063 =========================================== - Hits 147185 3990 -143195 - Misses 18016 156148 +138132
| Flag | Coverage Δ | |
|---|---|---|
| huge-clang-none | ? |
|
| huge-gcc-none | ? |
|
| huge-gcc-testgui | ? |
|
| huge-gcc-unittests | 2.49% <0.00%> (-0.01%) |
⬇️ |
Flags with carried forward coverage won't be shown. Click here to find out more.
| Impacted Files | Coverage Δ | |
|---|---|---|
| src/autocmd.c | 2.08% <0.00%> (-89.73%) |
⬇️ |
| src/eval.c | 0.10% <0.00%> (-96.12%) |
⬇️ |
| src/evalfunc.c | 0.00% <0.00%> (-96.00%) |
⬇️ |
| src/evalvars.c | 5.31% <0.00%> (-90.77%) |
⬇️ |
| src/ex_docmd.c | 0.00% <0.00%> (-94.75%) |
⬇️ |
| src/session.c | 0.00% <0.00%> (-82.11%) |
⬇️ |
| src/version.c | 0.86% <ø> (-91.48%) |
⬇️ |
| src/vim9compile.c | 0.00% <0.00%> (-94.08%) |
⬇️ |
| src/vim9execute.c | 0.00% <0.00%> (-93.24%) |
⬇️ |
| src/vim9script.c | 0.00% <0.00%> (-93.54%) |
⬇️ |
| ... and 146 more |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact),ø = not affected,? = missing data
Powered by Codecov. Last update c80f647...fecc652. Read the comment docs.
Tsuyoshi CHO
@tsuyoshicho pushed 1 commit.
- f87ba32 vim operator syntax fix
—
You are receiving this because you are subscribed to this thread.
Tsuyoshi CHO
@tsuyoshicho pushed 1 commit.
- ab94604 vim operator syntax fix
—
You are receiving this because you are subscribed to this thread.
Tsuyoshi CHO
@tsuyoshicho pushed 1 commit.
- bf0ab4d vim operator syntax fix
—
You are receiving this because you are subscribed to this thread.
View it on GitHub.
Triage notifications on the go with GitHub Mobile for iOS or Android.
Tsuyoshi CHO
@tsuyoshicho pushed 1 commit.
- 419101f vim operator syntax fix
—
You are receiving this because you are subscribed to this thread.
Charles Campbell
>
> @tsuyoshicho <https://github.com/tsuyoshicho> pushed 1 commit.
>
> * 419101f
> <https://github.com/vim/vim/commit/419101fb03dd48e8c73f9a419db666577311542e>
> vim operator syntax fix
>
>
Hello, Tsuyoshi:
Unfortunately, github is telling me that it can't find your commit.
Would you please send a diff to me and an example illustrating the issue.
Thank you,
Chip Campbell
Bram Moolenaar
this.
https://github.com/vim/vim/commit/419101fb03dd48e8c73f9a419db666577311542e.diff
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 1fd94752b79..25a4eb4698d 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -228,9 +228,9 @@ syn keyword vimAugroupKey contained aug[roup]
" Operators: {{{2
" =========
syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimType,vimRegister,vimContinue,vim9Comment
+syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile
syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile
-syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile
syn region vimOperParen matchgroup=vimParenSep start="(" end=")" contains=vimoperStar,@vimOperGroup
syn region vimOperParen matchgroup=vimSep start="#\={" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
--
From "know your smileys":
8-O "Omigod!!" (done "rm -rf *" ?)
/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Charles Campbell
So it seems that its a changing of priority for the matching, as he
simply moved a line to an earlier point in the file. I'd still like an
example if the OP would please provide one so I can put it into my test
suite.
Chip Campbell
Tsuyoshi CHO
Tsuyoshi CHO
@cecamp san,
Show PR affect.
vimOper as Operator, syntax fix.
Original Result:
This PR's fix applied Result:
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub.
cecamp
Hmm, your change didn't seem to affect the example for me. Probably something I've updated. Anyway, please try http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM, version 8.2-09.
—
You are receiving this because you are subscribed to this thread.
cecamp
Sorry, I got my markdown mixed up. Try [syntax/vim.vim](http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM].
—
You are receiving this because you are subscribed to this thread.
cecamp
Maybe a third time? syntax/vim.vim
—
You are receiving this because you are subscribed to this thread.
Bram Moolenaar
For what it's worth: with the current copy of the Vim syntax I do see this problem.
—
You are receiving this because you are subscribed to this thread.
Bram Moolenaar
You can use a non-breaking space character:
return "nice\u00a0stl"
—
You are receiving this because you are subscribed to this thread.
Bram Moolenaar
Oops, wrong issue.
—
You are receiving this because you are subscribed to this thread.
Tsuyoshi CHO
@cecamp said
Maybe a third time? syntax/vim.vim
Tested that latest syntax (vim.vim.gz), This problem fixed it!
They can close this PR if the next release contains modified syntax file.
Thanks.
—
You are receiving this because you are subscribed to this thread.
Bram Moolenaar
I'll receive an update from Charles soon, no reason to keep this open.
—
You are receiving this because you are subscribed to this thread.
Bram Moolenaar
Tsuyoshi CHO
Thanks all.
—
You are receiving this because you are subscribed to this thread.