Skip to content
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

Jump to bottom

Fix JavaScript Regex Pattern #242

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Fix JavaScript Regex Pattern #242

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
62f6993
possible solution for [/] problem
korny Feb 6, 2018
c7e3b31
Merge branch 'master' into fix-javascript-regexp
korny Nov 24, 2019
5f12086
Merge branch 'master' into fix-javascript-regexp
korny Nov 24, 2019
a351d9e
use %r
korny Nov 24, 2019
4c97c91
whitespace
korny Nov 24, 2019
5233abf
remove duplicated protected
korny Nov 24, 2019
37a21e2
provoke RubyCop
korny Nov 24, 2019
261e1a8
freeze Hash
korny Nov 24, 2019
3d89a2f
Merge branch 'master' into fix-javascript-regexp
korny Nov 24, 2019
389be13
Merge branch 'master' into fix-javascript-regexp
korny Nov 24, 2019
c550eea
enfore SpaceAroundOperators
korny Nov 24, 2019
26a682c
tweaks to RuboCop config
korny Nov 24, 2019
e3228fa
Merge branch 'master' into fix-javascript-regexp
korny Nov 24, 2019
54268a9
Merge branch 'master' into fix-javascript-regexp
korny Nov 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 1 addition & 12 deletions .rubocop_todo.yml
View file
Open in desktop
Expand Up @@ -237,18 +237,7 @@ Layout/SpaceAfterComma:
# Cop supports --auto-correct.
# Configuration parameters: AllowForAlignment.
Layout/SpaceAroundOperators:
Exclude:
- 'ideosyncratic-ruby.rb'
- 'lib/coderay/scanners/c.rb'
- 'lib/coderay/scanners/cpp.rb'
- 'lib/coderay/scanners/diff.rb'
- 'lib/coderay/scanners/groovy.rb'
- 'lib/coderay/scanners/java.rb'
- 'lib/coderay/scanners/java_script.rb'
- 'lib/coderay/scanners/python.rb'
- 'lib/coderay/scanners/ruby/patterns.rb'
- 'rake_tasks/code_statistics.rb'
- 'test/unit/json_encoder.rb'
AllowForAlignment: true

# Offense count: 2
# Cop supports --auto-correct.
Expand Down
12 changes: 5 additions & 7 deletions lib/coderay/scanners/java_script.rb
View file
Open in desktop
Expand Up @@ -40,13 +40,13 @@ class JavaScript < Scanner
add(KEYWORDS, :keyword) # :nodoc:

ESCAPE = / [bfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x # :nodoc:
UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x # :nodoc:
REGEXP_ESCAPE = / [bBdDsSwW] /x # :nodoc:
STRING_CONTENT_PATTERN = {
UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x # :nodoc:
REGEXP_ESCAPE = / [bBdDsSwW] /x # :nodoc:
STRING_CONTENT_PATTERN = {
korny marked this conversation as resolved.
Show resolved Hide resolved
korny marked this conversation as resolved.
Show resolved Hide resolved
korny marked this conversation as resolved.
Show resolved Hide resolved
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Operator = should be surrounded by a single space. (https://rubystyle.guide#spaces-operators)

"'" => /[^\\']+/,
'"' => /[^\\"]+/,
'/' => /[^\\\/]+/,
} # :nodoc:
'/' => %r{ (?: [^\\/\[]+ | \[ ([^\]\\]+ | \\.)* \]? )+ }mx,
}.freeze # :nodoc:
KEY_CHECK_PATTERN = {
"'" => / (?> [^\\']* (?: \\. [^\\']* )* ) ' \s* : /mx,
'"' => / (?> [^\\"]* (?: \\. [^\\"]* )* ) " \s* : /mx,
Expand Down Expand Up @@ -219,8 +219,6 @@ def scan_tokens encoder, options
encoder
end

protected

def reset_instance
super
@xml_scanner.reset if defined? @xml_scanner
Expand Down