From 9ab43b19c85a1799948dbc1ed1f360168ed9c462 Mon Sep 17 00:00:00 2001 From: Greg Lindhorst Date: Sat, 8 Mar 2025 23:23:52 -0800 Subject: [PATCH] Updates --- src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Match.cs | 5 +++++ .../Microsoft.PowerFx.Interpreter/Functions/LibraryRegEx.cs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Match.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Match.cs index cd06856855..f42b736642 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Match.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Match.cs @@ -92,6 +92,11 @@ internal class MatchOptionString public const string Complete = "^c$"; // invented by us, with the ^ and $ around } + internal class MatchNewlines + { + public const string EscapeChars = @"\n\x0b\f\r\x85\u2028\u2029"; + } + internal class BaseMatchFunction : BuiltinFunction { private readonly ConcurrentDictionary> _regexTypeCache; diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryRegEx.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryRegEx.cs index e4a6608982..c59aa5470e 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryRegEx.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryRegEx.cs @@ -238,8 +238,8 @@ public Task InvokeAsync(FormulaValue[] args, CancellationToken can bool multiline = options.Contains(MatchOptionChar.Multiline); bool ignoreCase = options.Contains(MatchOptionChar.IgnoreCase); bool dotAll = options.Contains(MatchOptionChar.DotAll); - bool matchStart = options.Contains(MatchOptionChar.BeginsWith); - bool matchEnd = options.Contains(MatchOptionChar.EndsWith); + bool matchStart = options.Contains(MatchOptionChar.Begins); + bool matchEnd = options.Contains(MatchOptionChar.Ends); bool numberedSubMatches = options.Contains(MatchOptionChar.NumberedSubMatches); // Can't add options ^ and $ too early as there may be freespacing comments, centralize the logic here and call subfunctions