enh(c,cpp) highlight type modifiers as type (#3316)

highlightjs · Aug 30, 2021 · 1fcf615 · 1fcf615
1 parent e4226f5
commit 1fcf615
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,7 @@
 - enh(css/less/stylus/scss) detect block comments more fully (#3301) [Josh Goebel][]
 - fix(cpp) switch is a keyword (#3312) [Josh Goebel][]
 - fix(cpp) fix `xor_eq` keyword highlighting. [Denis Kovalchuk][]
+- enh(c,cpp) highlight type modifiers as type (#3316) [Josh Goebel][]
 - enh(css/less/stylus/scss) add support for CSS Grid properties [monochromer][]
 
 [Josh Goebel]: https://github.com/joshgoebel

diff --git a/src/languages/c.js b/src/languages/c.js
@@ -116,7 +116,6 @@ export default function(hljs) {
     "auto",
     "break",
     "case",
-    "const",
     "continue",
     "default",
     "do",
@@ -132,7 +131,6 @@ export default function(hljs) {
     "restrict",
     "return",
     "sizeof",
-    "static",
     "struct",
     "switch",
     "typedef",
@@ -172,6 +170,9 @@ export default function(hljs) {
     "_Decimal32",
     "_Decimal64",
     "_Decimal128",
+    // modifiers
+    "const",
+    "static",
     // aliases
     "complex",
     "bool",

diff --git a/src/languages/cpp.js b/src/languages/cpp.js
@@ -128,7 +128,6 @@ export default function(hljs) {
     'co_yield',
     'compl',
     'concept',
-    'const',
     'const_cast|10',
     'consteval',
     'constexpr',
@@ -172,9 +171,7 @@ export default function(hljs) {
     'reinterpret_cast|10',
     'requires',
     'return',
-    'signed',
     'sizeof',
-    'static',
     'static_assert',
     'static_cast|10',
     'struct',
@@ -192,7 +189,6 @@ export default function(hljs) {
     'typeid',
     'typename',
     'union',
-    'unsigned',
     'using',
     'virtual',
     'volatile',
@@ -214,7 +210,11 @@ export default function(hljs) {
     'long',
     'short',
     'void',
-    'wchar_t'
+    'wchar_t',
+    'unsigned',
+    'signed',
+    'const',
+    'static'
   ];
 
   const TYPE_HINTS = [

diff --git a/test/markup/cpp/bitwise-keywords.expect.txt b/test/markup/cpp/bitwise-keywords.expect.txt
@@ -1,5 +1,5 @@
-<span class="hljs-keyword">unsigned</span> <span class="hljs-type">char</span> a = <span class="hljs-number">0xFA</span>;
-<span class="hljs-keyword">unsigned</span> <span class="hljs-type">char</span> b = <span class="hljs-number">0x4C</span>;
+<span class="hljs-type">unsigned</span> <span class="hljs-type">char</span> a = <span class="hljs-number">0xFA</span>;
+<span class="hljs-type">unsigned</span> <span class="hljs-type">char</span> b = <span class="hljs-number">0x4C</span>;
 
 a = <span class="hljs-keyword">compl</span> b;
 a = <span class="hljs-keyword">not</span> b;

diff --git a/test/markup/cpp/template-complexity.expect.txt b/test/markup/cpp/template-complexity.expect.txt
@@ -7,8 +7,8 @@
 }
 
 <span class="hljs-comment">// Disable overload for already valid operands.</span>
-<span class="hljs-keyword">template</span>&lt;<span class="hljs-keyword">class</span> <span class="hljs-title class_">T</span>, <span class="hljs-keyword">class</span> = std::<span class="hljs-type">enable_if_t</span>&lt;!impl::is_streamable_v&lt;<span class="hljs-keyword">const</span> T &amp;&gt; &amp;&amp; std::is_convertible_v&lt;<span class="hljs-keyword">const</span> T &amp;, std::wstring_view&gt;&gt;&gt;
-std::wostream &amp;<span class="hljs-keyword">operator</span> &lt;&lt;(std::wostream &amp;stream, <span class="hljs-keyword">const</span> T &amp;thing)
+<span class="hljs-keyword">template</span>&lt;<span class="hljs-keyword">class</span> <span class="hljs-title class_">T</span>, <span class="hljs-keyword">class</span> = std::<span class="hljs-type">enable_if_t</span>&lt;!impl::is_streamable_v&lt;<span class="hljs-type">const</span> T &amp;&gt; &amp;&amp; std::is_convertible_v&lt;<span class="hljs-type">const</span> T &amp;, std::wstring_view&gt;&gt;&gt;
+std::wostream &amp;<span class="hljs-keyword">operator</span> &lt;&lt;(std::wostream &amp;stream, <span class="hljs-type">const</span> T &amp;thing)
 {
     <span class="hljs-keyword">return</span> stream &lt;&lt; <span class="hljs-built_in">static_cast</span>&lt;std::wstring_view&gt;(thing);
 }