Merge branch 'LoopHijackUndoRedo' into 'main'

Cocoa: Improve Undo/Redo handling for when COCOALOOPHIJACK is defined.

See merge request freepascal.org/lazarus/lazarus!361

components/codetools/pascalparsertool.pas

@@ -4708,8 +4708,16 @@ begin
     CreateChildNode;
     CurNode.Desc:=ctnIdentifier;
     CurNode.EndPos:=CurPos.EndPos;
-    EndChildNode;
     ReadNextAtom;
+    while CurPos.Flag = cafPoint do begin
+      // TMyClassClass = class of unit1.TMyClass
+      ReadNextAtom;
+      AtomIsIdentifierSaveE(20250403202500);
+      CurNode.EndPos:=CurPos.EndPos;
+      ReadNextAtom;
+    end;
+    EndChildNode;
+    ReadHintModifiers(False);
     if CurPos.Flag<>cafSemicolon then
       SaveRaiseCharExpectedButAtomFound(20170421195756,';');
   end else begin

components/codetools/tests/moduletests/fdt_classof.pas

@@ -6,6 +6,7 @@ interface
 
 type
   TClassOfMy = class of TMy{declaration:fdt_classof.TMy};
+  TClass1OfMy = class of TMy{declaration:fdt_classof.TMy} deprecated 'abc' experimental;
 
   { TMy }
 
@@ -14,6 +15,8 @@ type
     class procedure Run;
   end;
 
+  TClass2OfMy = class of fdt_classof.TMy{declaration!:fdt_classof.TMy};
+
 procedure DoIt;
 
 implementation

components/lazcontrols/listviewfilteredit.pas

@@ -156,6 +156,7 @@ begin
     fFilteredListview.RemoveFreeNotification(Self);
     ForceFilter('');
   end;
+  fOriginalData.Clear;
   fFilteredListview := AValue;
   if Assigned(fFilteredListview) then
   begin

components/synedit/languages/syneditstrconst.ca.po

@@ -93,6 +93,18 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr ""

components/synedit/languages/syneditstrconst.cs.po

@@ -95,6 +95,18 @@ msgstr "Třída"
 msgid "Comment"
 msgstr "Komentář"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Podmínka"

components/synedit/languages/syneditstrconst.de.po

@@ -97,6 +97,18 @@ msgstr "Klasse"
 msgid "Comment"
 msgstr "Kommentar"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Bedingung"

components/synedit/languages/syneditstrconst.es.po

@@ -95,6 +95,18 @@ msgstr "Clase"
 msgid "Comment"
 msgstr "Comentario"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Condición"

components/synedit/languages/syneditstrconst.fi.po

@@ -88,6 +88,18 @@ msgstr "Luokka"
 msgid "Comment"
 msgstr "Kommentti"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Ehdot"

components/synedit/languages/syneditstrconst.fr.po

@@ -95,6 +95,18 @@ msgstr "Classe"
 msgid "Comment"
 msgstr "Commentaire"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Condition"

components/synedit/languages/syneditstrconst.he.po

@@ -93,6 +93,18 @@ msgstr "מחלקה"
 msgid "Comment"
 msgstr "הערה"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "תנאי"

components/synedit/languages/syneditstrconst.hu.po

@@ -95,6 +95,18 @@ msgstr "Osztály"
 msgid "Comment"
 msgstr "Megjegyzés"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Feltétel"

components/synedit/languages/syneditstrconst.id.po

@@ -96,6 +96,18 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr ""

components/synedit/languages/syneditstrconst.it.po

@@ -96,6 +96,18 @@ msgstr "Classe"
 msgid "Comment"
 msgstr "Commento"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Condizione"

components/synedit/languages/syneditstrconst.lt.po

@@ -96,6 +96,18 @@ msgstr "Klasė"
 msgid "Comment"
 msgstr "Komentaras"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Sąlyga"

components/synedit/languages/syneditstrconst.nl.po

@@ -93,6 +93,18 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr ""

components/synedit/languages/syneditstrconst.pl.po

@@ -96,6 +96,18 @@ msgstr "Klasa"
 msgid "Comment"
 msgstr "Komentarz"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Warunek"

components/synedit/languages/syneditstrconst.pot

@@ -85,6 +85,18 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr ""

components/synedit/languages/syneditstrconst.pt_BR.po

@@ -95,6 +95,18 @@ msgstr "Classe"
 msgid "Comment"
 msgstr "Comentário"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Condição"

components/synedit/languages/syneditstrconst.ru.po

@@ -95,6 +95,18 @@ msgstr "Класс"
 msgid "Comment"
 msgstr "Комментарий"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Условие"

components/synedit/languages/syneditstrconst.tr.po

@@ -99,6 +99,18 @@ msgstr "Sınıf"
 msgid "Comment"
 msgstr "Açıklama"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Şart"

components/synedit/languages/syneditstrconst.uk.po

@@ -98,6 +98,18 @@ msgstr "Клас"
 msgid "Comment"
 msgstr "Коментар"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "Умова"

components/synedit/languages/syneditstrconst.zh_CN.po

@@ -96,6 +96,18 @@ msgstr "类"
 msgid "Comment"
 msgstr "注释"
 
+#: syneditstrconst.syns_attrcommentansi
+msgid "Ansi Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentcurly
+msgid "Curly Comment"
+msgstr ""
+
+#: syneditstrconst.syns_attrcommentslash
+msgid "Slash Comment"
+msgstr ""
+
 #: syneditstrconst.syns_attrcondition
 msgid "Condition"
 msgstr "状态"

components/synedit/syneditstrconst.pp

@@ -66,6 +66,9 @@ resourcestring
   SYNS_AttrCharacter            =  'Character';
   SYNS_AttrClass                =  'Class';
   SYNS_AttrComment              =  'Comment';
+  SYNS_AttrCommentAnsi          =  'Ansi Comment';
+  SYNS_AttrCommentCurly         =  'Curly Comment';
+  SYNS_AttrCommentSlash         =  'Slash Comment';
   SYNS_AttrIDEDirective         =  'IDE Directive';
   SYNS_AttrCondition            =  'Condition';
   SYNS_AttrDataType             =  'Data type';
@@ -199,6 +202,9 @@ const
   SYNS_XML_AttrCharacter            =  'Character';
   SYNS_XML_AttrClass                =  'Class';
   SYNS_XML_AttrComment              =  'Comment';
+  SYNS_XML_AttrCommentAnsi          =  'Ansi Comment';
+  SYNS_XML_AttrCommentCurly         =  'Curly Comment';
+  SYNS_XML_AttrCommentSlash         =  'Slash Comment';
   SYNS_XML_AttrIDEDirective         =  'IDE Directive';
   SYNS_XML_AttrCondition            =  'Condition';
   SYNS_XML_AttrDataType             =  'Data type';

components/synedit/synhighlighterpas.pp

@@ -188,7 +188,11 @@ type
     reaDeclVarName,
     reaDeclTypeName,
     reaDeclType,
-    reaDeclValue
+    reaDeclValue,
+    // other
+    reCommentAnsi,
+    reCommentCurly,
+    reCommentSlash
   );
   TRequiredStates = set of TRequiredState;
 
@@ -595,6 +599,9 @@ type
     PSynPasSynCustomTokenInfoListEx = ^TSynPasSynCustomTokenInfoListEx;
   private
     FCaseLabelAttriMatchesElseOtherwise: Boolean;
+    FCommentAnsiAttri: TSynHighlighterAttributesModifier;
+    FCommentCurlyAttri: TSynHighlighterAttributesModifier;
+    FCommentSlashAttri: TSynHighlighterAttributesModifier;
     FNestedBracketAttribs: TSynHighlighterAttributesModifierCollection;
     FNestedBracketMergedMarkup: TSynSelectedColorMergeResult;
     FHighNestedBracketAttrib: integer;
@@ -605,7 +612,6 @@ type
       Lists: array of TSynPasSynCustomTokenInfoListEx;
     end;
     FCustomTokenMarkup, FCustomCommentTokenMarkup: TSynHighlighterAttributesModifier;
-    FCustomTokenMarkupSlash, FCustomTokenMarkupAnsi, FCustomTokenMarkupBor: TSynHighlighterAttributesModifier;
     FCustomTokenMergedMarkup, FCustomCommentTokenMergedMarkup: TSynSelectedColorMergeResult;
 
     FCurIDEDirectiveAttri: TSynSelectedColorMergeResult;
@@ -987,6 +993,9 @@ type
     property AsmAttri: TSynHighlighterAttributes read fAsmAttri write fAsmAttri;
     property CommentAttri: TSynHighlighterAttributes read fCommentAttri
       write fCommentAttri;
+    property CommentAnsiAttri: TSynHighlighterAttributesModifier read FCommentAnsiAttri write FCommentAnsiAttri;
+    property CommentCurlyAttri: TSynHighlighterAttributesModifier read FCommentCurlyAttri write FCommentCurlyAttri;
+    property CommentSlashAttri: TSynHighlighterAttributesModifier read FCommentSlashAttri write FCommentSlashAttri;
     property IDEDirectiveAttri: TSynHighlighterAttributesModifier read FIDEDirectiveAttri
       write FIDEDirectiveAttri;
     property IdentifierAttri: TSynHighlighterAttributes read fIdentifierAttri
@@ -1596,9 +1605,6 @@ begin
   FNeedCustomTokenBuild := False;
   FCustomTokenMarkup := nil;
   FCustomCommentTokenMarkup := nil;
-  FCustomTokenMarkupSlash := nil;
-  FCustomTokenMarkupAnsi := nil;
-  FCustomTokenMarkupBor := nil;
   for i := 0 to 255 do begin
     for j := 0 to length(FCustomTokenInfo[i].Lists) - 1 do
       FreeAndNil(FCustomTokenInfo[i].Lists[j].List);
@@ -1625,23 +1631,6 @@ begin
 
       FCustomTokenInfo[h].MatchTokenKinds := FCustomTokenInfo[h].MatchTokenKinds + mtk;
       for tk in mtk do begin
-        case tk of
-          tkSlashComment:
-            if t = '*' then begin
-              FCustomTokenMarkupSlash := FSynCustomTokens[i].Markup;
-              continue;
-            end;
-          tkAnsiComment:
-            if t = '*' then begin
-              FCustomTokenMarkupAnsi := FSynCustomTokens[i].Markup;
-              continue;
-            end;
-          tkBorComment:
-            if t = '*' then begin
-              FCustomTokenMarkupBor := FSynCustomTokens[i].Markup;
-              continue;
-            end;
-        end;
         Lst := FindList(h, tk);
         Lst^.List.AddObject(UpperCase(t), FSynCustomTokens[i]);
       end;
@@ -3943,7 +3932,7 @@ end;
 constructor TSynPasSyn.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
-  FCaseLabelAttriMatchesElseOtherwise := True;;
+  FCaseLabelAttriMatchesElseOtherwise := True;
   FStringKeywordMode := spsmDefault;
   FExtendedKeywordsMode := False;
   CreateDividerDrawConfig;
@@ -3953,6 +3942,12 @@ begin
   fCommentAttri := TSynHighlighterAttributes.Create(@SYNS_AttrComment, SYNS_XML_AttrComment);
   fCommentAttri.Style:= [fsItalic];
   AddAttribute(fCommentAttri);
+  FCommentAnsiAttri := TSynHighlighterAttributesModifier.Create(@SYNS_AttrCommentAnsi, SYNS_XML_AttrCommentAnsi);
+  AddAttribute(FCommentAnsiAttri);
+  FCommentCurlyAttri := TSynHighlighterAttributesModifier.Create(@SYNS_AttrCommentCurly, SYNS_XML_AttrCommentCurly);
+  AddAttribute(FCommentCurlyAttri);
+  FCommentSlashAttri := TSynHighlighterAttributesModifier.Create(@SYNS_AttrCommentSlash, SYNS_XML_AttrCommentSlash);
+  AddAttribute(FCommentSlashAttri);
   FIDEDirectiveAttri := TSynHighlighterAttributesModifier.Create(@SYNS_AttrIDEDirective, SYNS_XML_AttrIDEDirective);
   AddAttribute(FIDEDirectiveAttri);
   // FCurIDEDirectiveAttri, FCurCaseLabelAttri, FCurProcTypeDeclExtraAttr
@@ -4182,7 +4177,8 @@ var
   p: LongInt;
   IsInWord, WasInWord, ct: Boolean;
 begin
-  FCustomCommentTokenMarkup := FCustomTokenMarkupBor;
+  if reCommentCurly in FRequiredStates then
+    FCustomCommentTokenMarkup := FCommentCurlyAttri;
   fTokenID := tkComment;
   if rsIDEDirective in fRange then
     fTokenID := tkIDEDirective;
@@ -4500,7 +4496,8 @@ begin
       dec(Run);
       StartPascalCodeFoldBlock(cfbtBorCommand);
 
-      FCustomCommentTokenMarkup := FCustomTokenMarkupBor;
+      if reCommentCurly in FRequiredStates then
+        FCustomCommentTokenMarkup := FCommentCurlyAttri;
       if not (FIsInNextToEOL or IsScanning) then
         GetCustomSymbolToken(tkBorComment, 1, FCustomTokenMarkup);
 
@@ -4737,7 +4734,8 @@ var
   IsInWord, WasInWord, ct: Boolean;
 begin
   fTokenID := tkComment;
-  FCustomCommentTokenMarkup := FCustomTokenMarkupAnsi;
+  if reCommentAnsi in FRequiredStates then
+    FCustomCommentTokenMarkup := FCommentAnsiAttri;
 
   if (not (FIsInNextToEOL or IsScanning)) then begin
     if FUsePasDoc and (fLine[Run] = '@') then begin
@@ -4863,7 +4861,8 @@ begin
         Dec(Run);
         StartPascalCodeFoldBlock(cfbtAnsiComment);
 
-        FCustomCommentTokenMarkup := FCustomTokenMarkupAnsi;
+        if reCommentAnsi in FRequiredStates then
+          FCustomCommentTokenMarkup := FCommentAnsiAttri;
         if not (FIsInNextToEOL or IsScanning) then
           GetCustomSymbolToken(tkAnsiComment, 2, FCustomTokenMarkup);
 
@@ -5061,7 +5060,8 @@ end;
 procedure TSynPasSyn.SlashProc;
 begin
   if fLine[Run+1] = '/' then begin
-    FCustomCommentTokenMarkup := FCustomTokenMarkupSlash;
+    if reCommentSlash in FRequiredStates then
+      FCustomCommentTokenMarkup := FCommentSlashAttri;
     FIsInSlash := True;
 
     fTokenID := tkComment;
@@ -5093,7 +5093,8 @@ var
   AtSlashOpen: Boolean;
 begin
   if FIsInSlash and (not (FIsInNextToEOL or IsScanning)) then begin
-    FCustomCommentTokenMarkup := FCustomTokenMarkupSlash;
+    if reCommentSlash in FRequiredStates then
+      FCustomCommentTokenMarkup := FCommentSlashAttri;
     fTokenID := tkComment;
 
     if (fLine[Run] = '@') then begin
@@ -5113,7 +5114,8 @@ begin
   AtSlashOpen := (fLine[Run] = '/') and (fLine[Run + 1] = '/') and not FIsInSlash;
   if FIsInSlash or AtSlashOpen then begin
     FIsInSlash := True;
-    FCustomCommentTokenMarkup := FCustomTokenMarkupSlash;
+    if reCommentSlash in FRequiredStates then
+      FCustomCommentTokenMarkup := FCommentSlashAttri;
     // Continue fold block
     fTokenID := tkComment;
 
@@ -7309,6 +7311,10 @@ begin
 
   FRequiredStates := [];
 
+  if FCommentAnsiAttri.IsEnabled then  Include(FRequiredStates, reCommentAnsi);
+  if FCommentCurlyAttri.IsEnabled then Include(FRequiredStates, reCommentCurly);
+  if FCommentSlashAttri.IsEnabled then Include(FRequiredStates, reCommentSlash);
+
   //if fPasDocKeyWordAttri.IsEnabled then begin
   //end;
   //if fPasDocSymbolAttri.IsEnabled then begin

ide/frames/editor_color_options.pas

@@ -25,7 +25,7 @@ unit editor_color_options;
 interface
 
 uses
-  Classes, Controls, Math, Types, typinfo, sysutils,
+  Classes, Controls, Math, Types, typinfo, fgl, sysutils,
   // LazUtils
   Laz2_XMLCfg, LazFileUtils, LazUTF8, LazLoggerBase,
   // LCL
@@ -1162,13 +1162,53 @@ begin
 end;
 
 procedure TEditorColorOptionsFrame.FillColorElementListBox;
+  function GetParentNameForLanguageElement(AnAttr: TColorSchemeAttribute;
+    out AParentName, AGroupName: String): boolean;
+  begin
+    AGroupName := '';
+    AParentName := FCurrentHighlighter.LanguageName;
+    Result := True;
+
+    if hafCustomWords in AnAttr.Features then begin
+      AParentName := AParentName + ' ' + dlgAddHiAttrGroup_Suffix_Custom;
+    end
+    else
+    if strlcomp(PChar(AnAttr.StoredName), PChar(NESTED_BRACKET_STOREDNAME), length(NESTED_BRACKET_STOREDNAME)) = 0
+    then begin
+      AParentName := AParentName + ' ' + dlgAddHiAttrGroup_Suffix_NBrackets;
+    end
+    else
+    if hafAlpha in AnAttr.Features then begin
+      AParentName := AParentName + ' ' + dlgAddHiAttrGroup_Suffix_Extended;
+
+      case AnAttr.StoredName of
+        //SYNS_XML_AttrIDEDirective,
+        SYNS_XML_AttrCommentAnsi, SYNS_XML_AttrCommentCurly, SYNS_XML_AttrCommentSlash,
+        SYNS_XML_AttrPasDocKey, SYNS_XML_AttrPasDocSymbol, SYNS_XML_AttrPasDocUnknown:
+          AGroupName := dlgAddHiAttrGroup_Comment;
+        SYNS_XML_AttrProcedureHeaderName, SYNS_XML_AttrPropertyName,
+        SYNS_XML_AttrProcedureHeaderParam, SYNS_XML_AttrProcedureHeaderResult,
+        SYNS_XML_AttrProcedureHeaderType,  SYNS_XML_AttrProcedureHeaderValue:
+          AGroupName := dlgAddHiAttrGroup_ProgHeader;
+        SYNS_XML_AttrDeclarationVarConstName, SYNS_XML_AttrDeclarationTypeName,
+        SYNS_XML_AttrDeclarationType, SYNS_XML_AttrDeclarationValue:
+          AGroupName := dlgAddHiAttrGroup_DeclSection;
+      end;
+    end
+    else
+      Result := False;
+  end;
+
+type
+  TGroupNodes = specialize TFPGMap<String, TTreeNode>;
 var
   i, AttriIdx: Integer;
-  ParentName: String;
+  ParentName, GroupName: String;
   ParentNode: TTreeNode;
   j: TAhaGroupName;
   Attr: TColorSchemeAttribute;
   NewNode, DefNode, p, ComplWindowEntryParentNode: TTreeNode;
+  GroupNodes: TGroupNodes;
 begin
   ColorElementTree.BeginUpdate;
   ColorElementTree.Items.Clear;
@@ -1185,6 +1225,7 @@ begin
     if not(j in [agnDefault, agnLanguage, agnRegistered]) then
       ColorElementTree.Items.Add(nil, AdditionalHighlightGroupNames[j]).Visible := False;
 
+  GroupNodes := TGroupNodes.Create;
   // Fill Attributes in
   ComplWindowEntryParentNode := nil;
   DefNode := nil;
@@ -1196,25 +1237,18 @@ begin
         agnLanguage:
           begin
             ParentNode := ColorElementTree.Items.GetFirstNode;
-            if FIsEditingDefaults then begin
+            if GetParentNameForLanguageElement(Attr, ParentName, GroupName) then begin
-              ParentName := AdditionalHighlightGroupNames[agnDefault];
-            end
-            else
-            if hafCustomWords in Attr.Features then begin
-              ParentName := FCurrentHighlighter.LanguageName + ' ' + dlgAddHiAttrGroup_Suffix_Custom;
               ParentNode := ColorElementTree.Items.FindTopLvlNode(ParentName);
-            end
+              if ParentNode = nil then
-            else
+                ParentNode := ColorElementTree.Items.Add(nil, ParentName);
-            if strlcomp(PChar(Attr.StoredName), PChar(NESTED_BRACKET_STOREDNAME), length(NESTED_BRACKET_STOREDNAME)) = 0
+
-            then begin
+              if GroupName <> '' then begin
-              ParentName := FCurrentHighlighter.LanguageName + ' ' + dlgAddHiAttrGroup_Suffix_NBrackets;
+                ParentName := GroupName;
-              ParentNode := ColorElementTree.Items.FindTopLvlNode(ParentName);
+                p := ParentNode;
-            end
+                if not GroupNodes.TryGetData(GroupName, ParentNode) then begin
-            else begin
+                  ParentNode := ColorElementTree.Items.AddChild(p, GroupName);
-              ParentName := FCurrentHighlighter.LanguageName;
+                  GroupNodes.Add(GroupName, ParentNode);
-              if hafAlpha in Attr.Features then begin
+                end;
-                ParentName := ParentName + ' ' + dlgAddHiAttrGroup_Suffix_Extended;
-                ParentNode := ColorElementTree.Items.FindTopLvlNode(ParentName);
               end;
             end;
           end;
@@ -1261,6 +1295,9 @@ begin
   FindCurHighlightElement;
   if assigned(ComplWindowEntryParentNode) then
     ComplWindowEntryParentNode.Collapse(True);
+  for i := 0 to GroupNodes.Count - 1 do
+    GroupNodes.Data[i].Collapse(False);
+  GroupNodes.Free;
 end;
 
 procedure TEditorColorOptionsFrame.SetColorElementsToDefaults(OnlySelected: Boolean);

ide/lazarusidestrconsts.pas

@@ -2202,6 +2202,9 @@ resourcestring
   dlgAddHiAttrGroup_Suffix_Custom  = '(Custom)';
   dlgAddHiAttrGroup_Suffix_NBrackets  = '(Nested Brackets)';
   dlgAddHiAttrGroup_Suffix_EntryType  = '(entry type)';
+  dlgAddHiAttrGroup_Comment      = 'Comments';
+  dlgAddHiAttrGroup_ProgHeader   = 'Procedure Header';
+  dlgAddHiAttrGroup_DeclSection  = 'Declaration Sections';
 
 
   dlgEditAccessCaptionLockedInView            = 'Locked, if text in view';

lcl/interfaces/cocoa/cocoa_extra.pas

@@ -15,6 +15,7 @@
 unit Cocoa_Extra;
 
 {$mode objfpc}{$H+}
+{$modeswitch cblocks}
 {$modeswitch objectivec1}
 {$include cocoadefines.inc}
 
@@ -645,6 +646,14 @@ type
     patchVersion: NSInteger;
   end;
 
+  NSUndoManagerUndoWithTargetCBlock = reference to procedure(target: id); cblock; cdecl;
+
+  NSUndoManagerFix = objccategory external (NSUndoManager)
+    procedure registerUndoWithTarget_handler(target: id;
+      handler: NSUndoManagerUndoWithTargetCBlock);
+      message 'registerUndoWithTarget:handler:';
+  end;
+
 const
   // defined in NSApplication.h
   NSAppKitVersionNumber10_5 = 949;

lcl/interfaces/cocoa/cocoatextedits.pas

@@ -23,6 +23,9 @@ unit CocoaTextEdits;
 {.$DEFINE COCOA_DEBUG_SETBOUNDS}
 {.$DEFINE COCOA_SPIN_DEBUG}
 {.$DEFINE COCOA_SPINEDIT_INSIDE_CONTAINER}
+{$IFDEF COCOALOOPHIJACK}
+  {$DEFINE COCOA_OVERRIDE_UNDOMANAGER}
+{$ENDIF}
 
 interface
 
@@ -31,7 +34,7 @@ uses
   Math, // needed for MinDouble, MaxDouble
   LCLType,
   MacOSAll, CocoaAll, CocoaConfig, CocoaUtils, CocoaGDIObjects,
-  CocoaPrivate, CocoaCallback;
+  CocoaPrivate, CocoaCallback, Cocoa_Extra;
 
 const
   SPINEDIT_DEFAULT_STEPPER_WIDTH = 15;
@@ -64,7 +67,10 @@ type
     callback: ICommonCallback;
     maxLength: Integer;
     fixedInitSetting: Boolean;
-
+    {$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+    FUndoManager: NSUndoManager;
+    procedure dealloc; override;
+    {$ENDIF}
     function acceptsFirstResponder: LCLObjCBoolean; override;
     function lclGetCallback: ICommonCallback; override;
     procedure lclClearCallback; override;
@@ -83,6 +89,10 @@ type
     procedure scrollWheel(event: NSEvent); override;
 
     procedure lclSetMaxLength(amax: integer);
+    {$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+    function undoManagerForTextView(view: NSTextView): NSUndoManager; message 'undoManagerForTextView:';
+    {$ENDIF}
+
   end;
 
   { TCocoaSecureTextField }
@@ -91,6 +101,10 @@ type
   public
     maxLength: Integer;
     callback: ICommonCallback;
+    {$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+    FUndoManager: NSUndoManager;
+    procedure dealloc; override;
+    {$ENDIF}
     function acceptsFirstResponder: LCLObjCBoolean; override;
     function lclGetCallback: ICommonCallback; override;
     procedure lclClearCallback; override;
@@ -108,6 +122,9 @@ type
     procedure scrollWheel(event: NSEvent); override;
 
     procedure lclSetMaxLength(amax: integer);
+    {$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+    function undoManagerForTextView(view: NSTextView): NSUndoManager; message 'undoManagerForTextView:';
+    {$ENDIF}
   end;
 
   { TCocoaTextView }
@@ -458,6 +475,20 @@ type
   end;
 {$ENDIF}
 
+  { TCocoaUndoManager }
+{$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+  TCocoaUndoManager = objcclass(NSUndoManager)
+    lastEvent: NSEvent; // weak reference
+    function init: id; override;
+    procedure undo; override;
+    procedure registerUndoWithTarget_selector_object(target: id; selector: SEL;
+      anObject: id); override;
+    procedure registerUndoWithTarget_handler(target: id;
+      handler: NSUndoManagerUndoWithTargetCBlock); override;
+    procedure lclCheckGrouping; message 'lclCheckGrouping';
+  end;
+{$ENDIF} 
+
 // these constants are missing from CocoaAll for some reason
 const
   NSTextAlignmentLeft      = 0;
@@ -983,6 +1014,15 @@ end;
 
 { TCocoaTextField }
 
+{$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+procedure TCocoaTextField.dealloc;
+begin
+  if Assigned(FUndoManager) then
+    FUndoManager.release;
+  inherited dealloc;
+end;
+{$ENDIF}
+
 function TCocoaTextField.acceptsFirstResponder: LCLObjCBoolean;
 begin
   Result := NSViewCanFocus(Self);
@@ -1090,6 +1130,15 @@ begin
   maxLength := amax;
 end;
 
+{$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+function TCocoaTextField.undoManagerForTextView(view: NSTextView): NSUndoManager;
+begin
+  if not Assigned(FUndoManager) then
+    FUndoManager := TCocoaUndoManager.alloc.init;
+  Result := FUndoManager;
+end;
+{$ENDIF}
+
 { TCocoaTextView }
 
 procedure TCocoaTextView.changeColor(sender: id);
@@ -1244,12 +1293,25 @@ end;
 function TCocoaTextView.undoManagerForTextView(view: NSTextView): NSUndoManager;
 begin
   if not Assigned(FUndoManager) then
+    {$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+    FUndoManager := TCocoaUndoManager.alloc.init;
+    {$ELSE}
     FUndoManager := NSUndoManager.alloc.init;
+    {$ENDIF}
   Result := FUndoManager;
 end;
 
 { TCocoaSecureTextField }
 
+{$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+procedure TCocoaSecureTextField.dealloc;
+begin
+  if Assigned(FUndoManager) then
+    FUndoManager.release;
+  inherited dealloc;
+end;
+{$ENDIF}
+
 function TCocoaSecureTextField.acceptsFirstResponder: LCLObjCBoolean;
 begin
   Result := NSViewCanFocus(Self);
@@ -1338,6 +1400,15 @@ begin
   MaxLength := amax;
 end;
 
+{$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+function TCocoaSecureTextField.undoManagerForTextView(view: NSTextView): NSUndoManager;
+begin
+  if not Assigned(FUndoManager) then
+    FUndoManager := TCocoaUndoManager.alloc.init;
+  Result := FUndoManager;
+end;
+{$ENDIF}
+
 { TCocoaEditComboBoxList }
 
 procedure TCocoaEditComboBoxList.InsertItem(Index: Integer; const S: string;
@@ -2369,5 +2440,54 @@ end;
 
 {$ENDIF}
 
+{$IFDEF COCOA_OVERRIDE_UNDOMANAGER}
+
+{ TCocoaUndoManager }
+
+function TCocoaUndoManager.init: id;
+begin
+  // This manages top-level undo groups automatically to work around an issue
+  // where, if we hijack the run loop, all undoable actions are combined into a
+  // single undo group.  It isn't necessary for correct behavior in the other
+  // modes.
+  Result := inherited init;
+  Result.setGroupsByEvent(False);
+end;
+
+procedure TCocoaUndoManager.undo;
+begin
+  if not groupsByEvent and (groupingLevel = 1) then
+    endUndoGrouping;
+  inherited;
+end;
+
+procedure TCocoaUndoManager.registerUndoWithTarget_selector_object(target: id;
+  selector: SEL; anObject: id);
+begin
+  lclCheckGrouping;
+  inherited;
+end;
+
+procedure TCocoaUndoManager.registerUndoWithTarget_handler(target: id;
+  handler: NSUndoManagerUndoWithTargetCBlock);
+begin
+  lclCheckGrouping;
+  inherited registerUndoWithTarget_handler(target, handler);
+end;
+
+procedure TCocoaUndoManager.lclCheckGrouping;
+begin
+  if groupsByEvent or isUndoing or isRedoing then
+    Exit;
+  if (groupingLevel = 1) and (lastEvent <> NSApp.currentEvent) then
+    endUndoGrouping;
+  if groupingLevel = 0 then begin
+    lastEvent := NSApp.currentEvent;
+    beginUndoGrouping;
+  end;
+end;
+
+{$ENDIF}
+
 end.
 

lcl/interfaces/qt/qtwidgets.pas

@@ -5008,7 +5008,7 @@ end;
 procedure TQtWidget.setFocus;
 begin
   if getFocusPolicy <> QtNoFocus then
-    QWidget_setFocus(Widget, QtOtherFocusReason) {issue #10155}
+    QWidget_setFocus(Widget, QtTabFocusReason) {issue #10155}
   else
     QWidget_setFocus(Widget);
 end;

lcl/interfaces/qt5/qtwidgets.pas

@@ -5164,7 +5164,7 @@ end;
 procedure TQtWidget.setFocus;
 begin
   if getFocusPolicy <> QtNoFocus then
-    QWidget_setFocus(Widget, QtOtherFocusReason) {issue #10155}
+    QWidget_setFocus(Widget, QtTabFocusReason) {issue #10155}
   else
     QWidget_setFocus(Widget);
 end;

lcl/interfaces/qt6/qtwidgets.pas

@@ -5168,7 +5168,7 @@ end;
 procedure TQtWidget.setFocus;
 begin
   if getFocusPolicy <> QtNoFocus then
-    QWidget_setFocus(Widget, QtOtherFocusReason) {issue #10155}
+    QWidget_setFocus(Widget, QtTabFocusReason) {issue #10155}
   else
     QWidget_setFocus(Widget);
 end;