Skip to content

Commit 5f71a8e

Browse files
jrappenAshwin Shenoyjfcherngjwortmannjskinner
committed
[JSON] Rewrite syntax
- Using inheritance split up `JSON.sublime-syntax` into: - `JSON (Basic).sublime-syntax` with `scope:source.json.basic` - `JSON.sublime-syntax` with `scope:source.json` - `JSONC.sublime-syntax` with `scope:source.json.jsonc` - `JSON5.sublime-syntax` with `scope:source.json.json5` - Add many more file extensions for `JSON` & `JSONC`: - add doc links to extensions where applicable as a reference to be able to more quickly verify that they (still) use said syntax flavor - JSON: - (correctly formatted) JSON code can now be prettified or minified via the context menu or the command palette - highlight leading, trailing & multiple commas as invalid - only allow exactly one structure (object, array) or value (constant, number, string) at top level (thanks to Keith) - JSONC: - highlight some files by default as `JSONC` (as decided by Jon in #285) - highlight leading & multiple commas as invalid, trailing as valid - JSON5: - explicitly pos numbers, hexadecimal ints, Infinity and NaN - single quoted strings - more escape chars for strings - ECMA identifierName as object keys (thanks to Thomas) - scoped as plain unquoted strings - line continuation in strings (with tests thanks to Keith) - Objects: - Add `meta.toc-list` scope to top level object keys to add them to the symbol list (also add tests, see below) - Highlighting speed improvements for empty objects (thanks to FichteFoll) - Make `mapping.*` contexts more modular - Arrays: - Highlighting speed improvements for empty arrays (thanks to FichteFoll) - Numbers: - Correctly scope number signs with `constant.numeric.sign` instead of `keyword.operator.arithmetic` - Significantly improve number highlighting (thanks to deathaxe) - Syntaxes: - Make use of newer syntax features including those only available in `version: 2` syntaxes - Make use of `variables` (with optimizations provided by deathaxe and regex patterns provided by Thomas) - Tests: - Significantly extend tests to cover more parts of the syntaxes defined. - Split original test file into logical parts - Add indentation tests for: - `json`, `jsonc` & `json5` - `mapping` (objects), `sequence` (arrays) - Add symbols tests for: - scope: `meta.toc-list.json | meta.toc-list.json5` - languages: `json`, `jsonc` & `json5` - Fix tests for `meta.mapping meta.mapping.*` - Leave `JSON` headers in `Markdown` as `json` only, but split up fenced code blocks into `json`, `jsonc` & `json5` to behave similarly to `GitHub Flavored Markdown` BREAKING CHANGES: - JSON does not have values that can be set via an inline calculation with the help of operators, but only simple number values. Scopes for number signs have changed from being `keyword.operator.arithmetic` to `constant.numeric.sign`. Color scheme authors should add this, should it be missing. - The `JSON.sublime-syntax` now marks comments as `invalid`, third party plugin authors should target `JSONC.sublime-syntax` instead to have the same user experience as before. - fix #285 - address #481 to remove incompatible regex patterns according to Will - address #757 to fix line comments for `JSONC` (thanks to Keith) - address #2430 using sort-order (as requested by deathaxe) - address #2852 to fix scopes of curly braces & square brackets in `JSON` (thanks to Thomas) - address sublimehq/sublime_text#3154 and add symbol tests Co-authored-by: Ashwin Shenoy <Ultra-Instinct-05@users.noreply.github.com> Co-authored-by: Jack Cherng <jfcherng@users.noreply.github.com> Co-authored-by: Janos Wortmann <jwortmann@users.noreply.github.com> Co-authored-by: Jon Skinner <jps@sublimetext.com> Co-authored-by: FichteFoll <FichteFoll@users.noreply.github.com> Co-authored-by: Keith Hall <keith-hall@users.noreply.github.com> Co-authored-by: Michael B. Lyons <michaelblyons@users.noreply.github.com> Co-authored-by: Rafał Chłodnicki <rchl@users.noreply.github.com> Co-authored-by: Thomas Smith <Thom1729@users.noreply.github.com> Co-authored-by: Will Bond <wbond@users.noreply.github.com> Co-authored-by: deathaxe <deathaxe@users.noreply.github.com>
1 parent 4adc549 commit 5f71a8e

56 files changed

Lines changed: 4140 additions & 359 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎JSON/.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.8

‎JSON/Comments - JSON5.tmPreferences‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>scope</key>
5+
<string>source.json.json5</string>
6+
<key>settings</key>
7+
<dict>
8+
<key>shellVariables</key>
9+
<array>
10+
<dict>
11+
<key>name</key><string>TM_COMMENT_START</string>
12+
<key>value</key><string>// </string>
13+
</dict>
14+
<dict>
15+
<key>name</key><string>TM_COMMENT_START_2</string>
16+
<key>value</key><string>/*</string>
17+
</dict>
18+
<dict>
19+
<key>name</key><string>TM_COMMENT_END_2</string>
20+
<key>value</key><string>*/</string>
21+
</dict>
22+
</array>
23+
</dict>
24+
</dict>
25+
</plist>

‎JSON/Comments - JSONC.tmPreferences‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>scope</key>
5+
<string>source.json.jsonc</string>
6+
<key>settings</key>
7+
<dict>
8+
<key>shellVariables</key>
9+
<array>
10+
<dict>
11+
<key>name</key><string>TM_COMMENT_START</string>
12+
<key>value</key><string>// </string>
13+
</dict>
14+
<dict>
15+
<key>name</key><string>TM_COMMENT_START_2</string>
16+
<key>value</key><string>/*</string>
17+
</dict>
18+
<dict>
19+
<key>name</key><string>TM_COMMENT_END_2</string>
20+
<key>value</key><string>*/</string>
21+
</dict>
22+
</array>
23+
</dict>
24+
</dict>
25+
</plist>

‎JSON/Comments.tmPreferences‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎JSON/Context.sublime-menu‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Packages/JSON/Context.sublime-menu
2+
3+
4+
// This file is being maintained at:
5+
// https://github.com/sublimehq/Packages/blob/master/JSON/Context.sublime-menu
6+
7+
8+
[
9+
{
10+
"caption": "JSON: Minify",
11+
"command": "json_minify"
12+
},
13+
{
14+
"caption": "JSON: Prettify",
15+
"command": "json_prettify"
16+
},
17+
{
18+
"caption": "JSONC: Minify",
19+
"command": "jsonc_minify"
20+
},
21+
{
22+
"caption": "JSONC: Prettify",
23+
"command": "jsonc_prettify"
24+
}
25+
]

‎JSON/Default.sublime-commands‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Packages/JSON/Default.sublime-commands
2+
3+
4+
// This file is being maintained at:
5+
// https://github.com/sublimehq/Packages/blob/master/JSON/Default.sublime-commands
6+
7+
8+
[
9+
{
10+
"caption": "JSON: Minify JSON",
11+
"command": "json_minify"
12+
},
13+
{
14+
"caption": "JSON: Prettify JSON",
15+
"command": "json_prettify"
16+
},
17+
{
18+
"caption": "JSONC: Minify JSONC",
19+
"command": "jsonc_minify"
20+
},
21+
{
22+
"caption": "JSONC: Prettify JSONC",
23+
"command": "jsonc_prettify"
24+
}
25+
]

‎JSON/Default.sublime-keymap‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,70 @@
1+
// Packages/JSON/Default.sublime-keymap
2+
3+
4+
// This file is being maintained at:
5+
// https://github.com/sublimehq/Packages/blob/master/JSON/Default.sublime-keymap
6+
7+
18
[
29
// Auto-pair quotations: "key": '|',
310
{ "keys": ["'"], "command": "insert_snippet", "args": {"contents": "'$0'"}, "context":
411
[
5-
{ "key": "setting.auto_match_enabled" },
6-
{ "key": "selector", "operand": "source.json" },
7-
{ "key": "selection_empty", "match_all": true },
8-
{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "['\\w]$", "match_all": true },
9-
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
12+
{ "key": "setting.auto_match_enabled" },
13+
{ "key": "selector", "operand": "source.json" },
14+
{ "key": "selection_empty", "match_all": true },
15+
{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "['\\w]$", "match_all": true },
16+
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
1017
]
1118
},
1219

1320
// Auto-pair quotations: "key": "|",
1421
{ "keys": ["\""], "command": "insert_snippet", "args": {"contents": "\"$0\""}, "context":
1522
[
16-
{ "key": "setting.auto_match_enabled" },
17-
{ "key": "selector", "operand": "source.json" },
18-
{ "key": "selection_empty", "match_all": true },
19-
{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "[\"\\w]$", "match_all": true },
20-
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
23+
{ "key": "setting.auto_match_enabled" },
24+
{ "key": "selector", "operand": "source.json" },
25+
{ "key": "selection_empty", "match_all": true },
26+
{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "[\"\\w]$", "match_all": true },
27+
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
2128
]
2229
},
2330

2431
// Auto-pair braces: "key": {|},
2532
{ "keys": ["{"], "command": "insert_snippet", "args": {"contents": "{$0}"}, "context":
2633
[
27-
{ "key": "setting.auto_match_enabled" },
28-
{ "key": "selector", "operand": "source.json" },
29-
{ "key": "selection_empty", "match_all": true },
30-
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
34+
{ "key": "setting.auto_match_enabled" },
35+
{ "key": "selector", "operand": "source.json" },
36+
{ "key": "selection_empty", "match_all": true },
37+
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
3138
]
3239
},
3340

3441
// Auto-pair square brackets: "key": [|],
3542
{ "keys": ["["], "command": "insert_snippet", "args": {"contents": "[$0]"}, "context":
3643
[
37-
{ "key": "setting.auto_match_enabled" },
38-
{ "key": "selector", "operand": "source.json" },
39-
{ "key": "selection_empty", "match_all": true },
40-
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
44+
{ "key": "setting.auto_match_enabled" },
45+
{ "key": "selector", "operand": "source.json" },
46+
{ "key": "selection_empty", "match_all": true },
47+
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |]|,|:|\\}|$)", "match_all": true }
4148
]
4249
},
4350

4451
// Add indented line in square brackets
4552
{ "keys": ["enter"], "command": "insert_snippet", "args": {"contents": "\n\t$0\n"}, "context":
4653
[
47-
{ "key": "setting.auto_indent" },
48-
{ "key": "selector", "operand": "source.json" },
49-
{ "key": "selection_empty", "match_all": true },
50-
{ "key": "preceding_text", "operator": "regex_contains", "operand": "\\[$", "match_all": true },
51-
{ "key": "following_text", "operator": "regex_contains", "operand": "^\\]", "match_all": true }
54+
{ "key": "setting.auto_indent" },
55+
{ "key": "selector", "operand": "source.json" },
56+
{ "key": "selection_empty", "match_all": true },
57+
{ "key": "preceding_text", "operator": "regex_contains", "operand": "\\[$", "match_all": true },
58+
{ "key": "following_text", "operator": "regex_contains", "operand": "^\\]", "match_all": true }
5259
]
5360
},
5461
{ "keys": ["shift+enter"], "command": "insert_snippet", "args": {"contents": "\n\t$0\n"}, "context":
5562
[
56-
{ "key": "setting.auto_indent" },
57-
{ "key": "selector", "operand": "source.json" },
58-
{ "key": "selection_empty", "match_all": true },
59-
{ "key": "preceding_text", "operator": "regex_contains", "operand": "\\[$", "match_all": true },
60-
{ "key": "following_text", "operator": "regex_contains", "operand": "^\\]", "match_all": true }
63+
{ "key": "setting.auto_indent" },
64+
{ "key": "selector", "operand": "source.json" },
65+
{ "key": "selection_empty", "match_all": true },
66+
{ "key": "preceding_text", "operator": "regex_contains", "operand": "\\[$", "match_all": true },
67+
{ "key": "following_text", "operator": "regex_contains", "operand": "^\\]", "match_all": true }
6168
]
6269
},
63-
]
70+
]

0 commit comments

Comments
 (0)