diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 14:35:17 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 14:35:17 +0200 |
| commit | 9651f0b464b6540a1427ea8320abaa01caf197b3 (patch) | |
| tree | 184c42f0fe01ddce26b7d4cc42c124b695a20b3e /lib/coderay/scanners/yaml.rb | |
| parent | 14f3a4f28341237503a51bfa0764c922bb02bdfa (diff) | |
| parent | d7f1669cdf1d48204f3e1b0078d467da448c31d2 (diff) | |
| download | coderay-9651f0b464b6540a1427ea8320abaa01caf197b3.tar.gz | |
Merge branch 'master' into upstream
Diffstat (limited to 'lib/coderay/scanners/yaml.rb')
| -rw-r--r-- | lib/coderay/scanners/yaml.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/coderay/scanners/yaml.rb b/lib/coderay/scanners/yaml.rb index 96f4e93..32c8e2c 100644 --- a/lib/coderay/scanners/yaml.rb +++ b/lib/coderay/scanners/yaml.rb @@ -47,7 +47,7 @@ module Scanners when !check(/(?:"[^"]*")(?=: |:$)/) && match = scan(/"/) encoder.begin_group :string encoder.text_token match, :delimiter - encoder.text_token match, :content if match = scan(/ [^"\\]* (?: \\. [^"\\]* )* /mx) + encoder.text_token match, :content if (match = scan(/ [^"\\]* (?: \\. [^"\\]* )* /mx)) && !match.empty? encoder.text_token match, :delimiter if match = scan(/"/) encoder.end_group :string next @@ -84,7 +84,7 @@ module Scanners when match = scan(/(?:"[^"\n]*"|'[^'\n]*')(?= *:(?: |$))/) encoder.begin_group :key encoder.text_token match[0,1], :delimiter - encoder.text_token match[1..-2], :content + encoder.text_token match[1..-2], :content if match.size > 2 encoder.text_token match[-1,1], :delimiter encoder.end_group :key key_indent = column(pos - match.size) - 1 |