diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-03-11 02:28:23 +0100 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-03-11 02:28:23 +0100 |
commit | 46a947538f2e4c51a5f71478d3c7b405e8c71772 (patch) | |
tree | 3b91e5b213f35b895905e75fd0e8b13e4bba194a /lib/coderay/scanners/json.rb | |
parent | 2fd96c38b2a488205267aa8bd402a8cfe26efcb1 (diff) | |
parent | 1a3f0435a28319a08ec33c27ab2194c05395bab7 (diff) | |
download | coderay-46a947538f2e4c51a5f71478d3c7b405e8c71772.tar.gz |
Merge branch 'master' into sass-scanner
Diffstat (limited to 'lib/coderay/scanners/json.rb')
-rw-r--r-- | lib/coderay/scanners/json.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/scanners/json.rb b/lib/coderay/scanners/json.rb index 0c90c34..4e0f462 100644 --- a/lib/coderay/scanners/json.rb +++ b/lib/coderay/scanners/json.rb @@ -70,7 +70,7 @@ module Scanners encoder.text_token match, :content elsif match = scan(/ \\ | $ /x) encoder.end_group state - encoder.text_token match, :error + encoder.text_token match, :error unless match.empty? state = :initial else raise_inspect "else case \" reached; %p not handled." % peek(1), encoder |