mirror of
https://github.com/BurntSushi/ripgrep.git
synced 2024-12-12 19:18:24 +02:00
9d703110cf
This commit improves the CRLF hack to be more robust. In particular, in addition to rewriting `$` as `(?:\r??$)`, we now strip `\r` from the end of a match if and only if the regex has an ending line anchor required for a match. This doesn't quite make the hack 100% correct, but should fix most use cases in practice. An example of a regex that will still be incorrect is `foo|bar$`, since the analysis isn't quite sophisticated enough to determine that a `\r` can be safely stripped from any match. Even if we fix that, regexes like `foo\r|bar$` still won't be handled correctly. Alas, more work on this front should really be focused on enabling this in the regex engine itself. The specific cause of this bug was that grep-searcher was sneakily stripping CRLF from matching lines when it really shouldn't have. We remove that code now, and instead rely on better match semantics provided at a lower level. Fixes #1095
22 lines
607 B
TOML
22 lines
607 B
TOML
[package]
|
|
name = "grep-regex"
|
|
version = "0.1.1" #:version
|
|
authors = ["Andrew Gallant <jamslam@gmail.com>"]
|
|
description = """
|
|
Use Rust's regex library with the 'grep' crate.
|
|
"""
|
|
documentation = "https://docs.rs/grep-regex"
|
|
homepage = "https://github.com/BurntSushi/ripgrep"
|
|
repository = "https://github.com/BurntSushi/ripgrep"
|
|
readme = "README.md"
|
|
keywords = ["regex", "grep", "search", "pattern", "line"]
|
|
license = "Unlicense/MIT"
|
|
|
|
[dependencies]
|
|
log = "0.4.5"
|
|
grep-matcher = { version = "0.1.1", path = "../grep-matcher" }
|
|
regex = "1.1"
|
|
regex-syntax = "0.6.5"
|
|
thread_local = "0.3.6"
|
|
utf8-ranges = "1.0.1"
|