Skip to content

Commit 5852f1c

Browse files
joshgoebeljoshgoebel
committed
(chore) remove meta-keyword and meta-string in favor of nesting
1 parent 3cf0a3a commit 5852f1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+196
-177
lines changed

‎docs/css-classes-reference.rst‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,11 @@ in mind so a better choice (for best theme support) might possibly be ``string``
8080
| meta | flags, modifiers, annotations, processing |
8181
| | instructions, preprocessor directives, etc |
8282
+--------------------------+-------------------------------------------------------------+
83-
| meta-keyword | keyword or built-in within meta construct |
83+
| meta keyword | a keyword inside a meta block |
84+
| | (note this is nested, not subscoped) |
8485
+--------------------------+-------------------------------------------------------------+
85-
| meta-string | string within meta construct |
86+
| meta string | a string inside a meta block |
87+
| | (note this is nested, not subscoped) |
8688
+--------------------------+-------------------------------------------------------------+
8789
| **Tags, attributes, configs** |
8890
+--------------------------+-------------------------------------------------------------+

‎src/languages/1c.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ export default function(hljs) {
450450
begin: '#|&', end: '$',
451451
keywords: {
452452
$pattern: UNDERSCORE_IDENT_RE,
453-
'meta-keyword': KEYWORD + METAKEYWORD
453+
'keyword': KEYWORD + METAKEYWORD
454454
},
455455
contains: [
456456
COMMENTS

‎src/languages/actionscript.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export default function(hljs) {
121121
className: 'meta',
122122
beginKeywords: 'import include',
123123
end: /;/,
124-
keywords: { 'meta-keyword': 'import include' }
124+
keywords: { 'keyword': 'import include' }
125125
},
126126
{
127127
beginKeywords: 'function',

‎src/languages/autoit.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default function(hljs) {
8383
begin: '#',
8484
end: '$',
8585
keywords: {
86-
'meta-keyword': DIRECTIVES
86+
'keyword': DIRECTIVES
8787
},
8888
contains: [
8989
{
@@ -93,13 +93,13 @@ export default function(hljs) {
9393
{
9494
beginKeywords: 'include',
9595
keywords: {
96-
'meta-keyword': 'include'
96+
'keyword': 'include'
9797
},
9898
end: '$',
9999
contains: [
100100
STRING,
101101
{
102-
className: 'meta-string',
102+
className: 'string',
103103
variants: [
104104
{
105105
begin: '<',

‎src/languages/c.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default function(hljs) {
8282
begin: /#\s*[a-z]+\b/,
8383
end: /$/,
8484
keywords: {
85-
'meta-keyword':
85+
'keyword':
8686
'if else elif endif define undef warning error line ' +
8787
'pragma _Pragma ifdef ifndef include'
8888
},
@@ -92,10 +92,10 @@ export default function(hljs) {
9292
relevance: 0
9393
},
9494
hljs.inherit(STRINGS, {
95-
className: 'meta-string'
95+
className: 'string'
9696
}),
9797
{
98-
className: 'meta-string',
98+
className: 'string',
9999
begin: /<.*?>/
100100
},
101101
C_LINE_COMMENT_MODE,

‎src/languages/cpp.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default function(hljs) {
7676
begin: /#\s*[a-z]+\b/,
7777
end: /$/,
7878
keywords: {
79-
'meta-keyword':
79+
'keyword':
8080
'if else elif endif define undef warning error line ' +
8181
'pragma _Pragma ifdef ifndef include'
8282
},
@@ -86,10 +86,10 @@ export default function(hljs) {
8686
relevance: 0
8787
},
8888
hljs.inherit(STRINGS, {
89-
className: 'meta-string'
89+
className: 'string'
9090
}),
9191
{
92-
className: 'meta-string',
92+
className: 'string',
9393
begin: /<.*?>/
9494
},
9595
C_LINE_COMMENT_MODE,

‎src/languages/crystal.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export default function(hljs) {
207207
end: '\\]',
208208
contains: [
209209
hljs.inherit(hljs.QUOTE_STRING_MODE, {
210-
className: 'meta-string'
210+
className: 'string'
211211
})
212212
]
213213
};

‎src/languages/csharp.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ export default function(hljs) {
329329
begin: '#',
330330
end: '$',
331331
keywords: {
332-
'meta-keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'
332+
'keyword': 'if else elif endif define undef warning error line region endregion pragma checksum'
333333
}
334334
},
335335
STRING,
@@ -381,7 +381,7 @@ export default function(hljs) {
381381
excludeEnd: true,
382382
contains: [
383383
{
384-
className: 'meta-string',
384+
className: 'string',
385385
begin: /"/,
386386
end: /"/
387387
}

‎src/languages/dts.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function(hljs) {
4545
begin: '#',
4646
end: '$',
4747
keywords: {
48-
'meta-keyword': 'if else elif endif define undef ifdef ifndef'
48+
'keyword': 'if else elif endif define undef ifdef ifndef'
4949
},
5050
contains: [
5151
{
@@ -56,14 +56,14 @@ export default function(hljs) {
5656
beginKeywords: 'include',
5757
end: '$',
5858
keywords: {
59-
'meta-keyword': 'include'
59+
'keyword': 'include'
6060
},
6161
contains: [
6262
hljs.inherit(STRINGS, {
63-
className: 'meta-string'
63+
className: 'string'
6464
}),
6565
{
66-
className: 'meta-string',
66+
className: 'string',
6767
begin: '<',
6868
end: '>',
6969
illegal: '\\n'
@@ -82,7 +82,7 @@ export default function(hljs) {
8282
};
8383

8484
const KEYWORD = {
85-
className: 'meta',
85+
className: 'keyword',
8686
begin: '/[a-z][a-z\\d-]*/'
8787
};
8888

‎src/languages/gams.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export default function(hljs) {
119119
returnBegin: true,
120120
contains: [
121121
{
122-
className: 'meta-keyword',
122+
className: 'keyword',
123123
begin: '^\\$[a-z0-9]+'
124124
}
125125
]

0 commit comments

Comments
 (0)
⚡