From 2a745f282b2a799d1b51465b15c52faef883a0b3 Mon Sep 17 00:00:00 2001 From: RedCMD Date: Sun, 30 Jun 2024 19:22:38 +1200 Subject: [PATCH] `1.1` Fix line breaks --- syntaxes/yaml-1.1.tmLanguage.json | 173 +++++++++++++++--------------- 1 file changed, 89 insertions(+), 84 deletions(-) diff --git a/syntaxes/yaml-1.1.tmLanguage.json b/syntaxes/yaml-1.1.tmLanguage.json index 4f2d8f8..53b8674 100644 --- a/syntaxes/yaml-1.1.tmLanguage.json +++ b/syntaxes/yaml-1.1.tmLanguage.json @@ -47,14 +47,14 @@ }, "directive-YAML": { "comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives", - "begin": "(?=%YAML[ \t]+1\\.1(?=[\\x{2028 2029}\r\n\t ]))", + "begin": "(?=%YAML[ \t]+1\\.1(?=[\\x{85 2028 2029}\r\n\t ]))", "end": "\\G(?=%(?!YAML[ \t]+1\\.1))", "name": "meta.1.1.yaml", "patterns": [ { "comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives", "begin": "\\G(%)(YAML)([ \t]+)(1\\.1)", - "while": "\\G(?!---[\\x{2028 2029}\r\n\t ])", + "while": "\\G(?!---[\\x{85 2028 2029}\r\n\t ])", "beginCaptures": { "1": { "name": "punctuation.definition.directive.begin.yaml" }, "2": { "name": "keyword.other.directive.yaml.yaml" }, @@ -69,7 +69,7 @@ ] }, { - "begin": "\\G(?=---[\\x{2028 2029}\r\n\t ])", + "begin": "\\G(?=---[\\x{85 2028 2029}\r\n\t ])", "while": "\\G(?!%)", "patterns": [ { "include": "#document" }, @@ -88,7 +88,7 @@ { "include": "source.yaml.1.0#directive-YAML" }, { "begin": "(?=%)", - "while": "\\G(?!%|---[\\x{2028 2029}\r\n\t ])", + "while": "\\G(?!%|---[\\x{85 2028 2029}\r\n\t ])", "name": "meta.directives.yaml", "patterns": [ { @@ -109,7 +109,7 @@ { "comment": "technically the beginning should only validate against a valid uri scheme [A-Za-z][A-Za-z0-9.+-]*", "begin": "\\G[\t ]++(?!#)", - "end": "(?=[\\x{2028 2029}\r\n\t ])", + "end": "(?=[\\x{85 2028 2029}\r\n\t ])", "beginCaptures": { "0": { "name": "punctuation.whitespace.separator.yaml" } }, "contentName": "support.type.tag-prefix.yaml", "patterns": [ @@ -118,7 +118,7 @@ "name": "constant.character.escape.unicode.8-bit.yaml" }, { - "match": "%[^\\x{2028 2029}\r\n\t ]{2,0}", + "match": "%[^\\x{85 2028 2029}\r\n\t ]{2,0}", "name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml" }, { @@ -127,7 +127,7 @@ }, { "include": "#non-printable" }, { - "match": "[^\\x{2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]]++", + "match": "[^\\x{85 2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]]++", "name": "invalid.illegal.unrecognized.yaml" } ] @@ -162,7 +162,7 @@ ] }, { - "match": "\\G\\.{3}(?=[\\x{2028 2029}\r\n\t ])", + "match": "\\G\\.{3}(?=[\\x{85 2028 2029}\r\n\t ])", "name": "invalid.illegal.entity.other.document.end.yaml" }, { "include": "#presentation-detail" } @@ -173,7 +173,7 @@ "directive-invalid": { "patterns": [ { - "match": "\\G\\.{3}(?=[\\x{2028 2029}\r\n\t ])", + "match": "\\G\\.{3}(?=[\\x{85 2028 2029}\r\n\t ])", "name": "invalid.illegal.entity.other.document.end.yaml" }, { @@ -201,14 +201,14 @@ "comment": "https://yaml.org/spec/1.2.2/#91-documents", "patterns": [ { - "begin": "---(?=[\\x{2028 2029}\r\n\t ])", - "while": "\\G(?!(?>\\.{3}|---)[\\x{2028 2029}\r\n\t ])", + "begin": "---(?=[\\x{85 2028 2029}\r\n\t ])", + "while": "\\G(?!(?>\\.{3}|---)[\\x{85 2028 2029}\r\n\t ])", "beginCaptures": { "0": { "name": "entity.other.document.begin.yaml" } }, "name": "meta.document.yaml", "patterns": [ { "include": "#block-node" } ] }, { - "begin": "(?=\\.{3}[\\x{2028 2029}\r\n\t ])", + "begin": "(?=\\.{3}[\\x{85 2028 2029}\r\n\t ])", "while": "\\G(?=[\t \\x{FEFF}]*+(?>#|$))", "patterns": [ { @@ -223,7 +223,7 @@ }, { "begin": "\\G(?!%|[\t \\x{FEFF}]*+(?>#|$))", - "while": "\\G(?!(?>\\.{3}|---)[\\x{2028 2029}\r\n\t ])", + "while": "\\G(?!(?>\\.{3}|---)[\\x{85 2028 2029}\r\n\t ])", "name": "meta.document.yaml", "patterns": [ { "include": "#block-node" } ] } @@ -258,8 +258,8 @@ }, "block-mapping": { "//": "The check for plain keys is expensive", - "begin": "(?=((?<=[-?:]) )?+)(?[!&*][^\\x{2028 2029}\r\n\t ]*+[\t ]++)*+)(?=(?>(?#Double Quote)\"(?>[^\\\\\"]++|\\\\.)*+\"|(?#Single Quote)'(?>[^']++|'')*+'|(?#Plain)(?>[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\\x{2028 2029}\r\n\t ]))(?>[^:#]++|:(?![\\x{2028 2029}\r\n\t ])|(?(\\1\\2)((?>[!&*][^\\x{2028 2029}\r\n\t ]*+[\t ]++)*+)((?>\t[\t ]*+)?+[^\\x{2028 2029}\r\n\t ?:\\-#!&*\"'\\[\\]{}0-9A-Za-z$()+./;<=\\\\^_~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}])?+|( *+)([\t ]*+[^\r\n#])?+)", + "begin": "(?=((?<=[-?:]) )?+)(?[!&*][^\\x{85 2028 2029}\r\n\t ]*+[\t ]++)*+)(?=(?>(?#Double Quote)\"(?>[^\\\\\"]++|\\\\.)*+\"|(?#Single Quote)'(?>[^']++|'')*+'|(?#Plain)(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))(?>[^:#]++|:(?![\\x{85 2028 2029}\r\n\t ])|(?(\\1\\2)((?>[!&*][^\\x{85 2028 2029}\r\n\t ]*+[\t ]++)*+)((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t ?:\\-#!&*\"'\\[\\]{}0-9A-Za-z$()+./;<=\\\\^_~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}])?+|( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)", "beginCaptures": { "2": { "name": "punctuation.whitespace.indentation.yaml" }, "3": { "name": "punctuation.whitespace.separator.yaml" }, @@ -342,8 +342,8 @@ }, "block-sequence": { "comment": "https://yaml.org/spec/1.2.2/#rule-l+block-sequence", - "begin": "(?=((?<=[-?:]) )?+)(?(\\1\\2)(?!-[\\x{2028 2029}\r\n\t ])((?>\t[\t ]*+)?+[^\\x{2028 2029}\r\n\t #\\]}])?+|(?!\\1\\2)( *+)([\t ]*+[^\r\n#])?+)", + "begin": "(?=((?<=[-?:]) )?+)(?(\\1\\2)(?!-[\\x{85 2028 2029}\r\n\t ])((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t #\\]}])?+|(?!\\1\\2)( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)", "beginCaptures": { "2": { "name": "punctuation.whitespace.indentation.yaml" }, "3": { "name": "punctuation.definition.block.sequence.item.yaml" } @@ -359,8 +359,8 @@ }, "block-map-explicit": { "comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-explicit-key", - "begin": "(?=((?<=[-?:]) )?+)\\G( *+)(\\?)(?=[\\x{2028 2029}\r\n\t ])", - "while": "\\G(?>(\\1\\2)(?![?:0-9A-Za-z$()+./;<=\\\\^_~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{FEFF}]])((?>\t[\t ]*+)?+[^\\x{2028 2029}\r\n\t #\\-\\[\\]{}])?+|(?!\\1\\2)( *+)([\t ]*+[^\r\n#])?+)", + "begin": "(?=((?<=[-?:]) )?+)\\G( *+)(\\?)(?=[\\x{85 2028 2029}\r\n\t ])", + "while": "\\G(?>(\\1\\2)(?![?:0-9A-Za-z$()+./;<=\\\\^_~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029 FEFF}]])((?>\t[\t ]*+)?+[^\\x{85 2028 2029}\r\n\t #\\-\\[\\]{}])?+|(?!\\1\\2)( *+)([\t ]*+[^\\x{85 2028 2029}\r\n#])?+)", "beginCaptures": { "2": { "name": "punctuation.whitespace.indentation.yaml" }, "3": { "name": "punctuation.definition.map.key.yaml" }, @@ -383,16 +383,16 @@ }, "block-map-value": { "comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value", - "begin": "(:)(?=[\\x{2028 2029}\r\n\t ])", - "while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{FEFF}]]|-[^\\x{2028 2029}\r\n\t ])", + "begin": "(:)(?=[\\x{85 2028 2029}\r\n\t ])", + "while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029 FEFF}]]|-[^\\x{85 2028 2029}\r\n\t ])", "beginCaptures": { "1": { "name": "punctuation.separator.map.value.yaml" } }, "name": "meta.map.value.yaml", "patterns": [ { "include": "#block-node" } ] }, "block-key-plain": { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-one-line (BLOCK-KEY)", - "begin": "\\G(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\\x{2028 2029}\r\n\t ]))", - "end": "(?=[\t ]*+:[\\x{2028 2029}\r\n\t ]|(?>[\t ]++|\\G)#)", + "begin": "\\G(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))", + "end": "(?=[\t ]*+:[\\x{85 2028 2029}\r\n\t ]|(?>[\t ]++|\\G)#)", "name": "meta.map.key.yaml string.unquoted.other.yaml entity.name.tag.yaml", "patterns": [ { "include": "#tag-implicit-plain-out" }, @@ -520,7 +520,7 @@ }, "block-plain-out": { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-multi-line (FLOW-OUT)", - "begin": "(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\\x{2028 2029}\r\n\t ]))", + "begin": "(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))", "while": "\\G", "patterns": [ { @@ -530,7 +530,7 @@ "patterns": [ { "include": "#tag-implicit-plain-out" }, { - "match": ":(?=[\\x{2028 2029}\r\n\t ])", + "match": ":(?=[\\x{85 2028 2029}\r\n\t ])", "name": "invalid.illegal.multiline-key.yaml" }, { @@ -575,8 +575,8 @@ "patterns": [ { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-map-entries", - "begin": "(?<={)\\G(?=[\\x{2028 2029}\r\n\t ,#])|,", - "end": "(?=[^\\x{2028 2029}\r\n\t ,#])", + "begin": "(?<={)\\G(?=[\\x{85 2028 2029}\r\n\t ,#])|,", + "end": "(?=[^\\x{85 2028 2029}\r\n\t ,#])", "beginCaptures": { "0": { "name": "punctuation.separator.mapping.yaml" } }, "patterns": [ { @@ -602,8 +602,8 @@ "patterns": [ { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-flow-seq-entries", - "begin": "(?<=\\[)\\G(?=[\\x{2028 2029}\r\n\t ,#])|,", - "end": "(?=[^\\x{2028 2029}\r\n\t ,#])", + "begin": "(?<=\\[)\\G(?=[\\x{85 2028 2029}\r\n\t ,#])|,", + "end": "(?=[^\\x{85 2028 2029}\r\n\t ,#])", "beginCaptures": { "0": { "name": "punctuation.separator.sequence.yaml" } }, "patterns": [ { @@ -623,7 +623,7 @@ "comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)", "patterns": [ { - "begin": "\\?(?=[\\x{2028 2029}\r\n\t ,\\[\\]{}])", + "begin": "\\?(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])", "end": "(?=[,\\[\\]{}])", "beginCaptures": { "0": { "name": "punctuation.definition.map.key.yaml" } }, "name": "meta.flow.map.explicit.yaml", @@ -636,7 +636,7 @@ }, { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)", - "begin": "(?=(?>[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\\x{2028 2029}\r\n\t ,\\[\\]{}])))", + "begin": "(?=(?>[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}])))", "end": "(?=[,\\[\\]{}])", "name": "meta.flow.map.implicit.yaml", "patterns": [ @@ -667,7 +667,7 @@ "comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-entry (FLOW-IN)", "patterns": [ { - "begin": "\\?(?=[\\x{2028 2029}\r\n\t ,\\[\\]{}])", + "begin": "\\?(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])", "end": "(?=[,\\[\\]{}])", "beginCaptures": { "0": { "name": "punctuation.definition.map.key.yaml" } }, "name": "meta.flow.map.explicit.yaml", @@ -680,7 +680,7 @@ }, { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-flow-map-implicit-entry (FLOW-IN)", - "begin": "(?<=[\t ,\\[{]|^)(?=(?>[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\\x{2028 2029}\r\n\t ,\\[\\]{}]))(?>[^:#,\\[\\]{}]++|:(?![\\x{2028 2029}\r\n\t ,\\[\\]{}])|(?[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))(?>[^:#,\\[\\]{}]++|:(?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}])|(?'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "begin": "(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "end": "(?=(?>[\t ]++|\\G)#|[\t ]*+[,\\[\\]{}])", "name": "string.unquoted.other.in.yaml", "patterns": [ @@ -739,7 +739,7 @@ "name": "punctuation.whitespace.separator.yaml" }, { - "match": ":(?=[\\x{2028 2029}\r\n\t ,\\[\\]{}])", + "match": ":(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])", "name": "invalid.illegal.multiline-key.yaml" }, { "include": "#non-printable" } @@ -747,8 +747,8 @@ }, "flow-key-plain-out": { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-one-line (FLOW-OUT)", - "begin": "(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\\x{2028 2029}\r\n\t ]))", - "end": "(?=[\t ]*+:[\\x{2028 2029}\r\n\t ]|[\t ]++#)", + "begin": "(?=[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}]|[?:-](?![\\x{85 2028 2029}\r\n\t ]))", + "end": "(?=[\t ]*+:[\\x{85 2028 2029}\r\n\t ]|[\t ]++#)", "name": "meta.map.key.yaml string.unquoted.other.yaml entity.name.tag.yaml", "patterns": [ { "include": "#tag-implicit-plain-out" }, @@ -765,8 +765,8 @@ }, "flow-key-plain-in": { "comment": "https://yaml.org/spec/1.2.2/#rule-ns-s-implicit-yaml-key (FLOW-KEY)", - "begin": "\\G(?![\\x{2028 2029}\r\n\t #])", - "end": "(?=[\t ]*+(?>:[\\x{2028 2029}\r\n\t ,\\[\\]{}]|[,\\[\\]{}])|[\t ]++#)", + "begin": "\\G(?![\\x{85 2028 2029}\r\n\t #])", + "end": "(?=[\t ]*+(?>:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]|[,\\[\\]{}])|[\t ]++#)", "name": "meta.flow.map.key.yaml string.unquoted.other.in.yaml entity.name.tag.yaml", "patterns": [ { "include": "#tag-implicit-plain-in" }, @@ -823,7 +823,7 @@ "name": "punctuation.whitespace.separator.yaml" }, { - "match": "[^\\x{2028 2029}\r\n\t -\\x{10FFFF}]++", + "match": "[^\\x{85 2028 2029}\r\n\t -\\x{10FFFF}]++", "name": "invalid.illegal.character.yaml" }, { "include": "#double-escape" } @@ -846,7 +846,7 @@ "name": "punctuation.whitespace.separator.yaml" }, { - "match": "[^\\x{2028 2029}\r\n\t -\\x{10FFFF}]++", + "match": "[^\\x{85 2028 2029}\r\n\t -\\x{10FFFF}]++", "name": "invalid.illegal.character.yaml" }, { @@ -859,7 +859,7 @@ "comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-esc-char", "patterns": [ { - "match": "\\\\[\\x{2028 2029}\r\n\t0abtnvfre \"\\\\N_LP]", + "match": "\\\\[\\x{85 2028 2029}\r\n\t0abtnvfre \"\\\\N_LP]", "name": "constant.character.escape.yaml" }, { @@ -884,64 +884,64 @@ "comment": "https://yaml.org/type/index.html", "patterns": [ { - "match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.language.null.yaml" }, { - "match": "\\G(?>true|True|TRUE|false|False|FALSE|y|Y|yes|Yes|YES|n|N|no|No|NO|on|On|ON|off|Off|OFF)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G(?>true|True|TRUE|false|False|FALSE|y|Y|yes|Yes|YES|n|N|no|No|NO|on|On|ON|off|Off|OFF)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.language.boolean.yaml" }, { - "match": "\\G[-+]?+(0|[1-9][0-9_]*+)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?+(0|[1-9][0-9_]*+)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.integer.decimal.yaml" }, { - "match": "\\G[-+]?+0b[0-1_]++(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?+0b[0-1_]++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.integer.binary.yaml" }, { - "match": "\\G[-+]?0[0-7_]++(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?0[0-7_]++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.integer.octal.yaml" }, { - "match": "\\G[-+]?+0x[0-9a-fA-F_]++(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?+0x[0-9a-fA-F_]++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.integer.hexadecimal.yaml" }, { - "match": "\\G[-+]?+[1-9][0-9_]*+(?>:[0-5]?[0-9])++(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?+[1-9][0-9_]*+(?>:[0-5]?[0-9])++(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.integer.Sexagesimal.yaml" }, { - "match": "\\G[-+]?+(?>[0-9][0-9_]*+)?+\\.[0-9.]*+(?>[eE][-+][0-9]+)?+(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?+(?>[0-9][0-9_]*+)?+\\.[0-9.]*+(?>[eE][-+][0-9]+)?+(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.float.decimal.yaml" }, { - "match": "\\G[-+]?+[0-9][0-9_]*+(?>:[0-5]?[0-9])++\\.[0-9_]*+(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?+[0-9][0-9_]*+(?>:[0-5]?[0-9])++\\.[0-9_]*+(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.float.Sexagesimal.yaml" }, { - "match": "\\G[-+]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G[-+]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.float.inf.yaml" }, { - "match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.float.nan.yaml" }, { "comment": "https://www.w3.org/TR/NOTE-datetime does not allow spaces, however https://yaml.org/type/timestamp.html does, but the provided regex doesn't match the TZD space in many of the YAML examples", - "match": "\\G(?>[0-9]{4}-[0-9]{2,1}-[0-9]{2,1}(?>T|t|[\t ]++)[0-9]{2,1}:[0-9]{2}:[0-9]{2}(?>\\.[0-9]*+)?+[\t ]*+(?>Z|[-+][0-9]{2,1}(?>:[0-9]{2})?+)?+|[0-9]{4}-[0-9]{2}-[0-9]{2})(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G(?>[0-9]{4}-[0-9]{2,1}-[0-9]{2,1}(?>T|t|[\t ]++)[0-9]{2,1}:[0-9]{2}:[0-9]{2}(?>\\.[0-9]*+)?+[\t ]*+(?>Z|[-+][0-9]{2,1}(?>:[0-9]{2})?+)?+|[0-9]{4}-[0-9]{2}-[0-9]{2})(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.numeric.timestamp.yaml" }, { - "match": "\\G<<(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G<<(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.language.merge.yaml" }, { - "match": "\\G=(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G=(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.language.value.yaml" }, { - "match": "\\G(?>!|&|\\*)(?=[\t ]++#|[\t ]*+(?>[\r\n,\\]}]|:[\\x{2028 2029}\r\n\t ,\\[\\]{}]))", + "match": "\\G(?>!|&|\\*)(?=[\t ]++#|[\t ]*+(?>[\\x{85 2028 2029}\r\n,\\]}]|:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]))", "name": "constant.language.yaml.yaml" } ] @@ -950,64 +950,64 @@ "comment": "https://yaml.org/type/index.html", "patterns": [ { - "match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G(?>null|Null|NULL|~)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.language.null.yaml" }, { - "match": "\\G(?>true|True|TRUE|false|False|FALSE|yes|Yes|YES|y|Y|no|No|NO|n|N|on|On|ON|off|Off|OFF)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G(?>true|True|TRUE|false|False|FALSE|yes|Yes|YES|y|Y|no|No|NO|n|N|on|On|ON|off|Off|OFF)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.language.boolean.yaml" }, { - "match": "\\G[-+]?+(0|[1-9][0-9_]*+)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?+(0|[1-9][0-9_]*+)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.integer.decimal.yaml" }, { - "match": "\\G[-+]?+0b[0-1_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?+0b[0-1_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.integer.binary.yaml" }, { - "match": "\\G[-+]?0[0-7_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?0[0-7_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.integer.octal.yaml" }, { - "match": "\\G[-+]?+0x[0-9a-fA-F_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?+0x[0-9a-fA-F_]++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.integer.hexadecimal.yaml" }, { - "match": "\\G[-+]?+[1-9][0-9_]*+(?>:[0-5]?[0-9])++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?+[1-9][0-9_]*+(?>:[0-5]?[0-9])++(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.integer.Sexagesimal.yaml" }, { - "match": "\\G[-+]?+(?>[0-9][0-9_]*+)?+\\.[0-9.]*+(?>[eE][-+][0-9]+)?+(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?+(?>[0-9][0-9_]*+)?+\\.[0-9.]*+(?>[eE][-+][0-9]+)?+(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.float.decimal.yaml" }, { - "match": "\\G[-+]?+[0-9][0-9_]*+(?>:[0-5]?[0-9])++\\.[0-9_]*+(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?+[0-9][0-9_]*+(?>:[0-5]?[0-9])++\\.[0-9_]*+(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.float.Sexagesimal.yaml" }, { - "match": "\\G[-+]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G[-+]?+\\.(?>inf|Inf|INF)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.float.inf.yaml" }, { - "match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G\\.(?>nan|NaN|NAN)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.float.nan.yaml" }, { "comment": "https://www.w3.org/TR/NOTE-datetime does not allow spaces, however https://yaml.org/type/timestamp.html does, but the provided regex doesn't match the TZD space in many of the YAML examples", - "match": "\\G(?>[0-9]{4}-[0-9]{2,1}-[0-9]{2,1}(?>T|t|[\t ]++)[0-9]{2,1}:[0-9]{2}:[0-9]{2}(?>\\.[0-9]*+)?+[\t ]*+(?>Z|[-+][0-9]{2,1}(?>:[0-9]{2})?+)?+|[0-9]{4}-[0-9]{2}-[0-9]{2})(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G(?>[0-9]{4}-[0-9]{2,1}-[0-9]{2,1}(?>T|t|[\t ]++)[0-9]{2,1}:[0-9]{2}:[0-9]{2}(?>\\.[0-9]*+)?+[\t ]*+(?>Z|[-+][0-9]{2,1}(?>:[0-9]{2})?+)?+|[0-9]{4}-[0-9]{2}-[0-9]{2})(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.numeric.timestamp.yaml" }, { - "match": "\\G<<(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G<<(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.language.merge.yaml" }, { - "match": "\\G=(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G=(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.language.value.yaml" }, { - "match": "\\G(?>!|&|\\*)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{2028 2029}\r\n\t ]))", + "match": "\\G(?>!|&|\\*)(?=[\t ]++#|[\t ]*+(?>$|:[\\x{85 2028 2029}\r\n\t ]))", "name": "constant.language.yaml.yaml" } ] @@ -1025,7 +1025,7 @@ ], "patterns": [ { - "match": "!(?=[\\x{2028 2029}\r\n\t ])", + "match": "!(?=[\\x{85 2028 2029}\r\n\t ])", "name": "storage.type.tag.non-specific.yaml punctuation.definition.tag.non-specific.yaml" }, { @@ -1041,12 +1041,12 @@ "name": "constant.character.escape.unicode.8-bit.yaml" }, { - "match": "%[^\\x{2028 2029}\r\n\t ]{2,0}", + "match": "%[^\\x{85 2028 2029}\r\n\t ]{2,0}", "name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml" }, { "include": "#non-printable" }, { - "match": "[^\\x{2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]%>]++", + "match": "[^\\x{85 2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]%>]++", "name": "invalid.illegal.unrecognized.yaml" } ] @@ -1054,7 +1054,7 @@ { "comment": "https://yaml.org/spec/1.2.2/#rule-c-ns-shorthand-tag", "begin": "(?=!)", - "end": "(?=[\\x{2028 2029}\r\n\t ,\\[\\]{}])", + "end": "(?=[\\x{85 2028 2029}\r\n\t ,\\[\\]{}])", "name": "storage.type.tag.shorthand.yaml", "patterns": [ { @@ -1080,12 +1080,12 @@ "name": "constant.character.escape.unicode.8-bit.yaml" }, { - "match": "%[^\\x{2028 2029}\r\n\t ]{2,0}", + "match": "%[^\\x{85 2028 2029}\r\n\t ]{2,0}", "name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml" }, { "include": "#non-printable" }, { - "match": "[^\\x{2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.~*'()\\[\\]%]++", + "match": "[^\\x{85 2028 2029}\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.~*'()\\[\\]%]++", "name": "invalid.illegal.unrecognized.yaml" } ] @@ -1103,7 +1103,7 @@ }, "alias": { "begin": "(\\*)([^ \\p{Cntrl}\\p{Surrogate}\\x{2028 2029 FFFE FFFF}]++)|(\\*)", - "end": "(?=:[\\x{2028 2029}\r\n\t ,\\[\\]{}]|[,\\[\\]{}])", + "end": "(?=:[\\x{85 2028 2029}\r\n\t ,\\[\\]{}]|[,\\[\\]{}])", "captures": { "0": { "name": "keyword.control.flow.alias.yaml" }, "1": { "name": "punctuation.definition.alias.yaml" }, @@ -1115,7 +1115,7 @@ "byte-order-mark": { "comment": "", "begin": "\\G", - "while": "\\G(?=[\\x{85 2028 2029 FEFF}\r\n\t ])", + "while": "\\G(?=[\\x{FEFF 85 2028 2029}\r\n\t ])", "patterns": [ { "begin": "(?=#)", @@ -1137,6 +1137,11 @@ "match": "[\t ]++", "name": "punctuation.whitespace.separator.yaml" }, + { + "comment": "https://yaml.org/spec/1.1/#id871136", + "match": "[\\x{85 2028 2029}\r\n]++", + "name": "punctuation.separator.line-break.yaml" + }, { "include": "#non-printable" }, { "include": "#comment" }, { "include": "#unknown" } @@ -1182,15 +1187,15 @@ } }, "comment": { - "comment": "Comments must be separated from other tokens by white space characters. `space`, `tab`, `newline` or `carriage-return`. `#(.*)` causes performance issues", - "begin": "(?<=^|[\\x{FEFF 85 2028 2029}\t ])#", + "comment": "Comments must be separated from other tokens by white space characters. `space`, `newline` or `carriage-return`. `#(.*)` causes performance issues", + "begin": "(?<=^|[\\x{FEFF 85 2028 2029} ])#", "end": "[\\x{85 2028 2029}\r\n]", "captures": { "0": { "name": "punctuation.definition.comment.yaml" } }, "name": "comment.line.number-sign.yaml", "patterns": [ { "include": "#non-printable" } ] }, "unknown": { - "match": ".[[^#\"':,\\[\\]{}]&&!-~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}]*+", + "match": ".[[^\\x{85}#\"':,\\[\\]{}]&&!-~\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}]*+", "name": "invalid.illegal.unrecognized.yaml markup.strikethrough" } }