From 35df24a631ea3a7029aea64d063cdb1db1efaff3 Mon Sep 17 00:00:00 2001 From: Lin <50829219+Linhk1606@users.noreply.github.com> Date: Fri, 8 May 2020 11:10:23 +0800 Subject: [PATCH 1/3] Update c-like.js --- src/languages/c-like.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/c-like.js b/src/languages/c-like.js index d3ff9222c0..fc0655ff1d 100644 --- a/src/languages/c-like.js +++ b/src/languages/c-like.js @@ -213,7 +213,7 @@ export default function(hljs) { [ PREPROCESSOR, { - begin: '\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<', end: '>', + 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] }, From b1af6484aa988bd58f5001f5a21d20383e57550f Mon Sep 17 00:00:00 2001 From: Lin <50829219+Linhk1606@users.noreply.github.com> Date: Fri, 8 May 2020 11:20:10 +0800 Subject: [PATCH 2/3] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 65b4771d18..2c01591461 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -25,6 +25,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][] From 4b28e0358d7dbc19aa473de929abc63240cdc75a Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Fri, 8 May 2020 04:29:03 -0400 Subject: [PATCH 3/3] Update src/languages/c-like.js --- src/languages/c-like.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/c-like.js b/src/languages/c-like.js index fc0655ff1d..ef795072e9 100644 --- a/src/languages/c-like.js +++ b/src/languages/c-like.js @@ -212,7 +212,7 @@ export default function(hljs) { EXPRESSION_CONTAINS, [ PREPROCESSOR, - { + { // 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]