diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-07-14 02:49:16 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-07-14 02:49:16 +0200 |
| commit | bf395bd14ed7f63aab84955f6768f59965e3a73e (patch) | |
| tree | 870e3ee4980401f43c2dc9a34d2e8343ef3a20ca /lib/coderay/scanners/yaml.rb | |
| parent | ffe0c90999c0b7255a5dfc608c84e683440475b1 (diff) | |
| parent | 7493dcbfded42686169027a158c18c5312a3af24 (diff) | |
| download | coderay-bf395bd14ed7f63aab84955f6768f59965e3a73e.tar.gz | |
Merge branch 'master' into cleanup-output
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 |