Support free-spacing mode Regexp
in Naming/InclusiveLanguage
#11832
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP – See #11831.
This edits the way the
Naming/InclusiveLanguage
cop combines its config intoRegexp
to match terms. Specifically, because we would convert givenRegexp
toString
s viaRegexp#source
, and then simply combine patterns/strings usingwe would lose any mode/options information about the
Regexp
, which in the case of "free-spacing"/"extended" mode, would mean theRegexp
could be corrupted by additional spacing being considered part of the pattern.This changes the approach to normalize patterns as
Regexp
s instead ofString
s, and then simply combine them usingRegexp.union
. To preserve the existing behaviour of always making the patterns case insensitive, we extract the source and options from any givenRegexp
, and construct a new one where we force case insensitivity usingThis way, we preserve all other flags (
/.../x
, but also others like/.../m
).Note that it was previously possible to work around this by applying options at the subexpression level, which remains possible (e.g. to force case sensitivity).
TODO
Regexp
in cop documentation (unclear howAllowedRegexp
works; maybe separate PR?)Before submitting the PR make sure the following are checked:
[Fix #issue-number]
(if the related issue exists).master
(if not - rebase it).bundle exec rake default
. It executes all tests and runs RuboCop on its own code.{change_type}_{change_description}.md
if the new code introduces user-observable changes. See changelog entry format for details.