diff --git a/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).YAML-tmLanguage b/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).YAML-tmLanguage index 91c84197..6aaf78d6 100644 --- a/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).YAML-tmLanguage +++ b/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).YAML-tmLanguage @@ -294,18 +294,15 @@ repository: # multi-line (block style) - name: meta.match.block.yaml-tmlanguage contentName: meta.value.yaml-tmlanguage - # I don't have a single fucking clue why but apparently removing - # the empty capturing group BREAKS the regexp - begin: ^( *)(?:-?( +)())((["']?)(match|begin|end)(\3))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$) + begin: ^( *)-?( +)((["']?)(match|begin|end)(\4))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$) beginCaptures: - '4': {name: string.other.quoted-or-unquoted.yaml-tmlanguage} - '5': {name: punctuation.definition.string.yaml-tmlanguage} - '6': {name: keyword.other.match.yaml-tmlanguage} - '7': {name: punctuation.definition.string.yaml-tmlanguage} - '8': {name: keyword.control.definition.yaml-tmlanguage} - - '9': {name: keyword.control.block.yaml-tmlanguage} - '10': {name: constant.numeric.indentation-indicator.yaml-tmlanguage} + '3': {name: string.other.quoted-or-unquoted.yaml-tmlanguage} + '4': {name: punctuation.definition.string.yaml-tmlanguage} + '5': {name: keyword.other.match.yaml-tmlanguage} + '6': {name: punctuation.definition.string.yaml-tmlanguage} + '7': {name: keyword.control.definition.yaml-tmlanguage} + '8': {name: keyword.control.block.yaml-tmlanguage} + '9': {name: constant.numeric.indentation-indicator.yaml-tmlanguage} # must be indented by at least as much as the key line + 1 (+ 1 for the potential '-') end: ^(?! *$|\1\2 ) patterns: diff --git a/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).tmLanguage b/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).tmLanguage index 6191787b..7825a683 100644 --- a/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).tmLanguage +++ b/Package/TextMate Syntax Definition (YAML)/TextMate Syntax Definition (YAML).tmLanguage @@ -661,43 +661,43 @@ comment begin - ^( *)(?:-?( +)())((["']?)(match|begin|end)(\3))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$) + ^( *)-?( +)((["']?)(match|begin|end)(\4))(:) +([|>](\d*)[-+]?)(?=, |,$| +#| *$) beginCaptures - 10 + 3 name - constant.numeric.indentation-indicator.yaml-tmlanguage + string.other.quoted-or-unquoted.yaml-tmlanguage 4 name - string.other.quoted-or-unquoted.yaml-tmlanguage + punctuation.definition.string.yaml-tmlanguage 5 name - punctuation.definition.string.yaml-tmlanguage + keyword.other.match.yaml-tmlanguage 6 name - keyword.other.match.yaml-tmlanguage + punctuation.definition.string.yaml-tmlanguage 7 name - punctuation.definition.string.yaml-tmlanguage + keyword.control.definition.yaml-tmlanguage 8 name - keyword.control.definition.yaml-tmlanguage + keyword.control.block.yaml-tmlanguage 9 name - keyword.control.block.yaml-tmlanguage + constant.numeric.indentation-indicator.yaml-tmlanguage contentName