Don't make the main regex in the --and list a lookahead

beyondgrep · Dec 20, 2024 · 0b8e85b · 0b8e85b
1 parent bc19134
commit 0b8e85b
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/lib/App/Ack.pm b/lib/App/Ack.pm
@@ -846,14 +846,19 @@ sub build_all_regexes {
         my @match_parts;
         my @hilite_parts;
 
-        for my $part ( $opt_regex, @parts ) {
-            my ($match, $scan) = build_regex( $part, $opt );
+        for my $part ( @parts ) {
+            my ($match, undef) = build_regex( $part, $opt );
             push @match_parts, "(?=.*$match)";
             push @hilite_parts, $match;
-            $re_scan //= $scan;
         }
-        $re_match  = join( '', @match_parts );      # All required, not optional.
+
+        my ($match, $scan) = build_regex( $opt_regex, $opt );
+        push @match_parts, ".*$match";
+        push @hilite_parts, $match;
+
+        $re_match  = join( '', @match_parts );
         $re_hilite = join( '|', @hilite_parts );
+        $re_scan   = $scan;
     }
     # OR: alpha OR beta
     elsif ( @parts = @{$opt->{or}} ) {
@@ -866,9 +871,9 @@ sub build_all_regexes {
             push @scan_parts, $scan;
         }
 
-        $re_match = join( '|', @match_parts );
+        $re_match  = join( '|', @match_parts );
         $re_hilite = $re_match;
-        $re_scan = join( '|', @scan_parts );
+        $re_scan   = join( '|', @scan_parts );
     }
     # NOT: alpha NOT beta
     elsif ( @parts = @{$opt->{not}} ) {