summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormurphy <murphy@rubychan.de>2010-06-16 18:42:30 +0000
committermurphy <murphy@rubychan.de>2010-06-16 18:42:30 +0000
commitf883d202f3925e0b46cee0b5b9f873de30dc3331 (patch)
treea80bc5bbaa3b2671dc0d9a41da8bcd5de9690fd9 /lib
parent4a1e5db7fc18779f57019aa65d522f4fe654f819 (diff)
downloadcoderay-f883d202f3925e0b46cee0b5b9f873de30dc3331.tar.gz
Fixed YAML scanner: strings should always be groups.
Diffstat (limited to 'lib')
-rw-r--r--lib/coderay/scanners/yaml.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/coderay/scanners/yaml.rb b/lib/coderay/scanners/yaml.rb
index 514838d..a0b1ae2 100644
--- a/lib/coderay/scanners/yaml.rb
+++ b/lib/coderay/scanners/yaml.rb
@@ -60,9 +60,11 @@ module Scanners
encoder.end_group :string
next
when match = scan(/(?![!"*&]).+?(?=$|\s+#)/)
- encoder.text_token match, :string
+ encoder.begin_group :string
+ encoder.text_token match, :content
string_indent = key_indent || column(pos - match.size - 1)
- encoder.text_token matched, :string if scan(/(?:\n+ {#{string_indent + 1}}.*)+/)
+ encoder.text_token matched, :content if scan(/(?:\n+ {#{string_indent + 1}}.*)+/)
+ encoder.end_group :string
next
end