Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 5 commits into from May 14, 2021
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3cf0a3a
update dev tool list of themes
joshgoebel Apr 22, 2021
5852f1c
(chore) remove meta-keyword and meta-string in favor of nesting
joshgoebel Apr 23, 2021
40ac23b
Don't unnecessarily quote 'keyword' in objects
allejo May 14, 2021
ffd68e4
Merge branch 'main' into meta_scopes
joshgoebel May 14, 2021
bbb4d8b
document
joshgoebel May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/css-classes-reference.rst
View file
Open in desktop
Expand Up @@ -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** |
+--------------------------+-------------------------------------------------------------+
Expand Down
2 changes: 1 addition & 1 deletion src/languages/1c.js
View file
Open in desktop
Expand Up @@ -450,7 +450,7 @@ export default function(hljs) {
begin: '#|&', end: '$',
keywords: {
$pattern: UNDERSCORE_IDENT_RE,
'meta-keyword': KEYWORD + METAKEYWORD
keyword: KEYWORD + METAKEYWORD
},
contains: [
COMMENTS
Expand Down
2 changes: 1 addition & 1 deletion src/languages/actionscript.js
View file
Open in desktop
Expand Up @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions src/languages/autoit.js
View file
Open in desktop
Expand Up @@ -83,7 +83,7 @@ export default function(hljs) {
begin: '#',
end: '$',
keywords: {
'meta-keyword': DIRECTIVES
keyword: DIRECTIVES
},
contains: [
{
Expand All @@ -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: '<',
Expand Down
6 changes: 3 additions & 3 deletions src/languages/c.js
View file
Open in desktop
Expand Up @@ -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'
},
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/languages/cpp.js
View file
Open in desktop
Expand Up @@ -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'
},
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/languages/crystal.js
View file
Open in desktop
Expand Up @@ -207,7 +207,7 @@ export default function(hljs) {
end: '\\]',
contains: [
hljs.inherit(hljs.QUOTE_STRING_MODE, {
className: 'meta-string'
className: 'string'
})
]
};
Expand Down
4 changes: 2 additions & 2 deletions src/languages/csharp.js
View file
Open in desktop
Expand Up @@ -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,
Expand Down Expand Up @@ -381,7 +381,7 @@ export default function(hljs) {
excludeEnd: true,
contains: [
{
className: 'meta-string',
className: 'string',
begin: /"/,
end: /"/
}
Expand Down
10 changes: 5 additions & 5 deletions src/languages/dts.js
View file
Open in desktop
Expand Up @@ -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: [
{
Expand All @@ -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'
Expand All @@ -82,7 +82,7 @@ export default function(hljs) {
};

const KEYWORD = {
className: 'meta',
className: 'keyword',
begin: '/[a-z][a-z\\d-]*/'
};

Expand Down
2 changes: 1 addition & 1 deletion src/languages/gams.js
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ export default function(hljs) {
returnBegin: true,
contains: [
{
className: 'meta-keyword',
className: 'keyword',
begin: '^\\$[a-z0-9]+'
}
]
Expand Down
6 changes: 3 additions & 3 deletions src/languages/gauss.js
View file
Open in desktop
Expand Up @@ -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: [
{
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/languages/haxe.js
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ export default function(hljs) {
begin: '#',
end: '$',
keywords: {
'meta-keyword': 'if else elseif end error'
keyword: 'if else elseif end error'
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/languages/hsp.js
View file
Open in desktop
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/languages/kotlin.js
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ export default function(hljs) {
end: /\)/,
contains: [
hljs.inherit(STRING, {
className: 'meta-string'
className: 'string'
})
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/languages/makefile.js
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ export default function(hljs) {
end: /$/,
keywords: {
$pattern: /[\.\w]+/,
'meta-keyword': '.PHONY'
keyword: '.PHONY'
}
};
/* Targets */
Expand Down
2 changes: 1 addition & 1 deletion src/languages/monkey.js
View file
Open in desktop
Expand Up @@ -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'
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions src/languages/objectivec.js
View file
Open in desktop
Expand Up @@ -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'
},
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/languages/openscad.js
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ export default function(hljs) {
const PREPRO = {
className: 'meta',
keywords: {
'meta-keyword': 'include use'
keyword: 'include use'
},
begin: 'include|use <',
end: '>'
Expand Down
2 changes: 1 addition & 1 deletion src/languages/r.js
View file
Open in desktop
Expand Up @@ -108,7 +108,7 @@ export default function(hljs) {
begin: /@[a-zA-Z]+/
},
{
className: 'meta-keyword',
className: 'keyword',
begin: /\\[a-zA-Z]+/,
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/languages/rust.js
View file
Open in desktop
Expand Up @@ -243,7 +243,7 @@ export default function(hljs) {
end: '\\]',
contains: [
{
className: 'meta-string',
className: 'string',
begin: /"/,
end: /"/
}
Expand Down
6 changes: 3 additions & 3 deletions src/languages/sqf.js
View file
Open in desktop
Expand Up @@ -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: [
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/languages/vbnet.js
View file
Open in desktop
Expand Up @@ -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 ]
Expand Down
2 changes: 1 addition & 1 deletion src/languages/verilog.js
View file
Open in desktop
Expand Up @@ -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 ' +
Expand Down
6 changes: 3 additions & 3 deletions src/languages/xml.js
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ export default function(hljs) {
begin: /\s/,
contains: [
{
className: 'meta-keyword',
className: 'keyword',
begin: /#?[a-z_][a-z1-9_-]+/,
illegal: /\n/
}
Expand All @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion src/styles/arduino-light.css
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/styles/atom-one-dark-reasonable.css
View file
Open in desktop
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/styles/atom-one-dark.css
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ hue-6-2: #e6c07b
.hljs-regexp,
.hljs-addition,
.hljs-attribute,
.hljs-meta-string {
.hljs-meta .hljs-string {
color: #98c379;
}

Expand Down
2 changes: 1 addition & 1 deletion src/styles/atom-one-light.css
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ hue-6-2: #c18401
.hljs-regexp,
.hljs-addition,
.hljs-attribute,
.hljs-meta-string {
.hljs-meta .hljs-string {
color: #50a14f;
}

Expand Down