From aa0280bddcfcff45feafaeed46958e05bd35cd4d Mon Sep 17 00:00:00 2001
From: AkaraChen <85140972+AkaraChen@users.noreply.github.com>
Date: Mon, 15 May 2023 21:32:09 +0800
Subject: [PATCH 1/3] feat: add hjson

---
 .../shiki/languages/hjson.tmLanguage.json     | 821 ++++++++++++++++++
 packages/shiki/samples/hjson.sample           |  25 +
 scripts/grammarSources.ts                     |   1 +
 3 files changed, 847 insertions(+)
 create mode 100644 packages/shiki/languages/hjson.tmLanguage.json
 create mode 100644 packages/shiki/samples/hjson.sample

diff --git a/packages/shiki/languages/hjson.tmLanguage.json b/packages/shiki/languages/hjson.tmLanguage.json
new file mode 100644
index 000000000..3f0a7f340
--- /dev/null
+++ b/packages/shiki/languages/hjson.tmLanguage.json
@@ -0,0 +1,821 @@
+{
+    "fileTypes": [
+        "hjson"
+    ],
+    "foldingStartMarker": "(?x:     # turn on extended mode\n    ^    # a line beginning with\n    \\s*    # some optional space\n    [{\\[]  # the start of an object or array\n    (?!    # but not followed by\n    .*   # whatever\n    [}\\]]  # and the close of an object or array\n    ,?   # an optional comma\n    \\s*  # some optional space\n    $    # at the end of the line\n    )\n    |    # ...or...\n    [{\\[]  # the start of an object or array\n    \\s*    # some optional space\n    $    # at the end of the line\n  )",
+    "foldingStopMarker": "(?x:   # turn on extended mode\n    ^    # a line beginning with\n    \\s*  # some optional space\n    [}\\]]  # and the close of an object or array\n  )",
+    "keyEquivalent": "^~J",
+    "name": "Hjson",
+    "patterns": [
+        {
+            "include": "#comments"
+        },
+        {
+            "include": "#value"
+        },
+        {
+            "match": "[^\\s]",
+            "name": "invalid.illegal.excess-characters.hjson"
+        }
+    ],
+    "repository": {
+        "array": {
+            "begin": "\\[",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.array.begin.hjson"
+                }
+            },
+            "end": "(\\])(?:\\s*([^,\\s]+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.array.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "meta.structure.array.hjson",
+            "patterns": [
+                {
+                    "include": "#arrayContent"
+                }
+            ]
+        },
+        "arrayArray": {
+            "begin": "\\[",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.array.begin.hjson"
+                }
+            },
+            "end": "(\\])(?:\\s*([^,\\s\\]]+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.array.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "meta.structure.array.hjson",
+            "patterns": [
+                {
+                    "include": "#arrayContent"
+                }
+            ]
+        },
+        "arrayConstant": {
+            "captures": {
+                "1": {
+                    "name": "constant.language.hjson"
+                },
+                "2": {
+                    "name": "punctuation.separator.array.after-const.hjson"
+                }
+            },
+            "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+        },
+        "arrayContent": {
+            "name": "meta.structure.array.hjson",
+            "patterns": [
+                {
+                    "include": "#comments"
+                },
+                {
+                    "include": "#arrayValue"
+                },
+                {
+                    "begin": "(?<=\\[)|,",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "punctuation.separator.dictionary.pair.hjson"
+                        }
+                    },
+                    "end": "(?=[^\\s,/#])|(?=/[^/*])",
+                    "patterns": [
+                        {
+                            "include": "#comments"
+                        },
+                        {
+                            "match": ",",
+                            "name": "invalid.illegal.extra-comma.hjson"
+                        }
+                    ]
+                },
+                {
+                    "match": ",",
+                    "name": "punctuation.separator.array.hjson"
+                },
+                {
+                    "match": "[^\\s\\]]",
+                    "name": "invalid.illegal.expected-array-separator.hjson"
+                }
+            ]
+        },
+        "arrayJstring": {
+            "patterns": [
+                {
+                    "begin": "\"",
+                    "beginCaptures": {
+                        "0": {
+                            "name": "punctuation.definition.string.begin.hjson"
+                        }
+                    },
+                    "end": "(\")(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.string.end.hjson"
+                        },
+                        "2": {
+                            "name": "invalid.illegal.value.hjson"
+                        }
+                    },
+                    "name": "string.quoted.double.hjson",
+                    "patterns": [
+                        {
+                            "include": "#jstringDoubleContent"
+                        }
+                    ]
+                },
+                {
+                    "begin": "'",
+                    "beginCaptures": {
+                        "0": {
+                            "name": "punctuation.definition.string.begin.hjson"
+                        }
+                    },
+                    "end": "(')(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.string.end.hjson"
+                        },
+                        "2": {
+                            "name": "invalid.illegal.value.hjson"
+                        }
+                    },
+                    "name": "string.quoted.single.hjson",
+                    "patterns": [
+                        {
+                            "include": "#jstringSingleContent"
+                        }
+                    ]
+                }
+            ]
+        },
+        "arrayMstring": {
+            "begin": "'''",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.string.begin.hjson"
+                }
+            },
+            "end": "(''')(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.string.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "string.quoted.multiline.hjson"
+        },
+        "arrayNumber": {
+            "captures": {
+                "1": {
+                    "name": "constant.numeric.hjson"
+                },
+                "2": {
+                    "name": "punctuation.separator.array.after-num.hjson"
+                }
+            },
+            "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+        },
+        "arrayObject": {
+            "begin": "\\{",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.dictionary.begin.hjson"
+                }
+            },
+            "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s\\]]+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.dictionary.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "meta.structure.dictionary.hjson",
+            "patterns": [
+                {
+                    "include": "#objectContent"
+                }
+            ]
+        },
+        "arrayString": {
+            "patterns": [
+                {
+                    "include": "#arrayMstring"
+                },
+                {
+                    "include": "#arrayJstring"
+                },
+                {
+                    "include": "#ustring"
+                }
+            ]
+        },
+        "arrayValue": {
+            "patterns": [
+                {
+                    "include": "#arrayNumber"
+                },
+                {
+                    "include": "#arrayConstant"
+                },
+                {
+                    "include": "#arrayString"
+                },
+                {
+                    "include": "#arrayObject"
+                },
+                {
+                    "include": "#arrayArray"
+                }
+            ]
+        },
+        "comments": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "match": "^\\s*(#).*(?:\\n)?",
+                    "name": "comment.line.hash"
+                },
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "match": "^\\s*(//).*(?:\\n)?",
+                    "name": "comment.line.double-slash"
+                },
+                {
+                    "begin": "^\\s*/\\*",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "end": "\\*/(?:\\s*\\n)?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "name": "comment.block.double-slash"
+                },
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "match": "(#)[^\\n]*",
+                    "name": "comment.line.hash"
+                },
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "match": "(//)[^\\n]*",
+                    "name": "comment.line.double-slash"
+                },
+                {
+                    "begin": "/\\*",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "end": "\\*/",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "name": "comment.block.double-slash"
+                }
+            ]
+        },
+        "commentsNewline": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "match": "(#).*\\n",
+                    "name": "comment.line.hash"
+                },
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "match": "(//).*\\n",
+                    "name": "comment.line.double-slash"
+                },
+                {
+                    "begin": "/\\*",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "end": "\\*/(\\s*\\n)?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.comment.hjson"
+                        }
+                    },
+                    "name": "comment.block.double-slash"
+                }
+            ]
+        },
+        "constant": {
+            "captures": {
+                "1": {
+                    "name": "constant.language.hjson"
+                }
+            },
+            "match": "\\b(true|false|null)[\\t ]*(?=$|#|/\\*|//|\\])"
+        },
+        "jstring": {
+            "patterns": [
+                {
+                    "begin": "\"",
+                    "beginCaptures": {
+                        "0": {
+                            "name": "punctuation.definition.string.begin.hjson"
+                        }
+                    },
+                    "end": "(\")(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.string.end.hjson"
+                        },
+                        "2": {
+                            "name": "invalid.illegal.value.hjson"
+                        }
+                    },
+                    "name": "string.quoted.double.hjson",
+                    "patterns": [
+                        {
+                            "include": "#jstringDoubleContent"
+                        }
+                    ]
+                },
+                {
+                    "begin": "'",
+                    "beginCaptures": {
+                        "0": {
+                            "name": "punctuation.definition.string.begin.hjson"
+                        }
+                    },
+                    "end": "(')(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.string.end.hjson"
+                        },
+                        "2": {
+                            "name": "invalid.illegal.value.hjson"
+                        }
+                    },
+                    "name": "string.quoted.single.hjson",
+                    "patterns": [
+                        {
+                            "include": "#jstringSingleContent"
+                        }
+                    ]
+                }
+            ]
+        },
+        "jstringDoubleContent": {
+            "patterns": [
+                {
+                    "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+                    "name": "constant.character.escape.hjson"
+                },
+                {
+                    "match": "\\\\.",
+                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
+                },
+                {
+                    "match": "[^\"]*[^\\n\\r\"\\\\]$",
+                    "name": "invalid.illegal.string.hjson"
+                }
+            ]
+        },
+        "jstringSingleContent": {
+            "patterns": [
+                {
+                    "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+                    "name": "constant.character.escape.hjson"
+                },
+                {
+                    "match": "\\\\.",
+                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
+                },
+                {
+                    "match": "[^']*[^\\n\\r'\\\\]$",
+                    "name": "invalid.illegal.string.hjson"
+                }
+            ]
+        },
+        "key": {
+            "begin": "(?x:\n        (\n          (?:[^:,\\{\\}\\[\\]\\s\"'][^:,\\{\\}\\[\\]\\s]*) |\n          (?: # json string w/ '\n            '\n            (?:\n              [^\\\\'] | # anything but an escape character or quote\n              (\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})) | # escape characters\n              (\\\\.) # bad escape characters\n            )*\n            '\n          ) |\n          (?: # json string w/ \"\n            \"\n            (?:\n              [^\\\\\"] | # anything but an escape character or quote\n              (\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})) | # escape characters\n              (\\\\.) # bad escape characters\n            )*\n            \"\n          )\n        )\n        \\s*\n        (?!\\n)\n        ([,\\{\\}\\[\\]]*)\n      )",
+            "beginCaptures": {
+                "0": {
+                    "name": "meta.structure.key-value.begin.hjson"
+                },
+                "1": {
+                    "name": "support.type.property-name.hjson"
+                },
+                "2": {
+                    "name": "constant.character.escape.hjson"
+                },
+                "3": {
+                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
+                },
+                "4": {
+                    "name": "constant.character.escape.hjson"
+                },
+                "5": {
+                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
+                },
+                "6": {
+                    "name": "invalid.illegal.separator.hjson"
+                },
+                "7": {
+                    "name": "invalid.illegal.property-name.hjson"
+                }
+            },
+            "end": "(?<!^|:)\\s*\\n|(?=})|(,)",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.separator.dictionary.pair.hjson"
+                }
+            },
+            "patterns": [
+                {
+                    "include": "#commentsNewline"
+                },
+                {
+                    "include": "#keyValue"
+                },
+                {
+                    "match": "[^\\s]",
+                    "name": "invalid.illegal.object-property.hjson"
+                }
+            ]
+        },
+        "keyValue": {
+            "begin": "(?x:\n        \\s*\n        (:)\n        \\s* # capture the line ending if there is no value on the same line\n        ([,\\}\\]]*)\n      )",
+            "beginCaptures": {
+                "1": {
+                    "name": "punctuation.separator.dictionary.key-value.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.object-property.hjson"
+                }
+            },
+            "end": "(?<!^)\\s*(?=\\n)|(?=[},])",
+            "name": "meta.structure.key-value.hjson",
+            "patterns": [
+                {
+                    "include": "#comments"
+                },
+                {
+                    "match": "^\\s+"
+                },
+                {
+                    "include": "#objectValue"
+                },
+                {
+                    "captures": {
+                        "1": {
+                            "name": "invalid.illegal.object-property.closing-bracket.hjson"
+                        }
+                    },
+                    "match": "^\\s*(\\})"
+                },
+                {
+                    "match": "[^\\s]",
+                    "name": "invalid.illegal.object-property.hjson"
+                }
+            ]
+        },
+        "mstring": {
+            "begin": "'''",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.string.begin.hjson"
+                }
+            },
+            "end": "(''')(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.string.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "string.quoted.multiline.hjson"
+        },
+        "number": {
+            "captures": {
+                "1": {
+                    "name": "constant.numeric.hjson"
+                }
+            },
+            "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)[\\t ]*(?=$|#|/\\*|//|\\])"
+        },
+        "object": {
+            "begin": "\\{",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.dictionary.begin.hjson"
+                }
+            },
+            "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s]+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.dictionary.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "meta.structure.dictionary.hjson",
+            "patterns": [
+                {
+                    "include": "#objectContent"
+                }
+            ]
+        },
+        "objectArray": {
+            "begin": "\\[",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.array.begin.hjson"
+                }
+            },
+            "end": "(\\])(?:\\s*([^,\\s\\}]+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.array.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "meta.structure.array.hjson",
+            "patterns": [
+                {
+                    "include": "#arrayContent"
+                }
+            ]
+        },
+        "objectConstant": {
+            "captures": {
+                "1": {
+                    "name": "constant.language.hjson"
+                },
+                "2": {
+                    "name": "punctuation.separator.dictionary.pair.after-const.hjson"
+                }
+            },
+            "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+        },
+        "objectContent": {
+            "patterns": [
+                {
+                    "include": "#comments"
+                },
+                {
+                    "include": "#key"
+                },
+                {
+                    "match": ":[.|\\s]",
+                    "name": "invalid.illegal.object-property.hjson"
+                },
+                {
+                    "begin": "(?<=\\{|,)|,",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "punctuation.separator.dictionary.pair.hjson"
+                        }
+                    },
+                    "end": "(?=[^\\s,/#])|(?=/[^/*])",
+                    "patterns": [
+                        {
+                            "include": "#comments"
+                        },
+                        {
+                            "match": ",",
+                            "name": "invalid.illegal.extra-comma.hjson"
+                        }
+                    ]
+                },
+                {
+                    "match": "[^\\s]",
+                    "name": "invalid.illegal.object-property.hjson"
+                }
+            ]
+        },
+        "objectJstring": {
+            "patterns": [
+                {
+                    "begin": "\"",
+                    "beginCaptures": {
+                        "0": {
+                            "name": "punctuation.definition.string.begin.hjson"
+                        }
+                    },
+                    "end": "(\")(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.string.end.hjson"
+                        },
+                        "2": {
+                            "name": "invalid.illegal.value.hjson"
+                        }
+                    },
+                    "name": "string.quoted.double.hjson",
+                    "patterns": [
+                        {
+                            "include": "#jstringDoubleContent"
+                        }
+                    ]
+                },
+                {
+                    "begin": "'",
+                    "beginCaptures": {
+                        "0": {
+                            "name": "punctuation.definition.string.begin.hjson"
+                        }
+                    },
+                    "end": "(')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "punctuation.definition.string.end.hjson"
+                        },
+                        "2": {
+                            "name": "invalid.illegal.value.hjson"
+                        }
+                    },
+                    "name": "string.quoted.single.hjson",
+                    "patterns": [
+                        {
+                            "include": "#jstringSingleContent"
+                        }
+                    ]
+                }
+            ]
+        },
+        "objectMstring": {
+            "begin": "'''",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.string.begin.hjson"
+                }
+            },
+            "end": "(''')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.string.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "string.quoted.multiline.hjson"
+        },
+        "objectNumber": {
+            "captures": {
+                "1": {
+                    "name": "constant.numeric.hjson"
+                },
+                "2": {
+                    "name": "punctuation.separator.dictionary.pair.after-num.hjson"
+                }
+            },
+            "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+        },
+        "objectObject": {
+            "begin": "\\{",
+            "beginCaptures": {
+                "0": {
+                    "name": "punctuation.definition.dictionary.begin.hjson"
+                }
+            },
+            "end": "(\\}|(?<=\\})\\}?)(?:\\s*([^,\\s}]+))?",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.definition.dictionary.end.hjson"
+                },
+                "2": {
+                    "name": "invalid.illegal.value.hjson"
+                }
+            },
+            "name": "meta.structure.dictionary.hjson",
+            "patterns": [
+                {
+                    "include": "#objectContent"
+                }
+            ]
+        },
+        "objectString": {
+            "patterns": [
+                {
+                    "include": "#objectMstring"
+                },
+                {
+                    "include": "#objectJstring"
+                },
+                {
+                    "include": "#ustring"
+                }
+            ]
+        },
+        "objectValue": {
+            "patterns": [
+                {
+                    "include": "#objectNumber"
+                },
+                {
+                    "include": "#objectConstant"
+                },
+                {
+                    "include": "#objectString"
+                },
+                {
+                    "include": "#objectObject"
+                },
+                {
+                    "include": "#objectArray"
+                }
+            ]
+        },
+        "string": {
+            "patterns": [
+                {
+                    "include": "#mstring"
+                },
+                {
+                    "include": "#jstring"
+                },
+                {
+                    "include": "#ustring"
+                }
+            ]
+        },
+        "ustring": {
+            "match": "([^:,\\{\\[\\}\\]\\s].*)$",
+            "name": "string.quoted.none.hjson"
+        },
+        "value": {
+            "patterns": [
+                {
+                    "include": "#number"
+                },
+                {
+                    "include": "#constant"
+                },
+                {
+                    "include": "#string"
+                },
+                {
+                    "include": "#object"
+                },
+                {
+                    "include": "#array"
+                }
+            ]
+        }
+    },
+    "scopeName": "source.hjson"
+}
\ No newline at end of file
diff --git a/packages/shiki/samples/hjson.sample b/packages/shiki/samples/hjson.sample
new file mode 100644
index 000000000..d3ea3a5d4
--- /dev/null
+++ b/packages/shiki/samples/hjson.sample
@@ -0,0 +1,25 @@
+{
+  // use #, // or /**/ comments,
+  // omit quotes for keys
+  key: 1
+  // omit quotes for strings
+  contains: everything on this line
+  // omit commas at the end of a line
+  cool: {
+    foo: 1
+    bar: 2
+  }
+  // allow trailing commas
+  list: [
+    1,
+    2,
+  ]
+  // and use multiline strings
+  realist:
+    '''
+    My half empty glass,
+    I will fill your empty half.
+    Now you are half full.
+    '''
+  // From: https://hjson.github.io/
+}
diff --git a/scripts/grammarSources.ts b/scripts/grammarSources.ts
index 483a8188c..e5efed971 100644
--- a/scripts/grammarSources.ts
+++ b/scripts/grammarSources.ts
@@ -165,6 +165,7 @@ export const githubGrammarSources: [string, string][] = [
   ['haml', 'https://github.com/karuna/haml-vscode/blob/master/syntaxes/haml.json'],
   ['haskell', 'https://github.com/octref/language-haskell/blob/master/syntaxes/haskell.json'],
   ['hcl', 'https://github.com/hashicorp/syntax/blob/main/syntaxes/hcl.tmGrammar.json'],
+  ['hjson', 'https://raw.githubusercontent.com/hjson/textmate-hjson/master/Syntaxes/Hjson.tmLanguage'],
   ['imba', 'https://github.com/imba/vscode-imba/blob/master/syntaxes/imba.tmLanguage'],
   [
     'jinja',

From 21e7a0f72793955031feabf2d25d090aeeee466b Mon Sep 17 00:00:00 2001
From: AkaraChen <85140972+AkaraChen@users.noreply.github.com>
Date: Mon, 15 May 2023 21:37:22 +0800
Subject: [PATCH 2/3] feat: add hjson

---
 docs/languages.md                             |    1 +
 .../shiki/languages/hjson.tmLanguage.json     | 1640 ++++++++---------
 packages/shiki/src/languages.ts               |    8 +
 3 files changed, 828 insertions(+), 821 deletions(-)

diff --git a/docs/languages.md b/docs/languages.md
index 80af8c984..d101d1b84 100644
--- a/docs/languages.md
+++ b/docs/languages.md
@@ -114,6 +114,7 @@ export type Lang =
   | 'handlebars' | 'hbs'
   | 'haskell' | 'hs'
   | 'hcl'
+  | 'hjson'
   | 'hlsl'
   | 'html'
   | 'http'
diff --git a/packages/shiki/languages/hjson.tmLanguage.json b/packages/shiki/languages/hjson.tmLanguage.json
index 3f0a7f340..31e16d829 100644
--- a/packages/shiki/languages/hjson.tmLanguage.json
+++ b/packages/shiki/languages/hjson.tmLanguage.json
@@ -1,821 +1,819 @@
-{
-    "fileTypes": [
-        "hjson"
-    ],
-    "foldingStartMarker": "(?x:     # turn on extended mode\n    ^    # a line beginning with\n    \\s*    # some optional space\n    [{\\[]  # the start of an object or array\n    (?!    # but not followed by\n    .*   # whatever\n    [}\\]]  # and the close of an object or array\n    ,?   # an optional comma\n    \\s*  # some optional space\n    $    # at the end of the line\n    )\n    |    # ...or...\n    [{\\[]  # the start of an object or array\n    \\s*    # some optional space\n    $    # at the end of the line\n  )",
-    "foldingStopMarker": "(?x:   # turn on extended mode\n    ^    # a line beginning with\n    \\s*  # some optional space\n    [}\\]]  # and the close of an object or array\n  )",
-    "keyEquivalent": "^~J",
-    "name": "Hjson",
-    "patterns": [
-        {
-            "include": "#comments"
-        },
-        {
-            "include": "#value"
-        },
-        {
-            "match": "[^\\s]",
-            "name": "invalid.illegal.excess-characters.hjson"
-        }
-    ],
-    "repository": {
-        "array": {
-            "begin": "\\[",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.array.begin.hjson"
-                }
-            },
-            "end": "(\\])(?:\\s*([^,\\s]+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.array.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "meta.structure.array.hjson",
-            "patterns": [
-                {
-                    "include": "#arrayContent"
-                }
-            ]
-        },
-        "arrayArray": {
-            "begin": "\\[",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.array.begin.hjson"
-                }
-            },
-            "end": "(\\])(?:\\s*([^,\\s\\]]+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.array.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "meta.structure.array.hjson",
-            "patterns": [
-                {
-                    "include": "#arrayContent"
-                }
-            ]
-        },
-        "arrayConstant": {
-            "captures": {
-                "1": {
-                    "name": "constant.language.hjson"
-                },
-                "2": {
-                    "name": "punctuation.separator.array.after-const.hjson"
-                }
-            },
-            "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
-        },
-        "arrayContent": {
-            "name": "meta.structure.array.hjson",
-            "patterns": [
-                {
-                    "include": "#comments"
-                },
-                {
-                    "include": "#arrayValue"
-                },
-                {
-                    "begin": "(?<=\\[)|,",
-                    "beginCaptures": {
-                        "1": {
-                            "name": "punctuation.separator.dictionary.pair.hjson"
-                        }
-                    },
-                    "end": "(?=[^\\s,/#])|(?=/[^/*])",
-                    "patterns": [
-                        {
-                            "include": "#comments"
-                        },
-                        {
-                            "match": ",",
-                            "name": "invalid.illegal.extra-comma.hjson"
-                        }
-                    ]
-                },
-                {
-                    "match": ",",
-                    "name": "punctuation.separator.array.hjson"
-                },
-                {
-                    "match": "[^\\s\\]]",
-                    "name": "invalid.illegal.expected-array-separator.hjson"
-                }
-            ]
-        },
-        "arrayJstring": {
-            "patterns": [
-                {
-                    "begin": "\"",
-                    "beginCaptures": {
-                        "0": {
-                            "name": "punctuation.definition.string.begin.hjson"
-                        }
-                    },
-                    "end": "(\")(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.string.end.hjson"
-                        },
-                        "2": {
-                            "name": "invalid.illegal.value.hjson"
-                        }
-                    },
-                    "name": "string.quoted.double.hjson",
-                    "patterns": [
-                        {
-                            "include": "#jstringDoubleContent"
-                        }
-                    ]
-                },
-                {
-                    "begin": "'",
-                    "beginCaptures": {
-                        "0": {
-                            "name": "punctuation.definition.string.begin.hjson"
-                        }
-                    },
-                    "end": "(')(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.string.end.hjson"
-                        },
-                        "2": {
-                            "name": "invalid.illegal.value.hjson"
-                        }
-                    },
-                    "name": "string.quoted.single.hjson",
-                    "patterns": [
-                        {
-                            "include": "#jstringSingleContent"
-                        }
-                    ]
-                }
-            ]
-        },
-        "arrayMstring": {
-            "begin": "'''",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.string.begin.hjson"
-                }
-            },
-            "end": "(''')(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.string.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "string.quoted.multiline.hjson"
-        },
-        "arrayNumber": {
-            "captures": {
-                "1": {
-                    "name": "constant.numeric.hjson"
-                },
-                "2": {
-                    "name": "punctuation.separator.array.after-num.hjson"
-                }
-            },
-            "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
-        },
-        "arrayObject": {
-            "begin": "\\{",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.dictionary.begin.hjson"
-                }
-            },
-            "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s\\]]+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.dictionary.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "meta.structure.dictionary.hjson",
-            "patterns": [
-                {
-                    "include": "#objectContent"
-                }
-            ]
-        },
-        "arrayString": {
-            "patterns": [
-                {
-                    "include": "#arrayMstring"
-                },
-                {
-                    "include": "#arrayJstring"
-                },
-                {
-                    "include": "#ustring"
-                }
-            ]
-        },
-        "arrayValue": {
-            "patterns": [
-                {
-                    "include": "#arrayNumber"
-                },
-                {
-                    "include": "#arrayConstant"
-                },
-                {
-                    "include": "#arrayString"
-                },
-                {
-                    "include": "#arrayObject"
-                },
-                {
-                    "include": "#arrayArray"
-                }
-            ]
-        },
-        "comments": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "match": "^\\s*(#).*(?:\\n)?",
-                    "name": "comment.line.hash"
-                },
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "match": "^\\s*(//).*(?:\\n)?",
-                    "name": "comment.line.double-slash"
-                },
-                {
-                    "begin": "^\\s*/\\*",
-                    "beginCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "end": "\\*/(?:\\s*\\n)?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "name": "comment.block.double-slash"
-                },
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "match": "(#)[^\\n]*",
-                    "name": "comment.line.hash"
-                },
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "match": "(//)[^\\n]*",
-                    "name": "comment.line.double-slash"
-                },
-                {
-                    "begin": "/\\*",
-                    "beginCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "end": "\\*/",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "name": "comment.block.double-slash"
-                }
-            ]
-        },
-        "commentsNewline": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "match": "(#).*\\n",
-                    "name": "comment.line.hash"
-                },
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "match": "(//).*\\n",
-                    "name": "comment.line.double-slash"
-                },
-                {
-                    "begin": "/\\*",
-                    "beginCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "end": "\\*/(\\s*\\n)?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.comment.hjson"
-                        }
-                    },
-                    "name": "comment.block.double-slash"
-                }
-            ]
-        },
-        "constant": {
-            "captures": {
-                "1": {
-                    "name": "constant.language.hjson"
-                }
-            },
-            "match": "\\b(true|false|null)[\\t ]*(?=$|#|/\\*|//|\\])"
-        },
-        "jstring": {
-            "patterns": [
-                {
-                    "begin": "\"",
-                    "beginCaptures": {
-                        "0": {
-                            "name": "punctuation.definition.string.begin.hjson"
-                        }
-                    },
-                    "end": "(\")(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.string.end.hjson"
-                        },
-                        "2": {
-                            "name": "invalid.illegal.value.hjson"
-                        }
-                    },
-                    "name": "string.quoted.double.hjson",
-                    "patterns": [
-                        {
-                            "include": "#jstringDoubleContent"
-                        }
-                    ]
-                },
-                {
-                    "begin": "'",
-                    "beginCaptures": {
-                        "0": {
-                            "name": "punctuation.definition.string.begin.hjson"
-                        }
-                    },
-                    "end": "(')(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.string.end.hjson"
-                        },
-                        "2": {
-                            "name": "invalid.illegal.value.hjson"
-                        }
-                    },
-                    "name": "string.quoted.single.hjson",
-                    "patterns": [
-                        {
-                            "include": "#jstringSingleContent"
-                        }
-                    ]
-                }
-            ]
-        },
-        "jstringDoubleContent": {
-            "patterns": [
-                {
-                    "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
-                    "name": "constant.character.escape.hjson"
-                },
-                {
-                    "match": "\\\\.",
-                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
-                },
-                {
-                    "match": "[^\"]*[^\\n\\r\"\\\\]$",
-                    "name": "invalid.illegal.string.hjson"
-                }
-            ]
-        },
-        "jstringSingleContent": {
-            "patterns": [
-                {
-                    "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
-                    "name": "constant.character.escape.hjson"
-                },
-                {
-                    "match": "\\\\.",
-                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
-                },
-                {
-                    "match": "[^']*[^\\n\\r'\\\\]$",
-                    "name": "invalid.illegal.string.hjson"
-                }
-            ]
-        },
-        "key": {
-            "begin": "(?x:\n        (\n          (?:[^:,\\{\\}\\[\\]\\s\"'][^:,\\{\\}\\[\\]\\s]*) |\n          (?: # json string w/ '\n            '\n            (?:\n              [^\\\\'] | # anything but an escape character or quote\n              (\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})) | # escape characters\n              (\\\\.) # bad escape characters\n            )*\n            '\n          ) |\n          (?: # json string w/ \"\n            \"\n            (?:\n              [^\\\\\"] | # anything but an escape character or quote\n              (\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})) | # escape characters\n              (\\\\.) # bad escape characters\n            )*\n            \"\n          )\n        )\n        \\s*\n        (?!\\n)\n        ([,\\{\\}\\[\\]]*)\n      )",
-            "beginCaptures": {
-                "0": {
-                    "name": "meta.structure.key-value.begin.hjson"
-                },
-                "1": {
-                    "name": "support.type.property-name.hjson"
-                },
-                "2": {
-                    "name": "constant.character.escape.hjson"
-                },
-                "3": {
-                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
-                },
-                "4": {
-                    "name": "constant.character.escape.hjson"
-                },
-                "5": {
-                    "name": "invalid.illegal.unrecognized-string-escape.hjson"
-                },
-                "6": {
-                    "name": "invalid.illegal.separator.hjson"
-                },
-                "7": {
-                    "name": "invalid.illegal.property-name.hjson"
-                }
-            },
-            "end": "(?<!^|:)\\s*\\n|(?=})|(,)",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.separator.dictionary.pair.hjson"
-                }
-            },
-            "patterns": [
-                {
-                    "include": "#commentsNewline"
-                },
-                {
-                    "include": "#keyValue"
-                },
-                {
-                    "match": "[^\\s]",
-                    "name": "invalid.illegal.object-property.hjson"
-                }
-            ]
-        },
-        "keyValue": {
-            "begin": "(?x:\n        \\s*\n        (:)\n        \\s* # capture the line ending if there is no value on the same line\n        ([,\\}\\]]*)\n      )",
-            "beginCaptures": {
-                "1": {
-                    "name": "punctuation.separator.dictionary.key-value.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.object-property.hjson"
-                }
-            },
-            "end": "(?<!^)\\s*(?=\\n)|(?=[},])",
-            "name": "meta.structure.key-value.hjson",
-            "patterns": [
-                {
-                    "include": "#comments"
-                },
-                {
-                    "match": "^\\s+"
-                },
-                {
-                    "include": "#objectValue"
-                },
-                {
-                    "captures": {
-                        "1": {
-                            "name": "invalid.illegal.object-property.closing-bracket.hjson"
-                        }
-                    },
-                    "match": "^\\s*(\\})"
-                },
-                {
-                    "match": "[^\\s]",
-                    "name": "invalid.illegal.object-property.hjson"
-                }
-            ]
-        },
-        "mstring": {
-            "begin": "'''",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.string.begin.hjson"
-                }
-            },
-            "end": "(''')(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.string.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "string.quoted.multiline.hjson"
-        },
-        "number": {
-            "captures": {
-                "1": {
-                    "name": "constant.numeric.hjson"
-                }
-            },
-            "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)[\\t ]*(?=$|#|/\\*|//|\\])"
-        },
-        "object": {
-            "begin": "\\{",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.dictionary.begin.hjson"
-                }
-            },
-            "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s]+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.dictionary.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "meta.structure.dictionary.hjson",
-            "patterns": [
-                {
-                    "include": "#objectContent"
-                }
-            ]
-        },
-        "objectArray": {
-            "begin": "\\[",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.array.begin.hjson"
-                }
-            },
-            "end": "(\\])(?:\\s*([^,\\s\\}]+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.array.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "meta.structure.array.hjson",
-            "patterns": [
-                {
-                    "include": "#arrayContent"
-                }
-            ]
-        },
-        "objectConstant": {
-            "captures": {
-                "1": {
-                    "name": "constant.language.hjson"
-                },
-                "2": {
-                    "name": "punctuation.separator.dictionary.pair.after-const.hjson"
-                }
-            },
-            "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
-        },
-        "objectContent": {
-            "patterns": [
-                {
-                    "include": "#comments"
-                },
-                {
-                    "include": "#key"
-                },
-                {
-                    "match": ":[.|\\s]",
-                    "name": "invalid.illegal.object-property.hjson"
-                },
-                {
-                    "begin": "(?<=\\{|,)|,",
-                    "beginCaptures": {
-                        "1": {
-                            "name": "punctuation.separator.dictionary.pair.hjson"
-                        }
-                    },
-                    "end": "(?=[^\\s,/#])|(?=/[^/*])",
-                    "patterns": [
-                        {
-                            "include": "#comments"
-                        },
-                        {
-                            "match": ",",
-                            "name": "invalid.illegal.extra-comma.hjson"
-                        }
-                    ]
-                },
-                {
-                    "match": "[^\\s]",
-                    "name": "invalid.illegal.object-property.hjson"
-                }
-            ]
-        },
-        "objectJstring": {
-            "patterns": [
-                {
-                    "begin": "\"",
-                    "beginCaptures": {
-                        "0": {
-                            "name": "punctuation.definition.string.begin.hjson"
-                        }
-                    },
-                    "end": "(\")(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.string.end.hjson"
-                        },
-                        "2": {
-                            "name": "invalid.illegal.value.hjson"
-                        }
-                    },
-                    "name": "string.quoted.double.hjson",
-                    "patterns": [
-                        {
-                            "include": "#jstringDoubleContent"
-                        }
-                    ]
-                },
-                {
-                    "begin": "'",
-                    "beginCaptures": {
-                        "0": {
-                            "name": "punctuation.definition.string.begin.hjson"
-                        }
-                    },
-                    "end": "(')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "punctuation.definition.string.end.hjson"
-                        },
-                        "2": {
-                            "name": "invalid.illegal.value.hjson"
-                        }
-                    },
-                    "name": "string.quoted.single.hjson",
-                    "patterns": [
-                        {
-                            "include": "#jstringSingleContent"
-                        }
-                    ]
-                }
-            ]
-        },
-        "objectMstring": {
-            "begin": "'''",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.string.begin.hjson"
-                }
-            },
-            "end": "(''')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.string.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "string.quoted.multiline.hjson"
-        },
-        "objectNumber": {
-            "captures": {
-                "1": {
-                    "name": "constant.numeric.hjson"
-                },
-                "2": {
-                    "name": "punctuation.separator.dictionary.pair.after-num.hjson"
-                }
-            },
-            "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
-        },
-        "objectObject": {
-            "begin": "\\{",
-            "beginCaptures": {
-                "0": {
-                    "name": "punctuation.definition.dictionary.begin.hjson"
-                }
-            },
-            "end": "(\\}|(?<=\\})\\}?)(?:\\s*([^,\\s}]+))?",
-            "endCaptures": {
-                "1": {
-                    "name": "punctuation.definition.dictionary.end.hjson"
-                },
-                "2": {
-                    "name": "invalid.illegal.value.hjson"
-                }
-            },
-            "name": "meta.structure.dictionary.hjson",
-            "patterns": [
-                {
-                    "include": "#objectContent"
-                }
-            ]
-        },
-        "objectString": {
-            "patterns": [
-                {
-                    "include": "#objectMstring"
-                },
-                {
-                    "include": "#objectJstring"
-                },
-                {
-                    "include": "#ustring"
-                }
-            ]
-        },
-        "objectValue": {
-            "patterns": [
-                {
-                    "include": "#objectNumber"
-                },
-                {
-                    "include": "#objectConstant"
-                },
-                {
-                    "include": "#objectString"
-                },
-                {
-                    "include": "#objectObject"
-                },
-                {
-                    "include": "#objectArray"
-                }
-            ]
-        },
-        "string": {
-            "patterns": [
-                {
-                    "include": "#mstring"
-                },
-                {
-                    "include": "#jstring"
-                },
-                {
-                    "include": "#ustring"
-                }
-            ]
-        },
-        "ustring": {
-            "match": "([^:,\\{\\[\\}\\]\\s].*)$",
-            "name": "string.quoted.none.hjson"
-        },
-        "value": {
-            "patterns": [
-                {
-                    "include": "#number"
-                },
-                {
-                    "include": "#constant"
-                },
-                {
-                    "include": "#string"
-                },
-                {
-                    "include": "#object"
-                },
-                {
-                    "include": "#array"
-                }
-            ]
-        }
-    },
-    "scopeName": "source.hjson"
-}
\ No newline at end of file
+{
+  "fileTypes": ["hjson"],
+  "foldingStartMarker": "(?x:     # turn on extended mode\n    ^    # a line beginning with\n    \\s*    # some optional space\n    [{\\[]  # the start of an object or array\n    (?!    # but not followed by\n    .*   # whatever\n    [}\\]]  # and the close of an object or array\n    ,?   # an optional comma\n    \\s*  # some optional space\n    $    # at the end of the line\n    )\n    |    # ...or...\n    [{\\[]  # the start of an object or array\n    \\s*    # some optional space\n    $    # at the end of the line\n  )",
+  "foldingStopMarker": "(?x:   # turn on extended mode\n    ^    # a line beginning with\n    \\s*  # some optional space\n    [}\\]]  # and the close of an object or array\n  )",
+  "keyEquivalent": "^~J",
+  "name": "Hjson",
+  "patterns": [
+    {
+      "include": "#comments"
+    },
+    {
+      "include": "#value"
+    },
+    {
+      "match": "[^\\s]",
+      "name": "invalid.illegal.excess-characters.hjson"
+    }
+  ],
+  "repository": {
+    "array": {
+      "begin": "\\[",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.array.begin.hjson"
+        }
+      },
+      "end": "(\\])(?:\\s*([^,\\s]+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.array.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "meta.structure.array.hjson",
+      "patterns": [
+        {
+          "include": "#arrayContent"
+        }
+      ]
+    },
+    "arrayArray": {
+      "begin": "\\[",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.array.begin.hjson"
+        }
+      },
+      "end": "(\\])(?:\\s*([^,\\s\\]]+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.array.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "meta.structure.array.hjson",
+      "patterns": [
+        {
+          "include": "#arrayContent"
+        }
+      ]
+    },
+    "arrayConstant": {
+      "captures": {
+        "1": {
+          "name": "constant.language.hjson"
+        },
+        "2": {
+          "name": "punctuation.separator.array.after-const.hjson"
+        }
+      },
+      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+    },
+    "arrayContent": {
+      "name": "meta.structure.array.hjson",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#arrayValue"
+        },
+        {
+          "begin": "(?<=\\[)|,",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.dictionary.pair.hjson"
+            }
+          },
+          "end": "(?=[^\\s,/#])|(?=/[^/*])",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "match": ",",
+              "name": "invalid.illegal.extra-comma.hjson"
+            }
+          ]
+        },
+        {
+          "match": ",",
+          "name": "punctuation.separator.array.hjson"
+        },
+        {
+          "match": "[^\\s\\]]",
+          "name": "invalid.illegal.expected-array-separator.hjson"
+        }
+      ]
+    },
+    "arrayJstring": {
+      "patterns": [
+        {
+          "begin": "\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.hjson"
+            }
+          },
+          "end": "(\")(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.hjson"
+            },
+            "2": {
+              "name": "invalid.illegal.value.hjson"
+            }
+          },
+          "name": "string.quoted.double.hjson",
+          "patterns": [
+            {
+              "include": "#jstringDoubleContent"
+            }
+          ]
+        },
+        {
+          "begin": "'",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.hjson"
+            }
+          },
+          "end": "(')(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.hjson"
+            },
+            "2": {
+              "name": "invalid.illegal.value.hjson"
+            }
+          },
+          "name": "string.quoted.single.hjson",
+          "patterns": [
+            {
+              "include": "#jstringSingleContent"
+            }
+          ]
+        }
+      ]
+    },
+    "arrayMstring": {
+      "begin": "'''",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.hjson"
+        }
+      },
+      "end": "(''')(?:\\s*((?:[^,\\s\\]#/]|/[^/*])+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "string.quoted.multiline.hjson"
+    },
+    "arrayNumber": {
+      "captures": {
+        "1": {
+          "name": "constant.numeric.hjson"
+        },
+        "2": {
+          "name": "punctuation.separator.array.after-num.hjson"
+        }
+      },
+      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+    },
+    "arrayObject": {
+      "begin": "\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.dictionary.begin.hjson"
+        }
+      },
+      "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s\\]]+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.dictionary.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "meta.structure.dictionary.hjson",
+      "patterns": [
+        {
+          "include": "#objectContent"
+        }
+      ]
+    },
+    "arrayString": {
+      "patterns": [
+        {
+          "include": "#arrayMstring"
+        },
+        {
+          "include": "#arrayJstring"
+        },
+        {
+          "include": "#ustring"
+        }
+      ]
+    },
+    "arrayValue": {
+      "patterns": [
+        {
+          "include": "#arrayNumber"
+        },
+        {
+          "include": "#arrayConstant"
+        },
+        {
+          "include": "#arrayString"
+        },
+        {
+          "include": "#arrayObject"
+        },
+        {
+          "include": "#arrayArray"
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "match": "^\\s*(#).*(?:\\n)?",
+          "name": "comment.line.hash"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "match": "^\\s*(//).*(?:\\n)?",
+          "name": "comment.line.double-slash"
+        },
+        {
+          "begin": "^\\s*/\\*",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "end": "\\*/(?:\\s*\\n)?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "name": "comment.block.double-slash"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "match": "(#)[^\\n]*",
+          "name": "comment.line.hash"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "match": "(//)[^\\n]*",
+          "name": "comment.line.double-slash"
+        },
+        {
+          "begin": "/\\*",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "end": "\\*/",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "name": "comment.block.double-slash"
+        }
+      ]
+    },
+    "commentsNewline": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "match": "(#).*\\n",
+          "name": "comment.line.hash"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "match": "(//).*\\n",
+          "name": "comment.line.double-slash"
+        },
+        {
+          "begin": "/\\*",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "end": "\\*/(\\s*\\n)?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.hjson"
+            }
+          },
+          "name": "comment.block.double-slash"
+        }
+      ]
+    },
+    "constant": {
+      "captures": {
+        "1": {
+          "name": "constant.language.hjson"
+        }
+      },
+      "match": "\\b(true|false|null)[\\t ]*(?=$|#|/\\*|//|\\])"
+    },
+    "jstring": {
+      "patterns": [
+        {
+          "begin": "\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.hjson"
+            }
+          },
+          "end": "(\")(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.hjson"
+            },
+            "2": {
+              "name": "invalid.illegal.value.hjson"
+            }
+          },
+          "name": "string.quoted.double.hjson",
+          "patterns": [
+            {
+              "include": "#jstringDoubleContent"
+            }
+          ]
+        },
+        {
+          "begin": "'",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.hjson"
+            }
+          },
+          "end": "(')(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.hjson"
+            },
+            "2": {
+              "name": "invalid.illegal.value.hjson"
+            }
+          },
+          "name": "string.quoted.single.hjson",
+          "patterns": [
+            {
+              "include": "#jstringSingleContent"
+            }
+          ]
+        }
+      ]
+    },
+    "jstringDoubleContent": {
+      "patterns": [
+        {
+          "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "name": "constant.character.escape.hjson"
+        },
+        {
+          "match": "\\\\.",
+          "name": "invalid.illegal.unrecognized-string-escape.hjson"
+        },
+        {
+          "match": "[^\"]*[^\\n\\r\"\\\\]$",
+          "name": "invalid.illegal.string.hjson"
+        }
+      ]
+    },
+    "jstringSingleContent": {
+      "patterns": [
+        {
+          "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "name": "constant.character.escape.hjson"
+        },
+        {
+          "match": "\\\\.",
+          "name": "invalid.illegal.unrecognized-string-escape.hjson"
+        },
+        {
+          "match": "[^']*[^\\n\\r'\\\\]$",
+          "name": "invalid.illegal.string.hjson"
+        }
+      ]
+    },
+    "key": {
+      "begin": "(?x:\n        (\n          (?:[^:,\\{\\}\\[\\]\\s\"'][^:,\\{\\}\\[\\]\\s]*) |\n          (?: # json string w/ '\n            '\n            (?:\n              [^\\\\'] | # anything but an escape character or quote\n              (\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})) | # escape characters\n              (\\\\.) # bad escape characters\n            )*\n            '\n          ) |\n          (?: # json string w/ \"\n            \"\n            (?:\n              [^\\\\\"] | # anything but an escape character or quote\n              (\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})) | # escape characters\n              (\\\\.) # bad escape characters\n            )*\n            \"\n          )\n        )\n        \\s*\n        (?!\\n)\n        ([,\\{\\}\\[\\]]*)\n      )",
+      "beginCaptures": {
+        "0": {
+          "name": "meta.structure.key-value.begin.hjson"
+        },
+        "1": {
+          "name": "support.type.property-name.hjson"
+        },
+        "2": {
+          "name": "constant.character.escape.hjson"
+        },
+        "3": {
+          "name": "invalid.illegal.unrecognized-string-escape.hjson"
+        },
+        "4": {
+          "name": "constant.character.escape.hjson"
+        },
+        "5": {
+          "name": "invalid.illegal.unrecognized-string-escape.hjson"
+        },
+        "6": {
+          "name": "invalid.illegal.separator.hjson"
+        },
+        "7": {
+          "name": "invalid.illegal.property-name.hjson"
+        }
+      },
+      "end": "(?<!^|:)\\s*\\n|(?=})|(,)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.separator.dictionary.pair.hjson"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#commentsNewline"
+        },
+        {
+          "include": "#keyValue"
+        },
+        {
+          "match": "[^\\s]",
+          "name": "invalid.illegal.object-property.hjson"
+        }
+      ]
+    },
+    "keyValue": {
+      "begin": "(?x:\n        \\s*\n        (:)\n        \\s* # capture the line ending if there is no value on the same line\n        ([,\\}\\]]*)\n      )",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.separator.dictionary.key-value.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.object-property.hjson"
+        }
+      },
+      "end": "(?<!^)\\s*(?=\\n)|(?=[},])",
+      "name": "meta.structure.key-value.hjson",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "match": "^\\s+"
+        },
+        {
+          "include": "#objectValue"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "invalid.illegal.object-property.closing-bracket.hjson"
+            }
+          },
+          "match": "^\\s*(\\})"
+        },
+        {
+          "match": "[^\\s]",
+          "name": "invalid.illegal.object-property.hjson"
+        }
+      ]
+    },
+    "mstring": {
+      "begin": "'''",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.hjson"
+        }
+      },
+      "end": "(''')(?:\\s*((?:[^\\s#/]|/[^/*]).*)$)?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "string.quoted.multiline.hjson"
+    },
+    "number": {
+      "captures": {
+        "1": {
+          "name": "constant.numeric.hjson"
+        }
+      },
+      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)[\\t ]*(?=$|#|/\\*|//|\\])"
+    },
+    "object": {
+      "begin": "\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.dictionary.begin.hjson"
+        }
+      },
+      "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s]+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.dictionary.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "meta.structure.dictionary.hjson",
+      "patterns": [
+        {
+          "include": "#objectContent"
+        }
+      ]
+    },
+    "objectArray": {
+      "begin": "\\[",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.array.begin.hjson"
+        }
+      },
+      "end": "(\\])(?:\\s*([^,\\s\\}]+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.array.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "meta.structure.array.hjson",
+      "patterns": [
+        {
+          "include": "#arrayContent"
+        }
+      ]
+    },
+    "objectConstant": {
+      "captures": {
+        "1": {
+          "name": "constant.language.hjson"
+        },
+        "2": {
+          "name": "punctuation.separator.dictionary.pair.after-const.hjson"
+        }
+      },
+      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+    },
+    "objectContent": {
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#key"
+        },
+        {
+          "match": ":[.|\\s]",
+          "name": "invalid.illegal.object-property.hjson"
+        },
+        {
+          "begin": "(?<=\\{|,)|,",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.dictionary.pair.hjson"
+            }
+          },
+          "end": "(?=[^\\s,/#])|(?=/[^/*])",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "match": ",",
+              "name": "invalid.illegal.extra-comma.hjson"
+            }
+          ]
+        },
+        {
+          "match": "[^\\s]",
+          "name": "invalid.illegal.object-property.hjson"
+        }
+      ]
+    },
+    "objectJstring": {
+      "patterns": [
+        {
+          "begin": "\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.hjson"
+            }
+          },
+          "end": "(\")(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.hjson"
+            },
+            "2": {
+              "name": "invalid.illegal.value.hjson"
+            }
+          },
+          "name": "string.quoted.double.hjson",
+          "patterns": [
+            {
+              "include": "#jstringDoubleContent"
+            }
+          ]
+        },
+        {
+          "begin": "'",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.hjson"
+            }
+          },
+          "end": "(')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.hjson"
+            },
+            "2": {
+              "name": "invalid.illegal.value.hjson"
+            }
+          },
+          "name": "string.quoted.single.hjson",
+          "patterns": [
+            {
+              "include": "#jstringSingleContent"
+            }
+          ]
+        }
+      ]
+    },
+    "objectMstring": {
+      "begin": "'''",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.hjson"
+        }
+      },
+      "end": "(''')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "string.quoted.multiline.hjson"
+    },
+    "objectNumber": {
+      "captures": {
+        "1": {
+          "name": "constant.numeric.hjson"
+        },
+        "2": {
+          "name": "punctuation.separator.dictionary.pair.after-num.hjson"
+        }
+      },
+      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+    },
+    "objectObject": {
+      "begin": "\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.dictionary.begin.hjson"
+        }
+      },
+      "end": "(\\}|(?<=\\})\\}?)(?:\\s*([^,\\s}]+))?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.dictionary.end.hjson"
+        },
+        "2": {
+          "name": "invalid.illegal.value.hjson"
+        }
+      },
+      "name": "meta.structure.dictionary.hjson",
+      "patterns": [
+        {
+          "include": "#objectContent"
+        }
+      ]
+    },
+    "objectString": {
+      "patterns": [
+        {
+          "include": "#objectMstring"
+        },
+        {
+          "include": "#objectJstring"
+        },
+        {
+          "include": "#ustring"
+        }
+      ]
+    },
+    "objectValue": {
+      "patterns": [
+        {
+          "include": "#objectNumber"
+        },
+        {
+          "include": "#objectConstant"
+        },
+        {
+          "include": "#objectString"
+        },
+        {
+          "include": "#objectObject"
+        },
+        {
+          "include": "#objectArray"
+        }
+      ]
+    },
+    "string": {
+      "patterns": [
+        {
+          "include": "#mstring"
+        },
+        {
+          "include": "#jstring"
+        },
+        {
+          "include": "#ustring"
+        }
+      ]
+    },
+    "ustring": {
+      "match": "([^:,\\{\\[\\}\\]\\s].*)$",
+      "name": "string.quoted.none.hjson"
+    },
+    "value": {
+      "patterns": [
+        {
+          "include": "#number"
+        },
+        {
+          "include": "#constant"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#object"
+        },
+        {
+          "include": "#array"
+        }
+      ]
+    }
+  },
+  "scopeName": "source.hjson"
+}
diff --git a/packages/shiki/src/languages.ts b/packages/shiki/src/languages.ts
index 0e715883d..a5e1b138c 100644
--- a/packages/shiki/src/languages.ts
+++ b/packages/shiki/src/languages.ts
@@ -61,6 +61,7 @@ export type Lang =
   | 'handlebars' | 'hbs'
   | 'haskell' | 'hs'
   | 'hcl'
+  | 'hjson'
   | 'hlsl'
   | 'html'
   | 'http'
@@ -541,6 +542,12 @@ export const languages: ILanguageRegistration[] = [
     path: 'hcl.tmLanguage.json',
     samplePath: 'hcl.sample'
   },
+  {
+    id: 'hjson',
+    scopeName: 'source.hjson',
+    path: 'hjson.tmLanguage.json',
+    samplePath: 'hjson.sample'
+  },
   {
     id: 'hlsl',
     scopeName: 'source.hlsl',
@@ -702,6 +709,7 @@ export const languages: ILanguageRegistration[] = [
     id: 'marko',
     scopeName: 'text.marko',
     path: 'marko.tmLanguage.json',
+    samplePath: 'marko.sample',
     embeddedLangs: ['css', 'less', 'scss', 'javascript']
   },
   {

From bd5fd4871c667ad72c08e60e14dedf339988a20b Mon Sep 17 00:00:00 2001
From: AkaraChen <85140972+AkaraChen@users.noreply.github.com>
Date: Mon, 22 May 2023 14:24:40 +0800
Subject: [PATCH 3/3] fix: incorrect grammar source

---
 scripts/grammarSources.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/grammarSources.ts b/scripts/grammarSources.ts
index e5efed971..76dc1484a 100644
--- a/scripts/grammarSources.ts
+++ b/scripts/grammarSources.ts
@@ -165,7 +165,7 @@ export const githubGrammarSources: [string, string][] = [
   ['haml', 'https://github.com/karuna/haml-vscode/blob/master/syntaxes/haml.json'],
   ['haskell', 'https://github.com/octref/language-haskell/blob/master/syntaxes/haskell.json'],
   ['hcl', 'https://github.com/hashicorp/syntax/blob/main/syntaxes/hcl.tmGrammar.json'],
-  ['hjson', 'https://raw.githubusercontent.com/hjson/textmate-hjson/master/Syntaxes/Hjson.tmLanguage'],
+  ['hjson', 'https://github.com/hjson/textmate-hjson/blob/master/Syntaxes/Hjson.tmLanguage'],
   ['imba', 'https://github.com/imba/vscode-imba/blob/master/syntaxes/imba.tmLanguage'],
   [
     'jinja',