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

grep includes the i flag #876

Merged
merged 5 commits into from Jul 23, 2018
Merged

grep includes the i flag #876

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a871e0
Includes the i flag
ppsleep Jul 19, 2018
734e287
Add the i flag to grep
ppsleep Jul 20, 2018
99ba3bc
move the test files
ppsleep Jul 20, 2018
f4f6b33
change the test
ppsleep Jul 20, 2018
32b154d
move the ignoreCase logic
ppsleep Jul 21, 2018
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
7 changes: 6 additions & 1 deletion src/grep.js
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ common.register('grep', _grep, {
cmdOptions: {
'v': 'inverse',
'l': 'nameOnly',
'i': 'ignoreCase',
},
});

Expand All @@ -17,7 +18,8 @@ common.register('grep', _grep, {
//@ Available options:
//@
//@ + `-v`: Invert `regex_filter` (only print non-matching lines).
//@ + `-l`: Print only filenames of matching files
//@ + `-l`: Print only filenames of matching files.
//@ + `-i`: Ignored upper/lower case differences.
Copy link
Member

Choose a reason for hiding this comment

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

nit: can you change this sentence to simply "Ignore case."?

//@
//@ Examples:
//@
Expand Down Expand Up @@ -48,6 +50,9 @@ function _grep(options, regex, files) {
}

var contents = file === '-' ? pipe : fs.readFileSync(file, 'utf8');
if (options.ignoreCase) {
regex = new RegExp(regex, 'i');
Copy link
Member

Choose a reason for hiding this comment

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

Sorry, one more fix: move the ignoreCase logic out of the for-loop. The CI failure is because we're repeatedly re-assigning regex, but we should only assign to it once.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, it's a low-level error, i fixed it, sorry.

}
if (options.nameOnly) {
if (contents.match(regex)) {
grep.push(file);
Expand Down