fix(sed): better support for converting sed patterns #137
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR does:
1. Refactors sed-specific pattern-conversion logic. This logic converts
a unix-style pattern (e.g., "s/foo/bar/") into the separate
parameters expected by shell.sed() (e.g., new RegExp('foo'), 'bar').
This builds the RegExp more carefully to avoid the issue with
escaped slashes (as reported in #136).
2. Explicitly checks for empty patterns and throws an error
(previously, these would just silently fail conversion).
3. Adds tests for the previous two cases.
4. Refactors the sed tests to be more maintainable by saving file
contents in test variables. No change in the logic of
already-existing tests.
Fixes #136
Test: 'works with backslashes and forward slashes in pattern'
Test: 'does not work with empty regex strings'
Codecov Report
@@ Coverage Diff @@
## master #137 +/- ##
=====================================
Coverage 100% 100%
=====================================
Files 3 3
Lines 22 40 +18
=====================================
+ Hits 22 40 +18
Continue to review full report at Codecov.
|
freitagbr
requested changes
Jun 20, 2018
src/shx.js
Outdated
| const regexString = match[1].replace(/\\\//g, '/'); | ||
| const replacement = match[2].replace(/\\\//g, '/').replace(/\\./g, '.'); | ||
| const regexFlags = match[3]; | ||
| if (!regexString) { |
There was a problem hiding this comment.
Perhaps regexString === '' would be clearer here.
test/specs/cli.js
Outdated
| it('does not work with empty regex strings', () => { | ||
| (() => { | ||
| cli('sed', 's//foo/g', testFileName1); | ||
| }).should.throw(Error); |
There was a problem hiding this comment.
I would check for the exact error message here, i.e. .should.throw('Bad sed pattern (empty regex)').
|
@freitagbr ptal |
freitagbr
approved these changes
Jun 21, 2018
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR does:
a unix-style pattern (e.g., "s/foo/bar/") into the separate
parameters expected by shell.sed() (e.g., new RegExp('foo'), 'bar').
This builds the RegExp more carefully to avoid the issue with
escaped slashes (as reported in Regex support for forward slashes in sed #136).
(previously, these would just silently fail conversion).
contents in test variables. No change in the logic of
already-existing tests.
Fixes #136
Test: 'works with backslashes and forward slashes in pattern'
Test: 'does not work with empty regex strings'