Skip to content

Commit 55ca5c6

Browse files
datho7561datho7561
committed
Permissive int and float syntax highlighting
- Clean up the regex used to syntax highlight integers, booleans, and floats - Permit integers beginning with one or multiple `0`s - `<<` is syntax highlighted as an operator instead of having no scope (this means it changes in some themes, such as Monokai) Signed-off-by: David Thompson <davthomp@redhat.com>
1 parent a85cbe4 commit 55ca5c6

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

‎syntaxes/yaml.tmLanguage.json‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -448,16 +448,10 @@
448448
"name": "constant.numeric.float.yaml"
449449
},
450450
"5": {
451-
"name": "constant.other.timestamp.yaml"
452-
},
453-
"6": {
454-
"name": "constant.language.value.yaml"
455-
},
456-
"7": {
457-
"name": "constant.language.merge.yaml"
451+
"name": "keyword.operator.yaml"
458452
}
459453
},
460-
"match": "(?x)\n (?x:\n (null|Null|NULL|~)\n | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n | (\n (?:\n [-+]? 0b [0-1_]+ # (base 2)\n | [-+]? 0 [0-7_]+ # (base 8)\n | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n )\n )\n | (\n (?x:\n [-+]? ( \\. [0-9]+ | [0-9]+ ( \\. [0-9]* )? ) ( [eE] [-+]? [0-9]+ )? # (base 10)\n | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n | \\. (?: nan|NaN|NAN) # (not a number)\n )\n )\n | (\n (?x:\n \\d{4} - \\d{2} - \\d{2} # (y-m-d)\n | \\d{4} # (year)\n - \\d{1,2} # (month)\n - \\d{1,2} # (day)\n (?: [Tt] | [ \\t]+) \\d{1,2} # (hour)\n : \\d{2} # (minute)\n : \\d{2} # (second)\n (?: \\.\\d*)? # (fraction)\n (?:\n (?:[ \\t]*) Z\n | [-+] \\d{1,2} (?: :\\d{1,2})?\n )? # (time zone)\n )\n )\n | (=)\n | (<<)\n )\n (?:\n (?=\n \\s* $\n | \\s+ \\#\n | \\s* : (\\s|$)\n | \\s* : [\\[\\]{},]\n | \\s* [\\[\\]{},]\n )\n )\n "
454+
"match": "(?x) (?x:(null|Null|NULL|~) | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF) | ((?:[-+]? [0-9]+) | (?:0o [0-7]+) | (?:0x [0-9a-fA-F]+) | (?:[-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+)) | ((?:[-+]? (?: \\. [0-9]+ | [0-9]+ (?: \\. [0-9]* )? ) (?: [eE] [-+]? [0-9]+ )?) | (?:[-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]*) | (?:[-+]? (?: \\.inf | \\.Inf | \\.INF )) | (?:\\.nan | \\.NaN | \\.NAN) ) | (<<) ) (?: (?= \\s* $ | \\s+ \\# | \\s* : (\\s|$) | \\s* : [\\[\\]{},] | \\s* [\\[\\]{},] ) )"
461455
}
462456
]
463457
},
@@ -490,16 +484,10 @@
490484
"name": "constant.numeric.float.yaml"
491485
},
492486
"5": {
493-
"name": "constant.other.timestamp.yaml"
494-
},
495-
"6": {
496-
"name": "constant.language.value.yaml"
497-
},
498-
"7": {
499-
"name": "constant.language.merge.yaml"
487+
"name": "keyword.operator.yaml"
500488
}
501489
},
502-
"match": "(?x)\n (?x:\n (null|Null|NULL|~)\n | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n | (\n (?:\n [-+]? 0b [0-1_]+ # (base 2)\n | [-+]? 0 [0-7_]+ # (base 8)\n | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n )\n )\n | (\n (?x:\n [-+]? ( \\. [0-9]+ | [0-9]+ ( \\. [0-9]* )? ) ( [eE] [-+]? [0-9]+ )? # (base 10)\n | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n | \\. (?: nan|NaN|NAN) # (not a number)\n )\n )\n | (\n (?x:\n \\d{4} - \\d{2} - \\d{2} # (y-m-d)\n | \\d{4} # (year)\n - \\d{1,2} # (month)\n - \\d{1,2} # (day)\n (?: [Tt] | [ \\t]+) \\d{1,2} # (hour)\n : \\d{2} # (minute)\n : \\d{2} # (second)\n (?: \\.\\d*)? # (fraction)\n (?:\n (?:[ \\t]*) Z\n | [-+] \\d{1,2} (?: :\\d{1,2})?\n )? # (time zone)\n )\n )\n | (=)\n | (<<)\n )\n (?x:\n (?=\n \\s* $\n | \\s+ \\#\n | \\s* : (\\s|$)\n )\n )\n "
490+
"match": "(?x) (?x:(null|Null|NULL|~) | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF) | ((?:[-+]? [0-9]+) | (?:0o [0-7]+) | (?:0x [0-9a-fA-F]+) | (?:[-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+)) | ((?:[-+]? (?: \\. [0-9]+ | [0-9]+ (?: \\. [0-9]* )? ) (?: [eE] [-+]? [0-9]+ )?) | (?:[-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]*) | (?:[-+]? (?: \\.inf | \\.Inf | \\.INF )) | (?:\\.nan | \\.NaN | \\.NAN) ) | (<<) ) (?x: (?= \\s* $ | \\s+ \\# | \\s* : (\\s|$) ) )"
503491
}
504492
]
505493
},

0 commit comments

Comments
 (0)
⚡