Merge branch 'main' into php-c-line-comment-in-functions

Author: joshgoebel

CHANGES.md

@@ -3,9 +3,11 @@
 New Grammars:
 
 - added 3rd party Aiken grammar to SUPPORTED_LANGUAGES [Josh Marchand][]
+- added 3rd party VoltScript grammar to SUPPORTED_LANGUAGES [Chester Moses][]
 
 Core Grammars:
 
+- fix(javascript) correctly highlight 'for await' again [wolfgang42][]
 - enh(csp) add missing directives / keywords from MDN (7 more) [Max Liashuk][]
 - enh(ada) add new `parallel` keyword, allow `[]` for Ada 2022 [Max Reznik][]
 - enh(php) support single line and hash comments in attributes, constructor and functions [Antoine Musso][]
@@ -16,6 +18,8 @@ CONTRIBUTORS
 [Max Liashuk]: https://github.com/probil
 [Max Reznik]: https://github.com/reznikmm
 [Antoine Musso]: https://github.com/hashar
+[Chester Moses]: https://github.com/Chester-Moses-HCL
+
 
 ## Version 11.11.1
 

SUPPORTED_LANGUAGES.md

@@ -253,6 +253,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Vala                    | vala                   |         |
 | Verilog                 | verilog, v             |         |
 | Vim Script              | vim                    |         |
+| VoltScript              | voltscript, vss, lotusscript, lss | [highlightjs-voltscript](https://github.com/HCL-TECH-SOFTWARE/highlightjs-voltscript) |
 | WGSL                    | wgsl                   | [highlightjs-wgsl](https://github.com/highlightjs/highlightjs-wgsl) |
 | X#                      | xsharp, xs, prg        | [highlightjs-xsharp](https://github.com/InfomindsAg/highlightjs-xsharp) |
 | X++                     | axapta, x++            |         |

src/languages/javascript.js

@@ -387,7 +387,8 @@ export default function(hljs) {
       noneOf([
         ...ECMAScript.BUILT_IN_GLOBALS,
         "super",
-        "import"
+        "import",
+        "await",
       ].map(x => `${x}\\s*\\(`)),
       IDENT_RE, regex.lookahead(/\s*\(/)),
     className: "title.function",

test/markup/javascript/keywords.expect.txt

@@ -11,4 +11,7 @@
       <span class="hljs-keyword">return</span> <span class="hljs-regexp">/\d+[\s/]/g</span>;
   }
   <span class="hljs-keyword">using</span> val = <span class="hljs-title function_">condition</span>();
+  <span class="hljs-keyword">for</span> <span class="hljs-keyword">await</span> (<span class="hljs-keyword">const</span> item <span class="hljs-keyword">of</span> items) {
+    <span class="hljs-variable language_">console</span>.<span class="hljs-title function_">log</span>(item);
+  }
 }

test/markup/javascript/keywords.txt

@@ -11,4 +11,7 @@ function $initHighlight(block, cls) {
       return /\d+[\s/]/g;
   }
   using val = condition();
+  for await (const item of items) {
+    console.log(item);
+  }
 }