summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners/json.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-12 16:04:51 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-12 16:04:51 +0200
commitaddcbd446066d0da1627112814e3ce1b8d404da0 (patch)
tree55a4a46e10e89afb185b014f28d4d769c0144948 /lib/coderay/scanners/json.rb
parent7d2c3e59d1691bcde16fc3e51d92797bfc9a2442 (diff)
parent40bd2ef5d33d32c3b3987da1d115b717259819e4 (diff)
downloadcoderay-addcbd446066d0da1627112814e3ce1b8d404da0.tar.gz
Merge branch 'master' into go-scanner
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