shelljs · nfischer · Jul 23, 2018 · Jul 19, 2018 · Jul 20, 2018 · Jul 20, 2018
diff --git a/README.md b/README.md
@@ -362,7 +362,8 @@ include the base directories (e.g., `lib/resources/file1` instead of just `file1
 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`: Ignore case.

 Examples:


diff --git a/src/grep.js b/src/grep.js
@@ -7,6 +7,7 @@ common.register('grep', _grep, {
  cmdOptions: {
    'v': 'inverse',
    'l': 'nameOnly',
+    'i': 'ignoreCase',
  },
 });

@@ -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`: Ignore case.
 //@
 //@ Examples:
 //@
@@ -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');
+    }
    if (options.nameOnly) {
      if (contents.match(regex)) {
        grep.push(file);

diff --git a/test/grep.js b/test/grep.js
@@ -137,6 +137,13 @@ test('-l option', t => {
  t.is(result.split('\n').length - 1, 2);
 });

+test('-i option', t => {
+  const result = shell.grep('-i', 'test', 'test/resources/grep/case1', 'test/resources/grep/case1.txt',
+    'test/resources/grep/case1.js');
+  t.falsy(shell.error());
+  t.is(result.split('\n').length - 1, 3);
+});
+
 test('the pattern looks like an option', t => {
  const result = shell.grep('--', '-v', 'test/resources/grep/file2');
  t.falsy(shell.error());

diff --git a/test/resources/grep/case1 b/test/resources/grep/case1
@@ -0,0 +1 @@
+Test3
diff --git a/test/resources/grep/case1.js b/test/resources/grep/case1.js
@@ -0,0 +1 @@
+test3
diff --git a/test/resources/grep/case1.txt b/test/resources/grep/case1.txt
@@ -0,0 +1 @@
+TEST3
-Original file line number
+Diff line change
@@ -7,6 +7,7 @@ common.register('grep', _grep, {
       cmdOptions: {
         'v': 'inverse',
         'l': 'nameOnly',
+        'i': 'ignoreCase',
       },
     });
@@ -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`: Ignore case.
     //@
     //@ Examples:
     //@
@@ -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


      

  

  
    
      

      
            nfischer
  

      

      

      


        Jul 21, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    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.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            ppsleep
  

      

      

      


        Jul 21, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    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.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


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