From dc3b93380aed2fb96548b62b43310fd9a0242146 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Wed, 6 Jan 2021 16:48:14 -0500 Subject: [PATCH] fix greedy matching of bracketed escapes --- ircfmt/ircfmt.go | 2 +- ircfmt/ircfmt_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ircfmt/ircfmt.go b/ircfmt/ircfmt.go index e18c57b..e525056 100644 --- a/ircfmt/ircfmt.go +++ b/ircfmt/ircfmt.go @@ -102,7 +102,7 @@ var ( "default": "99", } - bracketedExpr = regexp.MustCompile(`^\[.*\]`) + bracketedExpr = regexp.MustCompile(`^\[.*?\]`) colourDigits = regexp.MustCompile(`^[0-9]{1,2}$`) ) diff --git a/ircfmt/ircfmt_test.go b/ircfmt/ircfmt_test.go index e73732f..133caa6 100644 --- a/ircfmt/ircfmt_test.go +++ b/ircfmt/ircfmt_test.go @@ -38,6 +38,7 @@ var unescapetests = []testcase{ {"te$c[04,03]9st", "te\x0304,039st"}, {"te$c[asdf !23a fd4*#]st", "te\x03st"}, {"te$c[asdf , !2,3a fd4*#]st", "te\x03st"}, + {"Client opered up $c[grey][$r%s$c[grey], $r%s$c[grey]]", "Client opered up \x0314[\x0f%s\x0314, \x0f%s\x0314]"}, } var stripTests = []testcase{