Mercurial > vim
annotate runtime/syntax/json.vim @ 16998:2ec0f953ec3f v8.1.1499
patch 8.1.1499: ruler not updated after popup window was removed
commit https://github.com/vim/vim/commit/24a5ac5d4dbc4dc5d6d2b7e4dda6612dd9233f5d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 8 19:01:18 2019 +0200
patch 8.1.1499: ruler not updated after popup window was removed
Problem: Ruler not updated after popup window was removed.
Solution: use popup_mask in screen_puts().
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 08 Jun 2019 19:15:06 +0200 |
| parents | 46763b01cd9a |
| children | b9bc47742df6 |
| rev | line source |
|---|---|
|
6070
32a77cc160d9
Update runtime files. Make matchparen plugin backwards compatible.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1 " Vim syntax file |
| 6159 | 2 " Language: JSON |
| 3 " Maintainer: Eli Parra <eli@elzr.com> | |
| 4 " Last Change: 2014 Aug 23 | |
| 5 " Version: 0.12 | |
| 6 | |
| 7 if !exists("main_syntax") | |
|
10048
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
6159
diff
changeset
|
8 " quit when a syntax file was already loaded |
|
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
6159
diff
changeset
|
9 if exists("b:current_syntax") |
| 6159 | 10 finish |
| 11 endif | |
| 12 let main_syntax = 'json' | |
| 13 endif | |
| 14 | |
| 15 syntax match jsonNoise /\%(:\|,\)/ | |
| 16 | |
| 17 " NOTE that for the concealing to work your conceallevel should be set to 2 | |
|
6070
32a77cc160d9
Update runtime files. Make matchparen plugin backwards compatible.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
18 |
| 6159 | 19 " Syntax: Strings |
| 20 " Separated into a match and region because a region by itself is always greedy | |
| 21 syn match jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString | |
| 22 if has('conceal') | |
| 23 syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ concealends contains=jsonEscape contained | |
| 24 else | |
| 25 syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=jsonEscape contained | |
| 26 endif | |
| 27 | |
| 28 " Syntax: JSON does not allow strings with single quotes, unlike JavaScript. | |
| 29 syn region jsonStringSQError oneline start=+'+ skip=+\\\\\|\\"+ end=+'+ | |
| 30 | |
| 31 " Syntax: JSON Keywords | |
| 32 " Separated into a match and region because a region by itself is always greedy | |
| 33 syn match jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword | |
| 34 if has('conceal') | |
| 35 syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ concealends contained | |
| 36 else | |
| 37 syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ contained | |
|
6070
32a77cc160d9
Update runtime files. Make matchparen plugin backwards compatible.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
38 endif |
|
32a77cc160d9
Update runtime files. Make matchparen plugin backwards compatible.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
39 |
| 6159 | 40 " Syntax: Escape sequences |
| 41 syn match jsonEscape "\\["\\/bfnrt]" contained | |
| 42 syn match jsonEscape "\\u\x\{4}" contained | |
| 43 | |
| 44 " Syntax: Numbers | |
| 45 syn match jsonNumber "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>\ze[[:blank:]\r\n]*[,}\]]" | |
| 46 | |
| 47 " ERROR WARNINGS ********************************************** | |
| 48 if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1) | |
| 49 " Syntax: Strings should always be enclosed with quotes. | |
| 50 syn match jsonNoQuotesError "\<[[:alpha:]][[:alnum:]]*\>" | |
| 51 syn match jsonTripleQuotesError /"""/ | |
| 52 | |
| 53 " Syntax: An integer part of 0 followed by other digits is not allowed. | |
| 54 syn match jsonNumError "-\=\<0\d\.\d*\>" | |
| 55 | |
| 56 " Syntax: Decimals smaller than one should begin with 0 (so .1 should be 0.1). | |
| 57 syn match jsonNumError "\:\@<=[[:blank:]\r\n]*\zs\.\d\+" | |
| 58 | |
| 59 " Syntax: No comments in JSON, see http://stackoverflow.com/questions/244777/can-i-comment-a-json-file | |
| 60 syn match jsonCommentError "//.*" | |
| 61 syn match jsonCommentError "\(/\*\)\|\(\*/\)" | |
| 62 | |
| 63 " Syntax: No semicolons in JSON | |
| 64 syn match jsonSemicolonError ";" | |
| 65 | |
| 66 " Syntax: No trailing comma after the last element of arrays or objects | |
| 67 syn match jsonTrailingCommaError ",\_s*[}\]]" | |
| 68 | |
| 69 " Syntax: Watch out for missing commas between elements | |
| 70 syn match jsonMissingCommaError /\("\|\]\|\d\)\zs\_s\+\ze"/ | |
| 71 syn match jsonMissingCommaError /\(\]\|\}\)\_s\+\ze"/ "arrays/objects as values | |
| 72 syn match jsonMissingCommaError /}\_s\+\ze{/ "objects as elements in an array | |
| 73 syn match jsonMissingCommaError /\(true\|false\)\_s\+\ze"/ "true/false as value | |
| 74 endif | |
| 75 | |
| 76 " ********************************************** END OF ERROR WARNINGS | |
| 77 " Allowances for JSONP: function call at the beginning of the file, | |
| 78 " parenthesis and semicolon at the end. | |
| 79 " Function name validation based on | |
| 80 " http://stackoverflow.com/questions/2008279/validate-a-javascript-function-name/2008444#2008444 | |
| 81 syn match jsonPadding "\%^[[:blank:]\r\n]*[_$[:alpha:]][_$[:alnum:]]*[[:blank:]\r\n]*(" | |
| 82 syn match jsonPadding ");[[:blank:]\r\n]*\%$" | |
| 83 | |
| 84 " Syntax: Boolean | |
| 85 syn match jsonBoolean /\(true\|false\)\(\_s\+\ze"\)\@!/ | |
| 86 | |
| 87 " Syntax: Null | |
| 88 syn keyword jsonNull null | |
|
6070
32a77cc160d9
Update runtime files. Make matchparen plugin backwards compatible.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
89 |
| 6159 | 90 " Syntax: Braces |
| 91 syn region jsonFold matchgroup=jsonBraces start="{" end=/}\(\_s\+\ze\("\|{\)\)\@!/ transparent fold | |
| 92 syn region jsonFold matchgroup=jsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ transparent fold | |
| 93 | |
| 94 " Define the default highlighting. | |
|
10048
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
6159
diff
changeset
|
95 " Only when an item doesn't have highlighting yet |
|
10051
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
96 hi def link jsonPadding Operator |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
97 hi def link jsonString String |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
98 hi def link jsonTest Label |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
99 hi def link jsonEscape Special |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
100 hi def link jsonNumber Number |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
101 hi def link jsonBraces Delimiter |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
102 hi def link jsonNull Function |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
103 hi def link jsonBoolean Boolean |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
104 hi def link jsonKeyword Label |
| 6159 | 105 |
|
10048
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
6159
diff
changeset
|
106 if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1) |
|
10051
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
107 hi def link jsonNumError Error |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
108 hi def link jsonCommentError Error |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
109 hi def link jsonSemicolonError Error |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
110 hi def link jsonTrailingCommaError Error |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
111 hi def link jsonMissingCommaError Error |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
112 hi def link jsonStringSQError Error |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
113 hi def link jsonNoQuotesError Error |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
114 hi def link jsonTripleQuotesError Error |
| 6159 | 115 endif |
|
10051
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
116 hi def link jsonQuote Quote |
|
46763b01cd9a
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Christian Brabandt <cb@256bit.org>
parents:
10048
diff
changeset
|
117 hi def link jsonNoise Noise |
| 6159 | 118 |
| 119 let b:current_syntax = "json" | |
| 120 if main_syntax == 'json' | |
| 121 unlet main_syntax | |
| 122 endif | |
| 123 | |
| 124 " Vim settings | |
| 125 " vim: ts=8 fdm=marker | |
| 126 | |
| 127 " MIT License | |
| 128 " Copyright (c) 2013, Jeroen Ruigrok van der Werven, Eli Parra | |
| 129 "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | |
| 130 "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | |
| 131 "THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |
| 132 "See https://twitter.com/elzr/status/294964017926119424 |