Merge c0e3576 into 4dea664

kaesetoast · Jun 10, 2019 · e2dfebf · e2dfebf
2 parents 4dea664 + c0e3576
commit e2dfebf
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -32,15 +32,15 @@ function getFileFilter(fileFilter) {
     return fileFilter;
 }
 
-function getRegEx(pattern, regex) {
+function getRegEx(pattern, regex, isCaseSensitive) {
     var flags, term, grabLineRegEx
 
     if (typeof pattern === 'object' && pattern.flags) {
         term = pattern.term
         flags = pattern.flags
     } else {
         term = pattern
-        flags = 'g'
+        isCaseSensitive ? flags = 'g' : flags = 'gi';
     }
 
     grabLineRegEx = "(.*" + term + ".*)"
@@ -52,13 +52,13 @@ function getRegEx(pattern, regex) {
     return new RegExp(term, flags);
 }
 
-function getMatchedFiles(pattern, files) {
+function getMatchedFiles(pattern, files, isCaseSensitive) {
     var matchedFiles = []
     for (var i = files.length - 1; i >= 0; i--) {
         matchedFiles.push(readFile(files[i])
             .then(searchFile({
-                regex: getRegEx(pattern),
-                lineRegEx: getRegEx(pattern, 'line'),
+                regex: getRegEx(pattern, undefined, isCaseSensitive),
+                lineRegEx: getRegEx(pattern, 'line', isCaseSensitive),
                 filename: files[i]
             })));
     }
@@ -83,11 +83,12 @@ function getResults(content) {
     return results;
 }
 
-exports.find = function(pattern, directory, fileFilter) {
+exports.find = function(pattern, directory, fileFilter, isCaseSensitive) {
+    isCaseSensitive = typeof isCaseSensitive === 'undefined' ? true : isCaseSensitive;
     var deferred = Q.defer()
     find
     .file(getFileFilter(fileFilter), directory, function(files) {
-        Q.allSettled(getMatchedFiles(pattern, files))
+        Q.allSettled(getMatchedFiles(pattern, files, isCaseSensitive))
         .then(function (content) {
             deferred.resolve(getResults(content));
         })
@@ -99,12 +100,13 @@ exports.find = function(pattern, directory, fileFilter) {
     return deferred.promise;
 };
 
-exports.findSync = function(pattern, directory, fileFilter) {
+exports.findSync = function(pattern, directory, fileFilter, isCaseSensitive) {
+    isCaseSensitive = typeof isCaseSensitive === 'undefined' ? true : isCaseSensitive;
     var deferred = Q.defer();
     var files;
     try {
         files = find.fileSync(getFileFilter(fileFilter), directory);
-        Q.allSettled(getMatchedFiles(pattern, files))
+        Q.allSettled(getMatchedFiles(pattern, files, isCaseSensitive))
         .then(function (content) {
             deferred.resolve(getResults(content));
         })