diff --git a/CHANGES.md b/CHANGES.md index 605d53ae0c..d2aa6bf0a1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -58,6 +58,8 @@ Parser: Grammars: +- enh(all) `.meta-keyword` => `.meta .keyword` (nested scopes) (#3167) [Josh Goebel][] +- enh(all) `.meta-string` => `.meta .string` (nested scopes) (#3167) [Josh Goebel][] - enh(swift) add `actor` keyword (#3171) [Bradley Mackey][] - enh(crystal) highlight variables (#3154) [Josh Goebel][] - fix(ruby) Heredoc without interpolation (#3154) [Josh Goebel][] diff --git a/VERSION_11_UPGRADE.md b/VERSION_11_UPGRADE.md index 4673dc7fb0..070d3cf1f6 100644 --- a/VERSION_11_UPGRADE.md +++ b/VERSION_11_UPGRADE.md @@ -3,6 +3,7 @@ - [Language Files](#language-files) - [Language Aliases](#language-aliases) - [Styles and CSS](#styles-and-css) + - [Grammar Scopes](#grammar-scopes) - [Behavioral changes](#behavioral-changes) - [API changes](#api-changes) - [Changes to Result Data](#changes-to-result-data) @@ -36,14 +37,14 @@ This would matter if you are requiring any of these files directly (via Node.js - `htmlbars` has been removed. Use `handlebars` instead. - `c-like` has been removed. Use `c`, `cpp`, or `arduino`. -- `sql_more` has been removed. Use `sql` instead. +- `sql_more` has been removed. Use `sql` instead or a more specific 3rd party grammar. ### Language Aliases This would matter if you are using these aliases. -- `php3`,`php4`,`php5`, `php6`, `php7`, and `php8` havbe been removed. Use `php` instead. +- `php3`,`php4`,`php5`, `php6`, `php7`, and `php8` have been removed. Use `php` instead. - `zsh` has been removed. Use `sh` or `bash` instead. - `freepascal`, `lazarus`, `lpr`, and `lpm` removed. Use `delphi` instead. @@ -61,6 +62,11 @@ hljs.registerAliases(["php3","php4","php5","php6","php7","php8"],{ languageName: - The `.hljs` CSS selector is now further scoped. It now targets `code.hljs` (inline code) and `pre code.hljs` (code blocks). If you are using a different element you may need to update your CSS to reapply some styling. +#### Grammar Scopes + +- `.meta-string` removed/deprecated. Use `.meta .string` (a nested scope) instead. See [meta-keyword][]. +- `.meta-keyword` removed/deprecated. Use `.meta .keyword` (a nested scope) instead. See [meta-keyword][]. + ### Behavioral changes #### API changes @@ -177,3 +183,5 @@ This configuration option was deprecated in v10.5. Use a plugin or pre-render co ### Small Things - The `regex` utility `join` has been renamed to `_eitherRewriteBackreferences` (this has always been intended for internal use only) + +[meta-keyword]: https://github.com/highlightjs/highlight.js/pull/3167 diff --git a/docs/css-classes-reference.rst b/docs/css-classes-reference.rst index 7d591d4245..8fceca3d8a 100644 --- a/docs/css-classes-reference.rst +++ b/docs/css-classes-reference.rst @@ -80,9 +80,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 index 595aaeca58..31898f88de 100644 --- 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 index db9f26f0f4..fbb060b8a0 100644 --- 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 index 6ef016f4a4..a1afd5fe41 100644 --- 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 index 157d43216a..84912237bb 100644 --- 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 index 938ed1fe7c..3862004f2d 100644 --- 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 index 076c130eb2..138572a001 100644 --- 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 index d5aeb02817..6696d4f060 100644 --- 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 index 3cdbbce524..edf4446a7e 100644 --- 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 KEYWORD = { - className: 'meta', + className: 'keyword', begin: '/[a-z][a-z\\d-]*/' }; diff --git a/src/languages/gams.js b/src/languages/gams.js index fc926c4b8f..aaab22cc4c 100644 --- 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 index 3099521bdd..2a00e3db9d 100644 --- 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 index 4a4f72b4bb..3dfcd2d6b2 100644 --- 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 index 68649b2ae3..dc94d6e06f 100644 --- 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 index c741f60662..5751bcf9ec 100644 --- 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 index 6e0d66d954..b6de7b1abd 100644 --- 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 index 244f69a425..915fa20c98 100644 --- 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 index 10979f6d42..d640c8c13e 100644 --- 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 index e03a2a6361..d2765ecc51 100644 --- 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 index 237d36becb..a4348678fa 100644 --- 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 index 4d0465d1e9..85bff58381 100644 --- 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 index 3367c426f6..7eff900dd1 100644 --- 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/vbnet.js b/src/languages/vbnet.js index 80e159af26..d4388bef75 100644 --- 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 index fa242a556b..9333f5a4df 100644 --- 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 index 84339f71f8..b27bf61cd5 100644 --- 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 index db0ab649a3..d50d96d5a6 100644 --- a/src/styles/arduino-light.css +++ b/src/styles/arduino-light.css @@ -53,7 +53,8 @@ Arduino® Light Theme - Stefania Mellai 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 index 6a64e8a56b..a38738d96e 100644 --- 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 index c660dff220..b8528d8798 100644 --- 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; } diff --git a/src/styles/atom-one-light.css b/src/styles/atom-one-light.css index b8b38ac36d..4ae2c63f84 100644 --- a/src/styles/atom-one-light.css +++ b/src/styles/atom-one-light.css @@ -51,7 +51,7 @@ hue-6-2: #c18401 .hljs-regexp, .hljs-addition, .hljs-attribute, -.hljs-meta-string { +.hljs-meta .hljs-string { color: #50a14f; } diff --git a/src/styles/default.css b/src/styles/default.css index 2cd85b66fa..b34cccf640 100644 --- a/src/styles/default.css +++ b/src/styles/default.css @@ -59,7 +59,8 @@ code.hljs { .hljs-keyword, .hljs-attribute, .hljs-selector-tag, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-doctag, .hljs-name { font-weight: bold; @@ -116,7 +117,7 @@ code.hljs { color: #1f7199; } -.hljs-meta-string { +.hljs-meta .hljs-string { color: #4d99bf; } diff --git a/src/styles/devibeans.css b/src/styles/devibeans.css index 451b693045..f8a128ea78 100644 --- a/src/styles/devibeans.css +++ b/src/styles/devibeans.css @@ -38,7 +38,8 @@ } .hljs-meta, -.hljs-meta-keyword { +.hljs-meta .hljs-keyword { + color: #0087ff; } @@ -74,7 +75,7 @@ color: #ffd75f; } -.hljs-meta-string, +.hljs-meta .hljs-string, .hljs-string, .hljs-subst, .hljs-symbol, diff --git a/src/styles/github.css b/src/styles/github.css index 49eed4ddb9..552d380326 100644 --- a/src/styles/github.css +++ b/src/styles/github.css @@ -12,7 +12,8 @@ .hljs-doctag, .hljs-keyword, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-template-tag, .hljs-template-variable, .hljs-type { @@ -40,7 +41,7 @@ .hljs-regexp, .hljs-string, -.hljs-meta-string { +.hljs-meta .hljs-string { /* prettylights-syntax-string */ color: #032f62; } diff --git a/src/styles/gml.css b/src/styles/gml.css index 3c47525a1a..6c1da22d15 100644 --- a/src/styles/gml.css +++ b/src/styles/gml.css @@ -60,7 +60,8 @@ GML Theme - Meseta .hljs-title, .hljs-section, .hljs-function, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-meta, .hljs-subst { color: #C0C0C0; diff --git a/src/styles/gradient-dark.css b/src/styles/gradient-dark.css index cb7083abdf..d9e42138c2 100644 --- a/src/styles/gradient-dark.css +++ b/src/styles/gradient-dark.css @@ -44,7 +44,8 @@ color:#e7e4eb; .hljs-keyword, .hljs-section, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-symbol, .hljs-type diff --git a/src/styles/gradient-light.css b/src/styles/gradient-light.css index 38dd11c4dc..574534cb56 100644 --- a/src/styles/gradient-light.css +++ b/src/styles/gradient-light.css @@ -44,7 +44,8 @@ color:#01958B; .hljs-keyword, .hljs-section, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-symbol, .hljs-type diff --git a/src/styles/isbl-editor-dark.css b/src/styles/isbl-editor-dark.css index e6a66fbe58..d3f45d2a98 100644 --- a/src/styles/isbl-editor-dark.css +++ b/src/styles/isbl-editor-dark.css @@ -24,7 +24,8 @@ ISBL Editor style dark color scheme (c) Dmitriy Tarasov .hljs-keyword, .hljs-attribute, .hljs-selector-tag, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-doctag, .hljs-name { color: #f0f0f0; @@ -93,7 +94,7 @@ ISBL Editor style dark color scheme (c) Dmitriy Tarasov color: #1f7199; } -.hljs-meta-string { +.hljs-meta .hljs-string { color: #4d99bf; } diff --git a/src/styles/isbl-editor-light.css b/src/styles/isbl-editor-light.css index 07363555cd..9a41fea024 100644 --- a/src/styles/isbl-editor-light.css +++ b/src/styles/isbl-editor-light.css @@ -23,7 +23,8 @@ ISBL Editor style light color schemec (c) Dmitriy Tarasov .hljs-keyword, .hljs-attribute, .hljs-selector-tag, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-doctag, .hljs-name { color: #000000; @@ -92,7 +93,7 @@ ISBL Editor style light color schemec (c) Dmitriy Tarasov color: #1f7199; } -.hljs-meta-string { +.hljs-meta .hljs-string { color: #4d99bf; } diff --git a/src/styles/lightfair.css b/src/styles/lightfair.css index aa90725dc3..f9df16bf06 100644 --- a/src/styles/lightfair.css +++ b/src/styles/lightfair.css @@ -28,7 +28,8 @@ Lightfair style (c) Tristian Kelly .hljs-keyword, .hljs-attribute, .hljs-selector-tag, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-doctag, .hljs-name { font-weight: bold @@ -72,7 +73,7 @@ Lightfair style (c) Tristian Kelly color: #25c6c6 } -.hljs-meta-string { +.hljs-meta .hljs-string { color: #4d99bf } diff --git a/src/styles/night-owl.css b/src/styles/night-owl.css index f23fce285f..50f667c139 100644 --- a/src/styles/night-owl.css +++ b/src/styles/night-owl.css @@ -87,10 +87,11 @@ SOFTWARE. .hljs-meta { color: #82aaff; } -.hljs-meta-keyword { +.hljs-meta .hljs-keyword { + color: #82aaff; } -.hljs-meta-string { +.hljs-meta .hljs-string { color: #ecc48d; } diff --git a/src/styles/nnfx-dark.css b/src/styles/nnfx-dark.css index e1cef36ace..f25c2434d9 100644 --- a/src/styles/nnfx-dark.css +++ b/src/styles/nnfx-dark.css @@ -44,7 +44,7 @@ .hljs-code, .hljs-string, -.hljs-meta-string, +.hljs-meta .hljs-string, .hljs-number, .hljs-regexp, .hljs-link { diff --git a/src/styles/nnfx-light.css b/src/styles/nnfx-light.css index 705a824986..6009ca47c1 100644 --- a/src/styles/nnfx-light.css +++ b/src/styles/nnfx-light.css @@ -44,7 +44,7 @@ .hljs-code, .hljs-string, -.hljs-meta-string, +.hljs-meta .hljs-string, .hljs-number, .hljs-regexp, .hljs-link { diff --git a/src/styles/nord.css b/src/styles/nord.css index 8ec56eeaa5..29759c4f68 100644 --- a/src/styles/nord.css +++ b/src/styles/nord.css @@ -165,11 +165,12 @@ Aurora } .hljs-meta, -.hljs-meta-keyword { +.hljs-meta .hljs-keyword { + color: #5E81AC; } -.hljs-meta-string { +.hljs-meta .hljs-string { color: #A3BE8C; } @@ -251,7 +252,7 @@ Aurora color: #88C0D0; } -.language-cpp .hljs-meta-string { +.language-cpp .hljs-meta .hljs-string { color: #8FBCBB; } diff --git a/src/styles/purebasic.css b/src/styles/purebasic.css index 3c7ae19ad3..796e873412 100644 --- a/src/styles/purebasic.css +++ b/src/styles/purebasic.css @@ -46,7 +46,8 @@ NOTE_2: Color names provided in comments were derived using "Name that Color" on .hljs-keyword, /* --- used for PureBASIC Keywords --- */ .hljs-class, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-selector-class, .hljs-built_in { color: #006666; /* Blue Stone (approx.) */ diff --git a/src/styles/routeros.css b/src/styles/routeros.css index c36d825443..5bbf4ca14a 100644 --- a/src/styles/routeros.css +++ b/src/styles/routeros.css @@ -21,7 +21,8 @@ .hljs-keyword, .hljs-selector-tag, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-doctag, .hljs-name { font-weight: bold; @@ -85,7 +86,7 @@ color: #1f7199; } -.hljs-meta-string { +.hljs-meta .hljs-string { color: #4d99bf; } diff --git a/src/styles/shades-of-purple.css b/src/styles/shades-of-purple.css index 388618f755..025f6cdcff 100644 --- a/src/styles/shades-of-purple.css +++ b/src/styles/shades-of-purple.css @@ -61,7 +61,7 @@ } .hljs-meta, -.hljs-meta-string { +.hljs-meta .hljs-string { color: #fb9e00; } diff --git a/src/styles/stackoverflow-dark.css b/src/styles/stackoverflow-dark.css index 814b0538e5..878d02af24 100644 --- a/src/styles/stackoverflow-dark.css +++ b/src/styles/stackoverflow-dark.css @@ -16,7 +16,8 @@ .hljs-keyword, .hljs-selector-tag, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-doctag, .hljs-section, .hljs-selector-class, @@ -49,7 +50,7 @@ .hljs-template-variable, .hljs-link, .hljs-selector-attr, -.hljs-meta-string { +.hljs-meta .hljs-string { color: #b5bd68; } diff --git a/src/styles/stackoverflow-light.css b/src/styles/stackoverflow-light.css index b363fa6928..3698f7efcd 100644 --- a/src/styles/stackoverflow-light.css +++ b/src/styles/stackoverflow-light.css @@ -16,7 +16,8 @@ .hljs-keyword, .hljs-selector-tag, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-doctag, .hljs-section, .hljs-selector-class, @@ -49,7 +50,7 @@ .hljs-template-variable, .hljs-link, .hljs-selector-attr, -.hljs-meta-string { +.hljs-meta .hljs-string { color: #54790d; } diff --git a/src/styles/vs2015.css b/src/styles/vs2015.css index c34fa2a9e8..4dce1ebd40 100644 --- a/src/styles/vs2015.css +++ b/src/styles/vs2015.css @@ -30,7 +30,7 @@ } .hljs-string, -.hljs-meta-string { +.hljs-meta .hljs-string { color: #D69D85; } @@ -58,7 +58,8 @@ } .hljs-meta, -.hljs-meta-keyword, +.hljs-meta .hljs-keyword, + .hljs-tag { color: #9B9B9B; } diff --git a/src/styles/xcode.css b/src/styles/xcode.css index 113758f49f..8ab7ab5b57 100644 --- a/src/styles/xcode.css +++ b/src/styles/xcode.css @@ -35,7 +35,7 @@ XCode style (c) Angel Garcia .hljs-code, .hljs-string, -.hljs-meta-string { +.hljs-meta .hljs-string { color: #c41a16; } diff --git a/test/markup/1c/default.expect.txt b/test/markup/1c/default.expect.txt index 0f51f27c6b..94eef4386a 100644 --- a/test/markup/1c/default.expect.txt +++ b/test/markup/1c/default.expect.txt @@ -1,6 +1,6 @@ -#ЗагрузитьИзФайла ext_module.txt // директива 7.7 -#Если Клиент ИЛИ НаКлиенте Тогда // инструкции препроцессора - &НаКлиентеНаСервереБезКонтекста // директивы компиляции +#ЗагрузитьИзФайла ext_module.txt // директива 7.7 +#Если Клиент ИЛИ НаКлиенте Тогда // инструкции препроцессора + &НаКлиентеНаСервереБезКонтекста // директивы компиляции Функция ТолстыйКлиентОбычноеПриложение(Знач Параметр1 = Неопределено, // комментарий Параметр2 = "", ПараметрN = 123.45, ПарамNN) Экспорт // еще комментарий Попытка @@ -27,4 +27,4 @@ ~МеткаGOTO: // еще комментарий ВД = ВидДвиженияБухгалтерии.Дебет; КонецФункции // ТолстыйКлиентОбычноеПриложение() -#КонецЕсли \ No newline at end of file +#КонецЕсли \ No newline at end of file diff --git a/test/markup/autoit/default.expect.txt b/test/markup/autoit/default.expect.txt index f388ccda88..b4c682a1da 100644 --- a/test/markup/autoit/default.expect.txt +++ b/test/markup/autoit/default.expect.txt @@ -1,6 +1,6 @@ -#NoTrayIcon +#NoTrayIcon #AutoIt3Wrapper_Run_Tidy=Y -#include <Misc.au3> +#include <Misc.au3> _Singleton(@ScriptName) ; Allow only one instance example(0, 10) diff --git a/test/markup/cpp/comments.expect.txt b/test/markup/cpp/comments.expect.txt index c5a6793f8a..fb24209302 100644 --- a/test/markup/cpp/comments.expect.txt +++ b/test/markup/cpp/comments.expect.txt @@ -6,8 +6,8 @@ across lines */ -#include <sys/wait.h> // line comment -#include <sys/wait.h> /* block comment */ +#include <sys/wait.h> // line comment +#include <sys/wait.h> /* block comment */ /* Truncated block comment diff --git a/test/markup/cpp/preprocessor.expect.txt b/test/markup/cpp/preprocessor.expect.txt index 5b3b9ad3df..5f47f55b8c 100644 --- a/test/markup/cpp/preprocessor.expect.txt +++ b/test/markup/cpp/preprocessor.expect.txt @@ -1,31 +1,31 @@ -#include <iostream> -#define foo 1<<16 +#include <iostream> +#define foo 1<<16 -#ifdef DEBUG +#ifdef DEBUG TYPE1 foo(void) -#else +#else int foo(void) -#endif +#endif { } -#define x(v) ((v)) -# define x(v) ((v)) -# define x(v) ((v)) +#define x(v) ((v)) +# define x(v) ((v)) +# define x(v) ((v)) -#if MACRO_WITH_STRING_ARG("hello \"world\"") -#elif MULTI_LINE /* comment */ < \ +#if MACRO_WITH_STRING_ARG("hello \"world\"") +#elif MULTI_LINE /* comment */ < \ EXPRESSION int bar; -#endif // comment +#endif // comment if (p) { -#ifdef DEBUG +#ifdef DEBUG onething(); -#endif +#endif } else if (errno) { -#ifdef DEBUG +#ifdef DEBUG anotherthing(); -#endif +#endif } // this is a continued\ diff --git a/test/markup/cpp/string-literals.expect.txt b/test/markup/cpp/string-literals.expect.txt index 814c481a11..953005745c 100644 --- a/test/markup/cpp/string-literals.expect.txt +++ b/test/markup/cpp/string-literals.expect.txt @@ -65,5 +65,5 @@ multiline string)blah4"; // Meta strings -#include <stdio> -#include "lib.h" +#include <stdio> +#include "lib.h" diff --git a/test/markup/dts/default.expect.txt b/test/markup/dts/default.expect.txt index fca2d879d4..86b8851ce1 100644 --- a/test/markup/dts/default.expect.txt +++ b/test/markup/dts/default.expect.txt @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -/include/ "skeleton.dtsi" +/include/ "skeleton.dtsi" / { compatible = "xlnx,zynq-7000"; diff --git a/test/markup/haxe/default.expect.txt b/test/markup/haxe/default.expect.txt index 438fcbfa8a..5a20b54a6d 100644 --- a/test/markup/haxe/default.expect.txt +++ b/test/markup/haxe/default.expect.txt @@ -1,12 +1,12 @@ package my.package; -#if js +#if js import js.Browser; -#elseif sys +#elseif sys import Sys; -#else +#else import Date; -#end +#end import Lambda; using Main.IntExtender; diff --git a/test/markup/hsp/default.expect.txt b/test/markup/hsp/default.expect.txt index ef4ccd5b77..e0b60bd4af 100644 --- a/test/markup/hsp/default.expect.txt +++ b/test/markup/hsp/default.expect.txt @@ -1,4 +1,4 @@ -#include "foo.hsp" +#include "foo.hsp" // line comment message = "Hello, World!" diff --git a/test/markup/makefile/default.expect.txt b/test/markup/makefile/default.expect.txt index df0f17e2f6..d3df2e4248 100644 --- a/test/markup/makefile/default.expect.txt +++ b/test/markup/makefile/default.expect.txt @@ -3,7 +3,7 @@ BUILDDIR = _build EXTRAS ?= $(BUILDDIR)/extras -.PHONY: main clean +.PHONY: main clean main: @echo "Building main facility..." diff --git a/test/markup/objectivec/preprocessor.expect.txt b/test/markup/objectivec/preprocessor.expect.txt index 98c6d3dc92..b69e9b5aa0 100644 --- a/test/markup/objectivec/preprocessor.expect.txt +++ b/test/markup/objectivec/preprocessor.expect.txt @@ -1,19 +1,19 @@ -#include <iostream> -#define foo 1<<16 +#include <iostream> +#define foo 1<<16 -#ifdef DEBUG +#ifdef DEBUG TYPE1 foo(void) -#else +#else int foo(void) -#endif +#endif { } -#define x(v) ((v)) -# define x(v) ((v)) -# define x(v) ((v)) +#define x(v) ((v)) +# define x(v) ((v)) +# define x(v) ((v)) -#if MACRO_WITH_STRING_ARG("hello \"world\"") -#elif MULTI_LINE /* comment */ < \ +#if MACRO_WITH_STRING_ARG("hello \"world\"") +#elif MULTI_LINE /* comment */ < \ EXPRESSION int bar; -#endif // comment +#endif // comment diff --git a/test/markup/openscad/default.expect.txt b/test/markup/openscad/default.expect.txt index 0b2df0370f..dd2443a8cc 100644 --- a/test/markup/openscad/default.expect.txt +++ b/test/markup/openscad/default.expect.txt @@ -1,5 +1,5 @@ -use <write.scad> -include <../common/base.scad> +use <write.scad> +include <../common/base.scad> //draw a foobar module foobar(){ diff --git a/test/markup/perl/default.expect.txt b/test/markup/perl/default.expect.txt index 0800725488..c12eb5ed56 100644 --- a/test/markup/perl/default.expect.txt +++ b/test/markup/perl/default.expect.txt @@ -30,7 +30,7 @@ __DATA__ @@ layouts/default.html.ep -<!DOCTYPE html> +<!DOCTYPE html> <html> <head><title><%= title %></title></head> <body><%= content %></body> diff --git a/test/markup/r/roxygen.expect.txt b/test/markup/r/roxygen.expect.txt index 4dfc0a19da..aba284971a 100644 --- a/test/markup/r/roxygen.expect.txt +++ b/test/markup/r/roxygen.expect.txt @@ -1,19 +1,19 @@ #' A description #' #' Long description -#' @param x the object of type \code{numeric} -#' @return A logical indicating whether \code{x == 0} +#' @param x the object of type \code{numeric} +#' @return A logical indicating whether \code{x == 0} #' @export is_zero = function (x) x == 0 #' Sum of numbers #' -#' \code{sum_all} is a wrapper for \code{\link{sum}(..., na.rm = TRUE)}. +#' \code{sum_all} is a wrapper for \code{\link{sum}(..., na.rm = TRUE)}. #' @param ... one or more numeric vectors #' @examples #' sum_all(1 : 10) # 55 @this \link{should not be highlighted!} #' sum_all(1, NA, 2, 3) # 6 -#' @seealso \link[base]{sum} # this SHOULD be highlighted again. +#' @seealso \link[base]{sum} # this SHOULD be highlighted again. # comment sum_all <- function (...) { sum(..., na.rm = TRUE) diff --git a/test/markup/vbnet/default.expect.txt b/test/markup/vbnet/default.expect.txt index 357a93c484..ed30978834 100644 --- a/test/markup/vbnet/default.expect.txt +++ b/test/markup/vbnet/default.expect.txt @@ -1,5 +1,5 @@ Imports System.IO -#Const DEBUG = True ' Set to false for prod +#Const DEBUG = True ' Set to false for prod Namespace Highlighter.Test ''' <summary>This is an example class.</summary> @@ -7,7 +7,7 @@ Protected Shared hello As Integer = 3 Private Const ABC As Boolean = False -#Region "Code" +#Region "Code" ' Cheers! <STAThread()> _ Public Shared Sub Main(ByVal args() As String, ParamArray arr As Object) Handles Form1.Click @@ -36,6 +36,6 @@ Do : Laugh() : Loop Until hello = 4 End If End Sub -#End Region +#End Region End Class End Namespace diff --git a/test/markup/vbnet/directives.expect.txt b/test/markup/vbnet/directives.expect.txt index b510c6e49d..db16cb6a44 100644 --- a/test/markup/vbnet/directives.expect.txt +++ b/test/markup/vbnet/directives.expect.txt @@ -1,16 +1,16 @@ -#Region "MathFunctions" - #Const CustomerNumber = 36 - #If CustomerNumber = 35 Then +#Region "MathFunctions" + #Const CustomerNumber = 36 + #If CustomerNumber = 35 Then ' Insert code to be compiled for customer # 35. - #ElseIf CustomerNumber = 36 Then + #ElseIf CustomerNumber = 36 Then ' Insert code to be compiled for customer # 36. - #Else + #Else ' Insert code to be compiled for all other customers. - #End If -#End Region + #End If +#End Region -#Disable Warning BC42356 ' suppress warning about no awaits in this method +#Disable Warning BC42356 ' suppress warning about no awaits in this method Async Function TestAsync() As Task Console.WriteLine("testing") End Function -#Enable Warning BC42356 +#Enable Warning BC42356 diff --git a/test/markup/verilog/misc.expect.txt b/test/markup/verilog/misc.expect.txt index 6f94b4d856..515b63f70a 100644 --- a/test/markup/verilog/misc.expect.txt +++ b/test/markup/verilog/misc.expect.txt @@ -1,4 +1,4 @@ -`timescale 1ns / 1ps +`timescale 1ns / 1ps /** * counter: a generic clearable up-counter diff --git a/test/markup/xml/document-type-variations.expect.txt b/test/markup/xml/document-type-variations.expect.txt index 74b8ee225a..74caed4966 100644 --- a/test/markup/xml/document-type-variations.expect.txt +++ b/test/markup/xml/document-type-variations.expect.txt @@ -1,38 +1,38 @@ -<!DOCTYPE svg PUBLIC " -//W3C//DTD SVG 1.1 Basic//EN " ' http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd ' > -<!DOCTYPE svg PUBLIC"-//W3C//DTD SVG 1.1 Basic//EN"'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd'> +<!DOCTYPE svg PUBLIC " -//W3C//DTD SVG 1.1 Basic//EN " ' http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd ' > +<!DOCTYPE svg PUBLIC"-//W3C//DTD SVG 1.1 Basic//EN"'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd'> -<!DOCTYPE note [ -<!ENTITY nbsp '&#xA0;'> -<!ENTITY pound '&#xA3;'> -<!ENTITY writer_person " Writer: Donald Duck. "> -<!ENTITY copyright "Copyright: Walt Disney Company."> +<!DOCTYPE note [ +<!ENTITY nbsp '&#xA0;'> +<!ENTITY pound '&#xA3;'> +<!ENTITY writer_person " Writer: Donald Duck. "> +<!ENTITY copyright "Copyright: Walt Disney Company."> ]> -<!ENTITY nbsp ' &#xA0; '> -<!ENTITY pound '&#xA3;'> -<!ENTITY writer_person " Writer: Donald Duck. "> -<!ENTITY copyright "Copyright: Walt Disney Company."> +<!ENTITY nbsp ' &#xA0; '> +<!ENTITY pound '&#xA3;'> +<!ENTITY writer_person " Writer: Donald Duck. "> +<!ENTITY copyright "Copyright: Walt Disney Company."> -<!DOCTYPE bookstore [ -<!ELEMENT bookstore (book*)> -<!ELEMENT book (title,author,genre?)> -<!ELEMENT title (#PCDATA)> -<!ELEMENT author ( first-name+, last-name+ )+ > -<!ELEMENT genre (to,from,header,(message| body))> -<!ELEMENT first-name (#PCDATA)> -<!ELEMENT last-name (#PCDATA) > -<!ATTLIST book price CDATA #REQUIRED> -<!ATTLIST book publication_date CDATA> -<!ATTLIST book IBSN CDATA> +<!DOCTYPE bookstore [ +<!ELEMENT bookstore (book*)> +<!ELEMENT book (title,author,genre?)> +<!ELEMENT title (#PCDATA)> +<!ELEMENT author ( first-name+, last-name+ )+ > +<!ELEMENT genre (to,from,header,(message| body))> +<!ELEMENT first-name (#PCDATA)> +<!ELEMENT last-name (#PCDATA) > +<!ATTLIST book price CDATA #REQUIRED> +<!ATTLIST book publication_date CDATA> +<!ATTLIST book IBSN CDATA> ]> -<!ELEMENT bookstore (book*)> -<!ELEMENT book (title,author,genre?)> -<!ELEMENT title (#PCDATA)> -<!ELEMENT author ( first-name+, last-name+ )+ > -<!ELEMENT genre (to,from,header,(message| body))> -<!ELEMENT first-name (#PCDATA)> -<!ELEMENT last-name (#PCDATA) > -<!ATTLIST book price CDATA #REQUIRED> -<!ATTLIST book publication_date CDATA> -<!ATTLIST book IBSN CDATA> +<!ELEMENT bookstore (book*)> +<!ELEMENT book (title,author,genre?)> +<!ELEMENT title (#PCDATA)> +<!ELEMENT author ( first-name+, last-name+ )+ > +<!ELEMENT genre (to,from,header,(message| body))> +<!ELEMENT first-name (#PCDATA)> +<!ELEMENT last-name (#PCDATA) > +<!ATTLIST book price CDATA #REQUIRED> +<!ATTLIST book publication_date CDATA> +<!ATTLIST book IBSN CDATA> diff --git a/tools/developer.html b/tools/developer.html index 8d3f81903a..9bd58d41e1 100644 --- a/tools/developer.html +++ b/tools/developer.html @@ -94,7 +94,6 @@

Code

-