summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners/java_script.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-10 01:44:16 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-10 01:44:16 +0200
commit4ffc0afac656bef8a897023711cad7f3ca92a5fc (patch)
tree6637d5a2f48078d9db6459e73306402c4ee4dddb /lib/coderay/scanners/java_script.rb
parent02e1bf3c236778197627fe9f9a7b3cf126825a8b (diff)
parent2de5dab7d59021622dabf4728e0b8123dc29da8a (diff)
downloadcoderay-4ffc0afac656bef8a897023711cad7f3ca92a5fc.tar.gz
Merge branch 'master' into bash-scanner
Diffstat (limited to 'lib/coderay/scanners/java_script.rb')
-rw-r--r--lib/coderay/scanners/java_script.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
index 43ecb18..92e3dfa 100644
--- a/lib/coderay/scanners/java_script.rb
+++ b/lib/coderay/scanners/java_script.rb
@@ -175,11 +175,11 @@ 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?
key_expected = value_expected = false
state = :initial
else
- raise_inspect "else case \" reached; %p not handled." % peek(1), encoder
+ raise_inspect "else case #{string_delimiter} reached; %p not handled." % peek(1), encoder
end
else