Merge branch 'main' into patch-2

Author: sebastiaanspeck

CHANGES.md

@@ -1,12 +1,19 @@
 ## Version 11.11.2
 
+Themes:
+
+- added "vs Dark " theme [Twineee1][]
+
 New Grammars:
 
 - added 3rd party Aiken grammar to SUPPORTED_LANGUAGES [Josh Marchand][]
 - added 3rd party VoltScript grammar to SUPPORTED_LANGUAGES [Chester Moses][]
 - added 3rd party Prisma grammar to SUPPORTED_LANGUAGES [SungHyun Kim][]
 - added 3rd party Magik grammar to SUPPORTED_LANGUAGES [Sebastiaan Speck][]
 - added 3rd party Gleam grammar to SUPPORTED_LANGUAGES [Filip Hoffmann][]
+- added 3rd party L4 grammar to SUPPORTED_LANGUAGES [Thomas Gorissen][]
+- added 3rd party Bicep grammar to SUPPORTED_LANGUAGES [Anthony Martin][]
+- added 3rd party Abc Notation grammar to SUPPORTED_LANGUAGES [NriotHrreion][]
 
 Core Grammars:
 
@@ -16,11 +23,18 @@ Core Grammars:
 - fix(ex) adds support for `?'` char literal and missing `defguardp` keyword [Kevin Bloch][]
 - fix(diff) fix unified diff hunk header regex to allow unpaired numbers [Chris Wilson][]
 - enh(php) support single line and hash comments in attributes, constructor and functions [Antoine Musso][]
+- enh(json) add json5 support [Kerry Shetline][]
+- fix(css) `unicode-range` parsing, issue #4253 [Kerry Shetline][]
+- fix(csharp) Support digit separators [te-ing][]
 
 Documentation:
 
 - alphabetized languages + upper-cased BASIC in SUPPORTED_LANGUAGES.md [Adam Lui][]
 
+Themes:
+
+- Fix: cybertopia themes render correctly in shadow DOM [hbgl][]
+
 CONTRIBUTORS
 
 [Josh Marchand]: https://github.com/yHSJ
@@ -30,10 +44,17 @@ CONTRIBUTORS
 [Chris Wilson]: https://github.com/sushicw
 [Antoine Musso]: https://github.com/hashar
 [Chester Moses]: https://github.com/Chester-Moses-HCL
+[Kerry Shetline]: https://github.com/kshetline
 [SungHyun Kim]: https://github.com/witch-factory
 [Adam Lui]: https://github.com/adamlui
 [Sebastiaan Speck]: https://github.com/sebastiaanspeck
 [Filip Hoffmann]: https://github.com/folospior
+[Twineee1]: https://github.com/Twineee1
+[hbgl]: https://github.com/hbgl
+[Thomas Gorissen]: https://github.com/serrynaimo
+[te-ing]: https://github.com/te-ing
+[Anthony Martin]: https://github.com/anthony-c-martin
+[NriotHrreion]: https://github.com/NriotHrreion
 
 
 ## Version 11.11.1

SUPPORTED_LANGUAGES.md

@@ -10,6 +10,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | 1C                      | 1c                     |         |
 | 4D                      | 4d                     |[highlightjs-4d](https://github.com/highlightjs/highlightjs-4d) |
 | ABAP                    | sap-abap, abap         |[highlight-sap-abap](https://github.com/highlightjs/highlightjs-sap-abap) |
+| Abc Notation            | abc                    |[highlightjs-abc](https://github.com/nocpiun/highlightjs-abc)|
 | ABNF                    | abnf                   |         |
 | Access logs             | accesslog              |         |
 | ActionScript            | actionscript, as       |         |
@@ -34,6 +35,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Bash                    | bash, sh, zsh          |         |
 | BASIC                   | basic                  |         |
 | BBCode                  | bbcode                 | [highlightjs-bbcode](https://github.com/RedGuy12/highlightjs-bbcode) |
+| Bicep                   | bicep                  | [highlightjs-bicep](https://github.com/Azure/bicep/blob/main/docs/highlighting.md#highlightjs) |
 | Blade (Laravel)         | blade                  | [highlightjs-blade](https://github.com/miken32/highlightjs-blade) |
 | BNF                     | bnf                    |         |
 | BQN                     | bqn                    | [highlightjs-bqn](https://github.com/razetime/highlightjs-bqn) |
@@ -116,11 +118,12 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Java                    | java, jsp              |         |
 | JavaScript              | javascript, js, jsx    |         |
 | Jolie                   | jolie, iol, ol         | [highlightjs-jolie](https://github.com/xiroV/highlightjs-jolie) |
-| JSON                    | json, jsonc            |         |
+| JSON                    | json, jsonc, json5     |         |
 | JSONata                 | jsonata                | [highlightjs-jsonata](https://github.com/DevDimov/highlightjs-jsonata) |
 | Julia                   | julia, jl               |         |
 | Julia REPL              | julia-repl             |         |
 | Kotlin                  | kotlin, kt             |         |
+| L4                      | l4, legal              | [highlightjs-l4](https://github.com/legalese/highlightjs-l4)
 | Lang                    |                        | [highlightjs-lang](https://github.com/highlightjs/highlightjs-lang)
 | Lasso                   | lasso, ls, lassoscript |         |
 | LaTeX                   | tex                    |         |

src/languages/csharp.js

@@ -166,7 +166,7 @@ export default function(hljs) {
     variants: [
       { begin: '\\b(0b[01\']+)' },
       { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)(u|U|l|L|ul|UL|f|F|b|B)' },
-      { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
+      { begin: '(-?)(\\b0[xX][a-fA-F0-9\'_]+|(\\b[\\d\'_]+(\\.[\\d\'_]*)?|\\.[\\d\'_]+)([eE][-+]?[\\d\'_]+)?)' }
     ],
     relevance: 0
   };

src/languages/css.js

@@ -73,9 +73,10 @@ export default function(hljs) {
           modes.HEXCOLOR,
           modes.IMPORTANT,
           modes.CSS_NUMBER_MODE,
+          modes.UNICODE_RANGE,
           ...STRINGS,
           // needed to highlight these as strings and to avoid issues with
-          // illegal characters that might be inside urls that would tigger the
+          // illegal characters that might be inside urls that would trigger the
           // languages illegal stack
           {
             begin: /(url|data-uri)\(/,

src/languages/javascript.js

@@ -457,7 +457,7 @@ export default function(hljs) {
     keywords: KEYWORDS,
     // this will be extended by TypeScript
     exports: { PARAMS_CONTAINS, CLASS_REFERENCE },
-    illegal: /#(?![$_A-z])/,
+    illegal: /#(?![$_A-Za-z])/,
     contains: [
       hljs.SHEBANG({
         label: "shebang",

src/languages/json.js

@@ -1,15 +1,16 @@
 /*
 Language: JSON
 Description: JSON (JavaScript Object Notation) is a lightweight data-interchange format.
-Author: Ivan Sagalaev <[email protected]>
-Website: http://www.json.org
+Websites: http://www.json.org, https://www.json5.org
 Category: common, protocols, web
 */
 
+import { EXTENDED_NUMBER_MODE } from "./lib/ecmascript";
+
 export default function(hljs) {
   const ATTRIBUTE = {
     className: 'attr',
-    begin: /"(\\.|[^\\"\r\n])*"(?=\s*:)/,
+    begin: /(("(\\.|[^\\"\r\n])*")|('(\\.|[^\\'\r\n])*'))(?=\s*:)/,
     relevance: 1.01
   };
   const PUNCTUATION = {
@@ -34,16 +35,17 @@ export default function(hljs) {
 
   return {
     name: 'JSON',
-    aliases: ['jsonc'],
+    aliases: ['jsonc', 'json5'],
     keywords:{
       literal: LITERALS,
     },
     contains: [
       ATTRIBUTE,
       PUNCTUATION,
+      hljs.APOS_STRING_MODE,
       hljs.QUOTE_STRING_MODE,
       LITERALS_MODE,
-      hljs.C_NUMBER_MODE,
+      EXTENDED_NUMBER_MODE,
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE
     ],

src/languages/less.js

@@ -67,6 +67,7 @@ export default function(hljs) {
         excludeEnd: true
       }
     },
+    modes.UNICODE_RANGE,
     modes.HEXCOLOR,
     PARENS_MODE,
     IDENT_MODE('variable', '@@?' + IDENT_RE, 10),
@@ -177,7 +178,7 @@ export default function(hljs) {
       MIXIN_GUARD_MODE,
       IDENT_MODE('keyword', 'all\\b'),
       IDENT_MODE('variable', '@\\{' + IDENT_RE + '\\}'), // otherwise it’s identified as tag
-      
+
       {
         begin: '\\b(' + css.TAGS.join('|') + ')\\b',
         className: 'selector-tag'

src/languages/lib/css-shared.js

@@ -9,6 +9,10 @@ export const MODES = (hljs) => {
       scope: 'number',
       begin: /#(([0-9a-fA-F]{3,4})|(([0-9a-fA-F]{2}){3,4}))\b/
     },
+    UNICODE_RANGE: {
+      scope: 'number',
+      begin: /\b[Uu]\+[0-9A-Fa-f][0-9A-Fa-f?]{0,4}(-[0-9A-Fa-f][0-9A-Fa-f]{0,4})?/
+    },
     FUNCTION_DISPATCH: {
       className: "built_in",
       begin: /[\w-]+(?=\()/
@@ -777,6 +781,7 @@ export const ATTRIBUTES = [
   'transition-timing-function',
   'translate',
   'unicode-bidi',
+  'unicode-range',
   'user-modify',
   'user-select',
   'vector-effect',

src/languages/lib/ecmascript.js

@@ -1,4 +1,12 @@
 export const IDENT_RE = '[A-Za-z$_][0-9A-Za-z$_]*';
+export const EXTENDED_NUMBER_RE = '([-+]?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)|NaN|[-+]?Infinity'; // 0x..., 0..., decimal, float
+
+export const EXTENDED_NUMBER_MODE = {
+  scope: 'number',
+  match: EXTENDED_NUMBER_RE,
+  relevance: 0
+};
+
 const KEYWORDS = [
   "as", // for exports
   "in",

src/languages/scss.js

@@ -79,6 +79,7 @@ export default function(hljs) {
           VARIABLE,
           modes.HEXCOLOR,
           modes.CSS_NUMBER_MODE,
+          modes.UNICODE_RANGE,
           hljs.QUOTE_STRING_MODE,
           hljs.APOS_STRING_MODE,
           modes.IMPORTANT,