summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners/json.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-11 18:10:54 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-11 18:10:54 +0200
commit916711c9983483c39f9a68c29e21a0ed40004bd2 (patch)
treea3a98ac92db67a75625525b4d559b7db7ac89965 /lib/coderay/scanners/json.rb
parent0c98047ea276f393daa8249cf9c124ebc08266d2 (diff)
parent2e4e83bf84282d6ce7fbc9eeff2cbe1c79788a9b (diff)
downloadcoderay-916711c9983483c39f9a68c29e21a0ed40004bd2.tar.gz
Merge branch 'master' into paint-integration
Diffstat (limited to 'lib/coderay/scanners/json.rb')
-rw-r--r--lib/coderay/scanners/json.rb2
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