(chore) remove meta-keyword and meta-string in favor of nesting

highlightjs · Apr 23, 2021 · 13c7ab6 · 13c7ab6
1 parent 0dedcb4
commit 13c7ab6
Show file tree

Hide file tree

Showing 66 changed files with 197 additions and 178 deletions.
diff --git a/docs/css-classes-reference.rst b/docs/css-classes-reference.rst
@@ -75,9 +75,11 @@ in mind so a better choice (for best theme support) might possibly be ``string``
 | meta                     | flags, modifiers, annotations, processing                   |
 |                          | instructions, preprocessor directives, etc                  |
 +--------------------------+-------------------------------------------------------------+
-| meta-keyword             | keyword or built-in within meta construct                   |
+| meta keyword             | a keyword inside a meta block                               |
+|                          | (note this is nested, not subscoped)                        |
 +--------------------------+-------------------------------------------------------------+
-| meta-string              | string within meta construct                                |
+| meta string              | a string inside a meta block                                |
+|                          | (note this is nested, not subscoped)                        |
 +--------------------------+-------------------------------------------------------------+
 | **Tags, attributes, configs**                                                          |
 +--------------------------+-------------------------------------------------------------+

diff --git a/src/languages/1c.js b/src/languages/1c.js
@@ -450,7 +450,7 @@ export default function(hljs) {
     begin: '#|&', end: '$',
     keywords: {
       $pattern: UNDERSCORE_IDENT_RE,
-      'meta-keyword': KEYWORD + METAKEYWORD
+      'keyword': KEYWORD + METAKEYWORD
     },
     contains: [
       COMMENTS

diff --git a/src/languages/actionscript.js b/src/languages/actionscript.js
@@ -121,7 +121,7 @@ export default function(hljs) {
         className: 'meta',
         beginKeywords: 'import include',
         end: /;/,
-        keywords: { 'meta-keyword': 'import include' }
+        keywords: { 'keyword': 'import include' }
       },
       {
         beginKeywords: 'function',

diff --git a/src/languages/autoit.js b/src/languages/autoit.js
@@ -83,7 +83,7 @@ export default function(hljs) {
     begin: '#',
     end: '$',
     keywords: {
-      'meta-keyword': DIRECTIVES
+      'keyword': DIRECTIVES
     },
     contains: [
       {
@@ -93,13 +93,13 @@ export default function(hljs) {
       {
         beginKeywords: 'include',
         keywords: {
-          'meta-keyword': 'include'
+          'keyword': 'include'
         },
         end: '$',
         contains: [
           STRING,
           {
-            className: 'meta-string',
+            className: 'string',
             variants: [
               {
                 begin: '<',

diff --git a/src/languages/c.js b/src/languages/c.js
@@ -82,7 +82,7 @@ export default function(hljs) {
     begin: /#\s*[a-z]+\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'if else elif endif define undef warning error line ' +
         'pragma _Pragma ifdef ifndef include'
     },
@@ -92,10 +92,10 @@ export default function(hljs) {
         relevance: 0
       },
       hljs.inherit(STRINGS, {
-        className: 'meta-string'
+        className: 'string'
       }),
       {
-        className: 'meta-string',
+        className: 'string',
         begin: /<.*?>/
       },
       C_LINE_COMMENT_MODE,

diff --git a/src/languages/cpp.js b/src/languages/cpp.js
@@ -76,7 +76,7 @@ export default function(hljs) {
     begin: /#\s*[a-z]+\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'if else elif endif define undef warning error line ' +
         'pragma _Pragma ifdef ifndef include'
     },
@@ -86,10 +86,10 @@ export default function(hljs) {
         relevance: 0
       },
       hljs.inherit(STRINGS, {
-        className: 'meta-string'
+        className: 'string'
       }),
       {
-        className: 'meta-string',
+        className: 'string',
         begin: /<.*?>/
       },
       C_LINE_COMMENT_MODE,

diff --git a/src/languages/crystal.js b/src/languages/crystal.js
@@ -207,7 +207,7 @@ export default function(hljs) {
     end: '\\]',
     contains: [
       hljs.inherit(hljs.QUOTE_STRING_MODE, {
-        className: 'meta-string'
+        className: 'string'
       })
     ]
   };

diff --git a/src/languages/csharp.js b/src/languages/csharp.js
@@ -329,7 +329,7 @@ export default function(hljs) {
         begin: '#',
         end: '$',
         keywords: {
-          'meta-keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'
+          'keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'
         }
       },
       STRING,
@@ -381,7 +381,7 @@ export default function(hljs) {
         excludeEnd: true,
         contains: [
           {
-            className: 'meta-string',
+            className: 'string',
             begin: /"/,
             end: /"/
           }

diff --git a/src/languages/dts.js b/src/languages/dts.js
@@ -45,7 +45,7 @@ export default function(hljs) {
     begin: '#',
     end: '$',
     keywords: {
-      'meta-keyword': 'if else elif endif define undef ifdef ifndef'
+      'keyword': 'if else elif endif define undef ifdef ifndef'
     },
     contains: [
       {
@@ -56,14 +56,14 @@ export default function(hljs) {
         beginKeywords: 'include',
         end: '$',
         keywords: {
-          'meta-keyword': 'include'
+          'keyword': 'include'
         },
         contains: [
           hljs.inherit(STRINGS, {
-            className: 'meta-string'
+            className: 'string'
           }),
           {
-            className: 'meta-string',
+            className: 'string',
             begin: '<',
             end: '>',
             illegal: '\\n'
@@ -82,7 +82,7 @@ export default function(hljs) {
   };
 
   const DTS_KEYWORD = {
-    className: 'meta-keyword',
+    className: 'keyword',
     begin: '/[a-z][a-z\\d-]*/'
   };
 

diff --git a/src/languages/gams.js b/src/languages/gams.js
@@ -119,7 +119,7 @@ export default function(hljs) {
         returnBegin: true,
         contains: [
           {
-            className: 'meta-keyword',
+            className: 'keyword',
             begin: '^\\$[a-z0-9]+'
           }
         ]

diff --git a/src/languages/gauss.js b/src/languages/gauss.js
@@ -117,7 +117,7 @@ export default function(hljs) {
     begin: '#',
     end: '$',
     keywords: {
-      'meta-keyword': 'define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline'
+      'keyword': 'define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline'
     },
     contains: [
       {
@@ -128,11 +128,11 @@ export default function(hljs) {
         beginKeywords: 'include',
         end: '$',
         keywords: {
-          'meta-keyword': 'include'
+          'keyword': 'include'
         },
         contains: [
           {
-            className: 'meta-string',
+            className: 'string',
             begin: '"',
             end: '"',
             illegal: '\\n'

diff --git a/src/languages/haxe.js b/src/languages/haxe.js
@@ -58,7 +58,7 @@ export default function(hljs) {
         begin: '#',
         end: '$',
         keywords: {
-          'meta-keyword': 'if else elseif end error'
+          'keyword': 'if else elseif end error'
         }
       },
       {

diff --git a/src/languages/hsp.js b/src/languages/hsp.js
@@ -37,11 +37,11 @@ export default function(hljs) {
         begin: '#',
         end: '$',
         keywords: {
-          'meta-keyword': 'addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib'
+          'keyword': 'addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib'
         },
         contains: [
           hljs.inherit(hljs.QUOTE_STRING_MODE, {
-            className: 'meta-string'
+            className: 'string'
           }),
           hljs.NUMBER_MODE,
           hljs.C_NUMBER_MODE,

diff --git a/src/languages/kotlin.js b/src/languages/kotlin.js
@@ -96,7 +96,7 @@ export default function(hljs) {
         end: /\)/,
         contains: [
           hljs.inherit(STRING, {
-            className: 'meta-string'
+            className: 'string'
           })
         ]
       }

diff --git a/src/languages/makefile.js b/src/languages/makefile.js
@@ -55,7 +55,7 @@ export default function(hljs) {
     end: /$/,
     keywords: {
       $pattern: /[\.\w]+/,
-      'meta-keyword': '.PHONY'
+      'keyword': '.PHONY'
     }
   };
   /* Targets */

diff --git a/src/languages/monkey.js b/src/languages/monkey.js
@@ -68,7 +68,7 @@ export default function(hljs) {
         begin: '\\s*#',
         end: '$',
         keywords: {
-          'meta-keyword': 'if else elseif endif end then'
+          'keyword': 'if else elseif endif end then'
         }
       },
       {

diff --git a/src/languages/objectivec.js b/src/languages/objectivec.js
@@ -209,7 +209,7 @@ export default function(hljs) {
         begin: /#\s*[a-z]+\b/,
         end: /$/,
         keywords: {
-          'meta-keyword':
+          'keyword':
             'if else elif endif define undef warning error line ' +
             'pragma ifdef ifndef include'
         },
@@ -219,10 +219,10 @@ export default function(hljs) {
             relevance: 0
           },
           hljs.inherit(hljs.QUOTE_STRING_MODE, {
-            className: 'meta-string'
+            className: 'string'
           }),
           {
-            className: 'meta-string',
+            className: 'string',
             begin: /<.*?>/,
             end: /$/,
             illegal: '\\n'

diff --git a/src/languages/openscad.js b/src/languages/openscad.js
@@ -26,7 +26,7 @@ export default function(hljs) {
   const PREPRO = {
     className: 'meta',
     keywords: {
-      'meta-keyword': 'include use'
+      'keyword': 'include use'
     },
     begin: 'include|use <',
     end: '>'

diff --git a/src/languages/r.js b/src/languages/r.js
@@ -108,7 +108,7 @@ export default function(hljs) {
               begin: /@[a-zA-Z]+/
             },
             {
-              className: 'meta-keyword',
+              className: 'keyword',
               begin: /\\[a-zA-Z]+/,
             }
           ]

diff --git a/src/languages/rust.js b/src/languages/rust.js
@@ -243,7 +243,7 @@ export default function(hljs) {
         end: '\\]',
         contains: [
           {
-            className: 'meta-string',
+            className: 'string',
             begin: /"/,
             end: /"/
           }

diff --git a/src/languages/sqf.js b/src/languages/sqf.js
@@ -2463,7 +2463,7 @@ export default function(hljs) {
     begin: /#\s*[a-z]+\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'define undef ifdef ifndef else endif include'
     },
     contains: [
@@ -2472,10 +2472,10 @@ export default function(hljs) {
         relevance: 0
       },
       hljs.inherit(STRINGS, {
-        className: 'meta-string'
+        className: 'string'
       }),
       {
-        className: 'meta-string',
+        className: 'string',
         begin: /<[^\n>]*>/,
         end: /$/,
         illegal: '\\n'

diff --git a/src/languages/stan.js b/src/languages/stan.js
@@ -485,7 +485,7 @@ export default function(hljs) {
         {
           relevance: 0,
           keywords: {
-            'meta-keyword': 'include'
+            'keyword': 'include'
           }
         }
       ),

diff --git a/src/languages/vbnet.js b/src/languages/vbnet.js
@@ -125,7 +125,7 @@ export default function(hljs) {
     begin: /[\t ]*#(const|disable|else|elseif|enable|end|externalsource|if|region)\b/,
     end: /$/,
     keywords: {
-      'meta-keyword':
+      'keyword':
         'const disable else elseif enable end externalsource if region then'
     },
     contains: [ COMMENT ]

diff --git a/src/languages/verilog.js b/src/languages/verilog.js
@@ -115,7 +115,7 @@ export default function(hljs) {
         begin: '`',
         end: '$',
         keywords: {
-          'meta-keyword':
+          'keyword':
             'define __FILE__ ' +
             '__LINE__ begin_keywords celldefine default_nettype define ' +
             'else elsif end_keywords endcelldefine endif ifdef ifndef ' +

diff --git a/src/languages/xml.js b/src/languages/xml.js
@@ -20,7 +20,7 @@ export default function(hljs) {
     begin: /\s/,
     contains: [
       {
-        className: 'meta-keyword',
+        className: 'keyword',
         begin: /#?[a-z_][a-z1-9_-]+/,
         illegal: /\n/
       }
@@ -31,10 +31,10 @@ export default function(hljs) {
     end: /\)/
   });
   const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, {
-    className: 'meta-string'
+    className: 'string'
   });
   const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, {
-    className: 'meta-string'
+    className: 'string'
   });
   const TAG_INTERNALS = {
     endsWithParent: true,

diff --git a/src/styles/arduino-light.css b/src/styles/arduino-light.css
@@ -53,7 +53,8 @@ Arduino® Light Theme - Stefania Mellai <s.mellai@arduino.cc>
   color: rgba(149,165,166,.8);
 }
 
-.hljs-meta-keyword {
+.hljs-meta .hljs-keyword {
+
   color: #728E00;
 }
 

diff --git a/src/styles/atom-one-dark-reasonable.css b/src/styles/atom-one-dark-reasonable.css
@@ -49,7 +49,7 @@ Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
 .hljs-literal {
   color: #56b6c2;
 }
-.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta-string {
+.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta .hljs-string {
   color: #98c379;
 }
 .hljs-built_in,

diff --git a/src/styles/atom-one-dark.css b/src/styles/atom-one-dark.css
@@ -51,7 +51,7 @@ hue-6-2: #e6c07b
 .hljs-regexp,
 .hljs-addition,
 .hljs-attribute,
-.hljs-meta-string {
+.hljs-meta .hljs-string {
   color: #98c379;
 }