Skip to content

JavaScript scanner: Highlight multi-line comments in diff correctly #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 10, 2013
Merged

JavaScript scanner: Highlight multi-line comments in diff correctly #117

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5152617
support multi-line comments in JavaScript diff
korny Mar 10, 2013
ff93e8e
changelog
korny Mar 10, 2013
fe353d1
ignore old-stuff folder
korny Mar 10, 2013
8ad02d8
Merge branch 'master' into javascript-keep-state
korny Mar 10, 2013
4540eb3
Merge branch 'master' into javascript-keep-state
korny Jun 10, 2013
33f1a73
reset string_delimiter when detecting open string
korny Jun 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
reset string_delimiter when detecting open string
  • Loading branch information
@korny
korny committed Jun 10, 2013
commit 33f1a738ea85ea40a5fe760ac2591065f3e29033
1 change: 1 addition & 0 deletions lib/coderay/scanners/java_script.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ def scan_tokens encoder, options
elsif match = scan(/ \\ | $ /x)
encoder.end_group state
encoder.text_token match, :error unless match.empty?
string_delimiter = nil
key_expected = value_expected = false
state = :initial
else
Expand Down