diff --git a/CHANGES.md b/CHANGES.md index eacc0a0d0d..e6348fdfe3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -26,6 +26,7 @@ Language Improvements: - enh(typescript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Josh Goebel][] - enh(javascript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Vania Kucher][] - enh(cpp) add `pair`, `make_pair`, `priority_queue` as built-ins (#2538) [Hankun Lin][] +- enh(cpp) recognize `priority_queue` `pair` as cpp containers (#2541) [Hankun Lin][] - fix(javascript) prevent `set` keyword conflicting with setTimeout, etc. (#2514) [Vania Kucher][] - fix(cpp) Fix highlighting of unterminated raw strings (#2261) [David Benjamin][] - fix(javascript) `=>` function with nested `()` in params now works (#2502) [Josh Goebel][] diff --git a/src/languages/c-like.js b/src/languages/c-like.js index d3ff9222c0..ef795072e9 100644 --- a/src/languages/c-like.js +++ b/src/languages/c-like.js @@ -212,8 +212,8 @@ export default function(hljs) { EXPRESSION_CONTAINS, [ PREPROCESSOR, - { - begin: '\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<', end: '>', + { // containers: ie, `vector 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)\\s*<', end: '>', keywords: CPP_KEYWORDS, contains: ['self', CPP_PRIMITIVE_TYPES] },