Fix grep parse failing cases

dandavison · Jan 2, 2022 · 2957f6f · 2957f6f
1 parent a0521e0
commit 2957f6f
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/handlers/grep.rs b/src/handlers/grep.rs
@@ -290,6 +290,7 @@ fn make_output_config() -> GrepOutputConfig {
 enum GrepLineRegex {
     WithFileExtensionAndLineNumber,
     WithFileExtension,
+    WithFileExtensionNoSpaces,
     WithoutSeparatorCharacters,
 }
 
@@ -298,6 +299,11 @@ lazy_static! {
         make_grep_line_regex(GrepLineRegex::WithFileExtensionAndLineNumber);
 }
 
+lazy_static! {
+    static ref GREP_LINE_REGEX_ASSUMING_FILE_EXTENSION_NO_SPACES: Regex =
+        make_grep_line_regex(GrepLineRegex::WithFileExtensionNoSpaces);
+}
+
 lazy_static! {
     static ref GREP_LINE_REGEX_ASSUMING_FILE_EXTENSION: Regex =
         make_grep_line_regex(GrepLineRegex::WithFileExtension);
@@ -343,6 +349,14 @@ fn make_grep_line_regex(regex_variant: GrepLineRegex) -> Regex {
         )    
         "
         }
+        GrepLineRegex::WithFileExtensionNoSpaces => {
+            r"
+        (                        # 1. file name (colons not allowed)
+            [^:|\ ]+                # try to be strict about what a file path can start with
+            [^\ ]\.[^.\ :=-]{1,6}   # extension
+        )    
+        "
+        }
         GrepLineRegex::WithoutSeparatorCharacters => {
             r"
         (                        # 1. file name (colons not allowed)
@@ -419,6 +433,7 @@ pub fn parse_grep_line(line: &str) -> Option<GrepLine> {
             Some(process::CallingProcess::GitGrep(_))
             | Some(process::CallingProcess::OtherGrep) => [
                 &*GREP_LINE_REGEX_ASSUMING_FILE_EXTENSION_AND_LINE_NUMBER,
+                &*GREP_LINE_REGEX_ASSUMING_FILE_EXTENSION_NO_SPACES,
                 &*GREP_LINE_REGEX_ASSUMING_FILE_EXTENSION,
                 &*GREP_LINE_REGEX_ASSUMING_NO_INTERNAL_SEPARATOR_CHARS,
             ]