bashkit 0.7.0__tar.gz → 0.7.1__tar.gz

{bashkit-0.7.0 → bashkit-0.7.1}/Cargo.lock

@@ -345,7 +345,7 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
 [[package]]
 name = "bashkit"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -397,7 +397,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-bench"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -411,7 +411,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-cli"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -425,7 +425,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-coreutils-port"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "prettyplease",
@@ -439,7 +439,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-eval"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -456,7 +456,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-js"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "bashkit",
  "napi",
@@ -468,7 +468,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-python"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "bashkit",
  "num-bigint",

{bashkit-0.7.0 → bashkit-0.7.1}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 license = "MIT"
 authors = ["Everruns"]

{bashkit-0.7.0 → bashkit-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bashkit
-Version: 0.7.0
+Version: 0.7.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{bashkit-0.7.0 → bashkit-0.7.1}/crates/bashkit/src/builtins/rg/mod.rs

@@ -4301,7 +4301,7 @@ fn write_rg_json_end(
             "data":{
                 "path":{"text":filename},
                 "binary_offset":binary_offset,
-                "stats":rg_json_stats(bytes_searched, matched_lines, matches, 1, usize::from(matches > 0)),
+                "stats":rg_json_stats(bytes_searched, matched_lines, matches, 1, usize::from(matched_lines > 0)),
             }
         }),
     );
@@ -4845,9 +4845,13 @@ impl Builtin for Rg {
                         .collect();
                     match_count = inverted_match_lines.len();
                     count_value = inverted_match_lines.len();
-                    json_matches += inverted_match_lines.len();
+                    let inverted_matches = if opts.count_only || opts.count_matches {
+                        inverted_match_lines.len()
+                    } else {
+                        0
+                    };
                     json_matched_lines += inverted_match_lines.len();
-                    stats.matches += inverted_match_lines.len();
+                    stats.matches += inverted_matches;
                     stats.matched_lines += inverted_match_lines.len();
 
                     if match_count > 0 {
@@ -4911,7 +4915,7 @@ impl Builtin for Rg {
                                 binary_offset,
                                 content.len(),
                                 inverted_match_lines.len(),
-                                inverted_match_lines.len(),
+                                0,
                             );
                             json_searches_with_match += 1;
                         }
@@ -5405,17 +5409,23 @@ impl Builtin for Rg {
                 }
 
                 match_count += 1;
-                let matches_on_line = if !opts.invert_match {
-                    regex.find_iter(line.match_text).len()
+                let matches_on_line = if opts.invert_match {
+                    if opts.count_only || opts.count_matches {
+                        1
+                    } else {
+                        0
+                    }
                 } else {
-                    1
+                    regex.find_iter(line.match_text).len()
                 };
                 if opts.count_matches && !opts.invert_match {
                     count_value += matches_on_line;
                 } else {
                     count_value += 1;
                 }
-                json_matches += matches_on_line;
+                if !opts.invert_match {
+                    json_matches += matches_on_line;
+                }
                 stats.matches += matches_on_line;
                 stats.matched_lines += 1;
                 match_lines.push(line_idx);
@@ -7145,6 +7155,30 @@ mod tests {
             cwd: "/",
             output: RgDiffOutput::Exact,
         },
+        RgDiffCase {
+            name: "invert match stats counts zero matches",
+            args: &["-v", "--stats", "needle", "proj/a.txt"],
+            stdin: None,
+            files: DIFF_BASIC_FILES,
+            cwd: "/",
+            output: RgDiffOutput::Stats,
+        },
+        RgDiffCase {
+            name: "invert count stats counts inverted lines",
+            args: &["-v", "-c", "--stats", "needle", "proj/a.txt"],
+            stdin: None,
+            files: DIFF_BASIC_FILES,
+            cwd: "/",
+            output: RgDiffOutput::Stats,
+        },
+        RgDiffCase {
+            name: "json invert match counts zero submatches",
+            args: &["--json", "-v", "foo", "proj/a.txt"],
+            stdin: None,
+            files: DIFF_JSON_MODE_FILES,
+            cwd: "/",
+            output: RgDiffOutput::JsonEvents,
+        },
         RgDiffCase {
             name: "no invert match disables invert",
             args: &["-v", "--no-invert-match", "needle", "proj/a.txt"],
@@ -9999,6 +10033,22 @@ mod tests {
             cwd: "/",
             output: RgDiffOutput::JsonEvents,
         },
+        RgDiffCase {
+            name: "multiline json invert counts zero submatches",
+            args: &["--json", "-U", "-v", "foo\nbar", "proj/multi.txt"],
+            stdin: None,
+            files: DIFF_MULTILINE_FILES,
+            cwd: "/",
+            output: RgDiffOutput::JsonEvents,
+        },
+        RgDiffCase {
+            name: "multiline invert stats counts zero matches",
+            args: &["-U", "-v", "--stats", "foo\nbar", "proj/multi.txt"],
+            stdin: None,
+            files: DIFF_MULTILINE_FILES,
+            cwd: "/",
+            output: RgDiffOutput::Stats,
+        },
         RgDiffCase {
             name: "multiline stdin",
             args: &["-n", "-U", "foo\nbar"],