feat: support European umlauts/accents as \w (word char) in some regular expression areas

ansgarbecker · ansgarbecker · commit 304cd26a05b4 · 2026-01-15T19:41:20.000+01:00
diff --git a/source/extra_controls.pas b/source/extra_controls.pas
@@ -74,6 +74,7 @@   {TExtHintWindow = class(THintWindow)
 
 implementation
 
+uses generic_types;
 
 { TExtForm }
 
@@ -261,15 +262,15 @@ class procedure TExtForm.RestoreListSetup( List: TLazVirtualStringTree );
 
 procedure TExtForm.FilterNodesByEdit(Edit: TEditButton; Tree: TLazVirtualStringTree);
 var
-  rx: TRegExpr;
+  rx: TRegExprUmlauts;
   Node: PVirtualNode;
   i: Integer;
   match: Boolean;
   CellText: String;
 begin
   // Loop through all tree nodes and hide non matching
   Node := Tree.GetFirst;
-  rx := TRegExpr.Create;
+  rx := TRegExprUmlauts.Create;
   rx.ModifierI := True;
   rx.Expression := Edit.Text;
   try
diff --git a/source/generic_types.pas b/source/generic_types.pas
@@ -4,7 +4,7 @@
 
 interface
 
-uses fpjson, jsonparser, SysUtils;
+uses fpjson, jsonparser, SysUtils, RegExpr;
 
 type
   TThreeStateBoolean = (nbUnset, nbFalse, nbTrue);
@@ -14,6 +14,12 @@   TJSONFloatNumberUntouched = class(TJSONFloatNumber)
     function GetAsString: TJSONStringType; override;
   end;
 
+  // Regular expression with support for European umlauts/accents as \w (word character)
+  TRegExprUmlauts = class(TRegExpr)
+    public
+      constructor Create;
+  end;
+
   TFileExtImageIndex = record
     Ext: String;
     ImageIndex: Integer;
@@ -77,6 +83,14 @@ function TJSONFloatNumberUntouched.GetAsString: TJSONStringType;
     Delete(Result, High(Result), 1);
 end;
 
+{ TRegExprUmlauts }
+
+constructor TRegExprUmlauts.Create;
+begin
+  inherited Create;
+  WordChars := WordChars + 'äÄöÖüÜÿŸáÁéÉíÍóÓúÚýÝćĆńŃŕŔśŚźŹĺĹàÀèÈìÌòÒùÙâÂêÊîÎôÔûÛãÃõÕñÑçÇşŞţŢåÅæÆœŒøØß';
+end;
+
 initialization
 
 SetJSONInstanceType(jitNumberFloat, TJSONFloatNumberUntouched);
diff --git a/source/main.pas b/source/main.pas
@@ -7269,10 +7269,7 @@ procedure TMainForm.GlobalSynEditStatusChange(Sender: TObject; Changes: TSynStat
   Edit := Sender as TSynEdit;
   MarkupWordSelection := Edit.MarkupByClass[TMarkupWordSelection] as TMarkupWordSelection;
   if Assigned(MarkupWordSelection) then begin
-    if ExecRegExprI('^\w+$', Edit.SelText) then
-      MarkupWordSelection.SetWordToHighlight(Edit.SelText)
-    else
-      MarkupWordSelection.SetWordToHighlight('');
+    MarkupWordSelection.SetWordToHighlight(Edit.SelText)
   end;
 end;
 
@@ -8982,7 +8979,7 @@ procedure TMainForm.ApplyVTFilter(FromTimer: Boolean);
   tab: TTabSheet;
   VisibleCount: Cardinal;
   CellText: String;
-  rx: TRegExpr;
+  rx: TRegExprUmlauts;
   OldDataLocalNumberFormat: Boolean;
   OldImageIndex: Integer;
 begin
@@ -9025,7 +9022,7 @@ procedure TMainForm.ApplyVTFilter(FromTimer: Boolean);
   TreeIsInsideUpdate := tsUpdating in VT.TreeStates;
   // Loop through all nodes and hide non matching
   Node := VT.GetFirst;
-  rx := TRegExpr.Create;
+  rx := TRegExprUmlauts.Create;
   rx.ModifierI := True;
   rx.Expression := editFilterVT.Text;
   if rx.Expression <> '' then try
@@ -9052,10 +9049,12 @@ procedure TMainForm.ApplyVTFilter(FromTimer: Boolean);
     match := rx.Expression = '';
     // Search for given text in node's captions
     if not match then for i := 0 to VT.Header.Columns.Count - 1 do begin
-      CellText := VT.Text[Node, i];
-      match := rx.Exec(CellText);
-      if match then
-        break;
+      if coVisible in VT.Header.Columns[i].Options then begin
+        CellText := VT.Text[Node, i];
+        match := rx.Exec(CellText);
+        if match then
+          break;
+      end;
     end;
     VT.IsVisible[Node] := match;
     if match then
@@ -12534,17 +12533,17 @@ procedure TMainForm.editDatabaseTableFilterChange(Sender: TObject);
 var
   Node: PVirtualNode;
   Obj: PDBObject;
-  rxdb, rxtable: TRegExpr;
+  rxdb, rxtable: TRegExprUmlauts;
   NodeMatches: Boolean;
   Errors: TStringList;
 begin
   // Immediately apply database filter
   LogSQL('editDatabaseTableFilterChange', lcDebug);
 
-  rxdb := TRegExpr.Create;
+  rxdb := TRegExprUmlauts.Create;
   rxdb.ModifierI := True;
   rxdb.Expression := '('+StringReplace(editDatabaseFilter.Text, ';', '|', [rfReplaceAll])+')';
-  rxtable := TRegExpr.Create;
+  rxtable := TRegExprUmlauts.Create;
   rxtable.ModifierI := True;
   rxtable.Expression := '('+StringReplace(editTableFilter.Text, ';', '|', [rfReplaceAll])+')';
 
@@ -15530,7 +15529,7 @@ procedure TMarkupWordSelection.BeginMarkup;
   LineText: String;
   Ranges: TWordRanges;
   Count: Integer;
-  rx: TRegExpr;
+  rx: TRegExprUmlauts;
 
   procedure AddRange(AStartCol, AEndCol: Integer);
   begin
@@ -15549,7 +15548,7 @@ procedure TMarkupWordSelection.BeginMarkup;
   L := SynEdit.Lines.Count;
   SetLength(FLineRanges, L);
 
-  rx := TRegExpr.Create;
+  rx := TRegExprUmlauts.Create;
   rx.Expression := '\b(' + QuoteRegExprMetaChars(FWord) + ')\b';
   rx.ModifierI := True;
 
