From c4d380c266e4355f3a65437874a2fbdbd62e2e5b Mon Sep 17 00:00:00 2001 From: Todd Lewis Date: Sat, 13 May 2017 04:07:47 -0400 Subject: [PATCH] yaml: handle plain strings w/ non-initial quotes (#25) --- yaml.jsf | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/yaml.jsf b/yaml.jsf index 810d9f5..9d88635 100644 --- a/yaml.jsf +++ b/yaml.jsf @@ -24,10 +24,10 @@ " " line_start :idle Constant - * idle + * plain_scalar noeat "\n" line_start "%" directive recolor=-1 - " " maybe_line_comment + " " maybe_idle_comment "'" string_sq_1 recolor=-1 "\"" string_dq_1 recolor=-1 "{[]}" brace recolor=-1 @@ -35,9 +35,16 @@ "*&" maybe_reference "!" maybe_typecast +:plain_scalar Constant + * plain_scalar + "\t" bad_tab recolor=-1 + "\n" line_start noeat + " " maybe_plain_scalar_comment + :maybe_key Idle * maybe_key1 recolor=-1 mark - "\n%#'\"{[]}*&!" idle noeat + "\n" line_start + "%#'\"{[]}*&!" idle noeat "-" maybe_block1 mark :maybe_key1 Constant @@ -56,7 +63,11 @@ :bad_tab BadTab * line_start noeat -:maybe_line_comment Comment +:maybe_plain_scalar_comment Comment + * plain_scalar noeat + "#" line_comment + +:maybe_idle_comment Comment * idle noeat "#" line_comment