Merge branch 'main' into jvlavan-patch-1

highlightjs · Oct 4, 2024 · dc5e66a · dc5e66a
2 parents dd7023a + 81e450f
commit dc5e66a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -21,7 +21,8 @@ Core Grammars:
 - fix(typescript) - Fixedoptional property not highlighted correctly  [Dxuian]
 - fix(ruby) - fix `|=` operator false positives (as block arguments) [Aboobacker MK]
 - fix(sql) - Fixed sql primary key and foreign key spacing issue   [Dxuian]
-- fix(dart) - Enhanced Dart syntax highlighting for classes, constructors, attributes, strings, and number literals [Lavan]
+- fix(cpp) added flat_set and flat_map as a part of cpp 23 version [Lavan]
+
 
 New Grammars:
 
@@ -54,7 +55,8 @@ CONTRIBUTORS
 [Sainan]: https://github.com/Sainan
 [Osmocom]: https://github.com/osmocom
 [Álvaro Mondéjar]: https://github.com/mondeja
-[Lavan]:https://github.com/jvlavan
+[Lavan]: https://github.com/jvlavan
+
 
 
 ## Version 11.10.0

diff --git a/src/languages/cpp.js b/src/languages/cpp.js
@@ -247,6 +247,8 @@ export default function(hljs) {
     'counting_semaphore',
     'deque',
     'false_type',
+    'flat_map',
+    'flat_set',
     'future',
     'imaginary',
     'initializer_list',
@@ -572,7 +574,7 @@ export default function(hljs) {
       [
         PREPROCESSOR,
         { // containers: ie, `vector <int> rooms (9);`
-          begin: '\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)',
+          begin: '\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function|flat_map|flat_set)\\s*<(?!<)',
           end: '>',
           keywords: CPP_KEYWORDS,
           contains: [