rgapi 0.1.28__tar.gz → 0.1.29__tar.gz

{rgapi-0.1.28 → rgapi-0.1.29}/Cargo.lock

@@ -330,7 +330,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "rgapi"
-version = "0.1.28"
+version = "0.1.29"
 dependencies = [
  "crc32fast",
  "globset",

{rgapi-0.1.28 → rgapi-0.1.29}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rgapi"
-version = "0.1.28"
+version = "0.1.29"
 edition = "2024"
 rust-version = "1.91"
 license = "Apache-2.0"

{rgapi-0.1.28 → rgapi-0.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rgapi
-Version: 0.1.28
+Version: 0.1.29
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: fastcore>=2.2.29
@@ -124,6 +124,8 @@ Pass `lnhashs=True` to `rg` or `rg_iter` to display hash addresses instead of li
 
 For other result forms, use `rg(..., paths=True)` to return unique matched paths or `rg(..., count=True)` to count match spans. `paths` and `count` cannot both be set.
 
+`^` and `$` match at the start and end of each line. A line ends at `\n` or `\r\n`. `$` also matches before a `\r` that has no `\n` after it. `rg`, `rgstr`, and `nbrg` without `multiline=True` raise `ValueError` for a pattern that contains a literal `\n` or `\r`.
+
 ### Path results
 
 `fd`, `walk`, and `ls` return `PathResults`, a list of absolute `Path` objects. So do `rg` and `nbrg` with `paths=True`, and their async equivalents. Indexing or iterating returns ordinary Paths:

{rgapi-0.1.28 → rgapi-0.1.29}/README.md

@@ -103,6 +103,8 @@ Pass `lnhashs=True` to `rg` or `rg_iter` to display hash addresses instead of li
 
 For other result forms, use `rg(..., paths=True)` to return unique matched paths or `rg(..., count=True)` to count match spans. `paths` and `count` cannot both be set.
 
+`^` and `$` match at the start and end of each line. A line ends at `\n` or `\r\n`. `$` also matches before a `\r` that has no `\n` after it. `rg`, `rgstr`, and `nbrg` without `multiline=True` raise `ValueError` for a pattern that contains a literal `\n` or `\r`.
+
 ### Path results
 
 `fd`, `walk`, and `ls` return `PathResults`, a list of absolute `Path` objects. So do `rg` and `nbrg` with `paths=True`, and their async equivalents. Indexing or iterating returns ordinary Paths:

{rgapi-0.1.28 → rgapi-0.1.29}/python/rgapi/skill.py

@@ -6,8 +6,8 @@ For orientation, start with `rg(summary=True)`; use line-level results where nee
 
 ## Search units
 
-- `rg`: lines, or `SearchBlock` rows with `summary=True`. Blank/whitespace-only lines separate blocks; multiple matches in one block yield one row. Context counts the selected unit. Summary mode cannot combine with `paths` or `count`, but supports hashed block boundaries.
-- `nbrg`: `NbResults` of `NbCell` rows from source only, never metadata/outputs. `multiline=True` matches across cell lines while `^`/`$` remain line anchors; ordinary line-oriented `rg` rejects newline patterns.
+- `rg`: lines, or `SearchBlock` rows with `summary=True`. Blank/whitespace-only lines separate blocks; multiple matches in one block yield one row. Context counts the selected unit. Summary mode cannot combine with `paths` or `count`, but supports hashed block boundaries. `^`/`$` anchor each line. A line ends at LF or CRLF.
+- `nbrg`: `NbResults` of `NbCell` rows from source only, never metadata/outputs. `multiline=True` matches across cell lines while `^`/`$` remain line anchors; ordinary line-oriented `rg` rejects patterns containing a newline or carriage return.
 - Traversal/search run in parallel in Rust; sort when stable order is required. `path_re`/`skip_path_re` filter paths without pruning; `skip_dir`/`skip_dir_re` prune subtrees.
 
 ## Result fields and display

{rgapi-0.1.28 → rgapi-0.1.29}/src/search.rs

@@ -5,7 +5,7 @@ use std::sync::{
     mpsc::SyncSender,
 };
 
-use grep_matcher::Matcher;
+use grep_matcher::{LineTerminator, Matcher};
 use grep_regex::{RegexMatcher, RegexMatcherBuilder};
 use grep_searcher::{BinaryDetection, SearcherBuilder, Sink, SinkContext, SinkContextKind, SinkError, SinkMatch};
 use ignore::{DirEntry, WalkState};
@@ -167,8 +167,8 @@ fn send_search_error(tx: &SyncSender<Result<SearchLine, RgApiError>>, err: RgApi
 pub fn compile_regex(pattern: &str, case_sensitive: Option<bool>, smart_case: bool, multiline: bool) -> Result<RegexMatcher, RgApiError> {
     if pattern.is_empty() { return Err(RgApiError::new("pattern may not be empty")); }
     let mut builder = RegexMatcherBuilder::new();
-    if multiline { builder.multi_line(true); }
-    else { builder.line_terminator(Some(b'\n')); }
+    builder.multi_line(true).crlf(true);
+    if multiline { builder.line_terminator(None); }
     match case_sensitive {
         Some(true) => {
             builder.case_insensitive(false);
@@ -208,7 +208,7 @@ fn search_path_cancelable(
     cancel: Option<Arc<AtomicBool>>,
 ) -> Result<Vec<SearchLine>, RgApiError> {
     let mut builder = SearcherBuilder::new();
-    builder.line_number(true).before_context(before_context).after_context(after_context).binary_detection(BinaryDetection::quit(0));
+    builder.line_number(true).line_terminator(LineTerminator::crlf()).before_context(before_context).after_context(after_context).binary_detection(BinaryDetection::quit(0));
     let mut searcher = builder.build();
     let mut out = Vec::new();
     let search_matcher = matcher.clone();
@@ -236,7 +236,7 @@ fn search_bytes(
     multiline: bool,
 ) -> Result<Vec<SearchLine>, RgApiError> {
     let mut builder = SearcherBuilder::new();
-    builder.line_number(true).before_context(before_context).after_context(after_context).multi_line(multiline);
+    builder.line_number(true).line_terminator(LineTerminator::crlf()).before_context(before_context).after_context(after_context).multi_line(multiline);
     let mut searcher = builder.build();
     let mut out = Vec::new();
     let search_matcher = matcher.clone();

{rgapi-0.1.28 → rgapi-0.1.29}/tests/test_rgapi.py

@@ -188,8 +188,7 @@ def test_depth_size_and_filesystem_options(tmp_path):
 def test_lnhash_matches_fastcore(tmp_path):
     from fastcore.tools import lnhash as py_hash
     make_tree(tmp_path)
-    for row in rg(".", str(tmp_path)):
-        assert row.lnhash == py_hash(row.line_number, row.line)
+    for row in rg(".", str(tmp_path)): assert row.lnhash == py_hash(row.line_number, row.line)
 
 
 def test_rg_returns_structured_matches_context_and_relative_paths(tmp_path):
@@ -662,3 +661,13 @@ def test_nbrg_multiline(tmp_path):
     m, = res[0].matches
     assert m.line_number == 1 and "export" in m.line and "import" in m.line
     assert nbrg(r"^import", str(tmp_path), multiline=True, count=True) == 2   # ^ still means line start
+
+
+def test_line_anchor_spans(tmp_path):
+    "`$` anchors at line end in match spans, for LF and CRLF lines. `count=True` sums those spans."
+    (tmp_path/"a.txt").write_text("foo\nbar foo\nfoo bar\nlast foo")
+    assert sorted((r.line_number, r.matches) for r in rg(r"foo$", tmp_path)) == [(1, [(0, 3)]), (2, [(4, 7)]), (4, [(5, 8)])]
+    assert rg(r"foo$", tmp_path, count=True) == 3
+    assert [r.matches for r in rgstr(r"foo$", "foo\nbar foo")] == [[(0, 3)], [(4, 7)]]
+    (tmp_path/"crlf.txt").write_bytes(b"foo\r\nbar foo\r\n")
+    assert sorted((r.line_number, r.line, r.matches) for r in rg(r"foo$", tmp_path/"crlf.txt")) == [(1, "foo", [(0, 3)]), (2, "bar foo", [(4, 7)])]