Merge branch 'master' into possible-speedups

korny · korny · commit 0dc1ca39534a · 2017-11-03T00:40:06.000+01:00
diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
@@ -100,7 +100,6 @@ def scan_tokens encoder, options
             # TODO: scan over nested tags
             xml_scanner.tokenize match, :tokens => encoder
             value_expected = false
-            next
             
           elsif match = scan(/ [-+*=<>?:;,!&^|(\[{~%]+ | \.(?!\d) /x)
             value_expected = true
diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
@@ -76,7 +76,7 @@ def scan_tokens(encoder, options)
             encoder.text_token(match, :comment)
           
           elsif match = scan(/\[=*\[/)     # [[ long (possibly multiline) string ]]
-            num_equals = match.count("=") # Number must match for comment end
+            num_equals = match.count("=") # Number must match for string end
             encoder.begin_group(:string)
             encoder.text_token(match, :delimiter)
             state = :long_string
diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake
@@ -37,7 +37,7 @@ Please rename or remove it and run again to use the GitHub repository:
     else
       puts 'Downloading scanner test suite...'
       sh 'git clone https://github.com/rubychan/coderay-scanner-tests.git test/scanners/'
-    end
+    end unless ENV['SKIP_UPDATE_SCANNER_SUITE']
   end
   
   namespace :scanner do
