diff --git a/src/sidecars/SharpLsp.Sidecar.CSharp.Tests/RegexHighlightingTests.cs b/src/sidecars/SharpLsp.Sidecar.CSharp.Tests/RegexHighlightingTests.cs index 57473d28..987ddfc0 100644 --- a/src/sidecars/SharpLsp.Sidecar.CSharp.Tests/RegexHighlightingTests.cs +++ b/src/sidecars/SharpLsp.Sidecar.CSharp.Tests/RegexHighlightingTests.cs @@ -181,6 +181,8 @@ private static string Syntax(string pattern) [InlineData(@"\u0041\x41\cA", @"\u0041 \x41 \cA")] [InlineData("[a-z][^0-9]", "[a-z] [^0-9]")] [InlineData(@"[]a][\]][a-z-[aeiou]]x", @"[]a] [\]] [a-z-[aeiou]]")] + [InlineData("[a[b]x+", "[a[b] +")] + [InlineData("[[]x[a[-[a]]y", "[[] [a[-[a]]")] [InlineData("(a)(?:b)(?=c)(?!d)(?<=e)(?g)", "( ) (?: ) (?= ) (?! ) (?<= ) (? )")] [InlineData("(?x)(?'m'y)(?i)(?i-m:z)(?#note)", "(? ) (?'m' ) (?i ) (?i-m: ) (?#note)")] [InlineData("a*b+c?d*?e+?f??", "* + ? *? +? ??")] diff --git a/src/sidecars/SharpLsp.Sidecar.CSharp/Workspace/RegexPatternTokens.cs b/src/sidecars/SharpLsp.Sidecar.CSharp/Workspace/RegexPatternTokens.cs index 12628a8b..83315c08 100644 --- a/src/sidecars/SharpLsp.Sidecar.CSharp/Workspace/RegexPatternTokens.cs +++ b/src/sidecars/SharpLsp.Sidecar.CSharp/Workspace/RegexPatternTokens.cs @@ -85,7 +85,7 @@ private static int DigitsEnd(string pattern, int at) return end; } - /// A whole [...] class: a leading ] is a member, an escape hides its character, a subtraction nests. + /// A whole [...] class: a leading ] is a member, an escape hides its character, only a subtraction nests. private static int ClassEnd(string pattern, int at) { var index = Follows(pattern, at + 1, '^') ? at + 2 : at + 1; @@ -95,7 +95,7 @@ private static int ClassEnd(string pattern, int at) { depth += pattern[index] switch { - '[' => 1, + '[' when OpensSubtraction(pattern, index) => 1, ']' => -1, _ => 0, }; @@ -104,6 +104,15 @@ private static int ClassEnd(string pattern, int at) return Math.Min(index, pattern.Length); } + /// + /// True when the [ at opens a subtraction (-[…]). Any + /// other [ inside a class is a literal member: [a[b] ends at its first ]. + /// + private static bool OpensSubtraction(string pattern, int at) + { + return at > 0 && pattern[at - 1] == '-' && (at < 2 || pattern[at - 2] != '\\'); + } + /// ( with its prefix: (?:, (?=, (?<name>, inline options; a comment group whole. private static int GroupOpenEnd(string pattern, int at) {