summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordana <dana@dana.is>2018-08-19 13:12:06 -0500
committerAndrew Gallant <jamslam@gmail.com>2018-08-20 07:50:00 -0400
commit7d93d2ab0582a12aa4190d688723414371ed8333 (patch)
tree57fdda54c25ccca0d99d60d1ea9a88c8a0c74b49
parent9ca2d68e94ed1e3c9a027f62c7f33f4f8456ee6a (diff)
ripgrep: add --no-multiline-dotall
-rw-r--r--complete/_rg1
-rw-r--r--src/app.rs10
2 files changed, 10 insertions, 1 deletions
diff --git a/complete/_rg b/complete/_rg
index afc33164..fc3a3999 100644
--- a/complete/_rg
+++ b/complete/_rg
@@ -152,6 +152,7 @@ _rg() {
+ '(multiline-dotall)' # Multiline DOTALL options
'(--no-multiline)--multiline-dotall[allow "." to match newline (with -U)]'
+ $no"(--no-multiline)--no-multiline-dotall[don't allow \".\" to match newline (with -U)]"
+ '(only)' # Only-match options
{-o,--only-matching}'[show only matching part of each line]'
diff --git a/src/app.rs b/src/app.rs
index eb58c73a..62ceca5f 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1425,9 +1425,17 @@ file if you prefer \"dot all\" semantics by default. Note that regardless of
whether this flag is used, \"dot all\" semantics can still be controlled via
inline flags in the regex pattern itself, e.g., '(?s:.)' always enables \"dot
all\" whereas '(?-s:.)' always disables \"dot all\".
+
+This flag can be disabled with --no-multiline-dotall.
");
let arg = RGArg::switch("multiline-dotall")
- .help(SHORT).long_help(LONG);
+ .help(SHORT).long_help(LONG)
+ .overrides("no-multiline-dotall");
+ args.push(arg);
+
+ let arg = RGArg::switch("no-multiline-dotall")
+ .hidden()
+ .overrides("multiline-dotall");
args.push(arg);
}