Merge branch 'main' into 'main'

Solved GTK2 TMenuItem.Default property does not works #41528

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

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/include/menuitem.inc

@@ -1309,9 +1309,12 @@ begin
     // Only one item in a menu or submenu can be default.
     for i:=0 to FParent.Count-1 do
       if FParent[i].Default then
-        FParent[i].FDefault := False;
+        FParent[i].Default := False;
   FDefault:= AValue;
-  MenuChanged(True);
+  if HandleAllocated and not (csReading in ComponentState) and ((FParent <> nil) or (FMenu = nil)) then
+    TWSMenuItemClass(WidgetSetClass).SetDefault(Self, AValue);
+  MenuChanged(False);
+  OwnerFormDesignerModified(Self);
 end;
 
 {------------------------------------------------------------------------------

lcl/interfaces/gtk2/gtk2int.pas

@@ -302,7 +302,9 @@ type
     procedure _SetCallbackEx(const AMsg: LongInt; const AGTKObject: PGTKObject; const ALCLObject: TObject; Direct: Boolean);
     procedure SetCallbackEx(const AMsg: LongInt; const AGTKObject: PGTKObject; const ALCLObject: TObject; Direct: Boolean);
     procedure SetCommonCallbacks(const AGTKObject: PGTKObject; const ALCLObject: TObject);
-    procedure SetLabelCaption(const ALabel: PGtkLabel; const ACaption: String);
+    function SetLabelCaption(const ALabel: PGtkLabel; const ACaption: String): String;
+    function SetLabelCaptionMarkup(const ALabel: PGtkLabel; const ACaption: String;
+                                   AmpersandsEscape: Boolean=True; MarkupsEscape: Boolean=True): String;
     procedure SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
       MultiSelect, {%H-}ExtendedSelect: Boolean);
     function ForceLineBreaks(DC : hDC; Src: PChar; MaxWidthInPixels : Longint;

lcl/interfaces/gtk2/gtk2proc.inc

@@ -6023,11 +6023,17 @@ var
     MenuItemWidget: PGtkWidget);
   var
     LabelWidget: PGtkLabel;
+    s: String;
   begin
     if (MenuItemWidget = nil) or (LCLMenuItem = nil) then
       Exit;
     LabelWidget := g_object_get_data(PGObject(MenuItemWidget), 'LCLLabel');
-    Gtk2Widgetset.SetLabelCaption(LabelWidget, LCLMenuItem.Caption);
+    if LCLMenuItem.Default then
+         Gtk2Widgetset.SetLabelCaptionMarkup(LabelWidget,
+                          '<b>'+EscapeMarkups(Ampersands2Underscore(LCLMenuItem.Caption))+'</b>',
+                          False, False)
+    else Gtk2Widgetset.SetLabelCaption(LabelWidget, LCLMenuItem.Caption);
+
     gtk_widget_set_direction(PGtkWidget(LabelWidget), WidgetDirection[UseRTL]);
   end;
   
@@ -6057,15 +6063,24 @@ var
       if LabelWidget = nil then
       begin
         // create a label for the ShortCut
-        LabelWidget := PGtkLabel(gtk_label_new(PChar(Pointer(s))));
+        LabelWidget := PGtkLabel(gtk_label_new(''));
         g_object_set_data(PGObject(MenuItemWidget), 'LCLShortCutLabel', LabelWidget);
+        gtk_label_set_use_markup(LabelWidget, True);
         gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget));
+
+        if LCLMenuItem.Default then
+             gtk_label_set_markup(LabelWidget, PChar('<b>'+EscapeMarkups(s)+'</b>'))
+        else gtk_label_set_text(LabelWidget, PChar(s));
+
         gtk_widget_show(PGtkWidget(LabelWidget));
       end
       else
       begin
-        gtk_label_set_text(LabelWidget, PChar(Pointer(s)));
+        if LCLMenuItem.Default then
+             gtk_label_set_markup(LabelWidget, PChar('<b>'+EscapeMarkups(s)+'</b>'))
+        else gtk_label_set_text(LabelWidget, PChar(s));
       end;
+
       gtk_widget_set_direction(PGtkWidget(LabelWidget), GTK_TEXT_DIR_LTR); //Shortcut always LTR
       if UseRTL then
         gtk_misc_set_alignment(GTK_MISC(LabelWidget), 0.0, 0.5)
@@ -6114,6 +6129,8 @@ var
     gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget));
     SetMenuItemLabelText(LCLMenuItem, MenuItemWidget);
     //gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(LabelWidget), MenuItemWidget);
+    gtk_label_set_use_underline(LabelWidget, True);
+    gtk_label_set_use_markup(LabelWidget, True);
     gtk_widget_show(PGtkWidget(LabelWidget));
   end;
   
@@ -9162,6 +9179,19 @@ begin
   end;
 end;
 
+function EscapeMarkups(const Str: String): String;
+var
+  s_escaped: Pgchar;
+
+begin
+  s_escaped:= g_markup_escape_text(PChar(Str), Length(Str));
+
+  //MaxM: maybe #95 but even with the escape it is seen as _ and treated as mnemonic
+  Result:= StringReplace(s_escaped, '__', '&#32;', [rfReplaceAll]);
+
+  g_free(s_escaped);
+end;
+
 {-------------------------------------------------------------------------------
   Creates a new PChar. Deletes escaping ampersands, replaces the first single
   ampersand with an underscore and deletes all other single ampersands.
@@ -9182,30 +9212,32 @@ end;
 -------------------------------------------------------------------------------}
 function Ampersands2Underscore(const ASource: String): String;
 var
-  n: Integer;
+  n, len: Integer;
   FirstFound: Boolean;
+  s: String;
 begin
   //TODO: escape underscores
   FirstFound := False;
-  Result := ASource;
   n := 1;
-  while n <= Length(Result) do
+  Result:= '';
+  len:= Length(ASource);
+  while n <= len do
   begin
-    if Result[n] = '&' then
+    case ASource[n] of
-    begin
+      '_': Result := Result + '__';
-      if FirstFound
+      '&': if (n < len) and (ASource[n+1] = '&') then // got &&
-      or ( (n < Length(Result)) and (Result[n+1] = '&') ) // got &&
+           begin
-      then begin
+             Result:= Result + '&';
-        Delete(Result, n, 1);
+             Inc(n);               // Skip the second & of &&
-        if not FirstFound then
+            end
-          Inc(n);               // Skip the second & of &&
+           else if not(FirstFound) then
-      end
+                begin
-      else begin
+                  Result:= Result+ '_';
-        FirstFound := True;
+                  FirstFound:= True;
-        Result[n] := '_';
+                end;
-      end;
+      else Result:= Result+ ASource[n];
     end;
-    Inc(n);
+    inc(n);
   end;
 end;
 

lcl/interfaces/gtk2/gtk2proc.pp

@@ -591,6 +591,9 @@ procedure ConnectInternalWidgetsSignals(AWidget: PGtkWidget;
 
 //--
 
+// markups
+function EscapeMarkups(const Str: String): String;
+
 // accelerators
 function Ampersands2Underscore(Src: PChar): PChar;
 function Ampersands2Underscore(const ASource: String): String;

lcl/interfaces/gtk2/gtk2widgetset.inc

@@ -950,32 +950,22 @@ begin
   ConnectSignal(AGTKObject,'grab-notify',@gtk2GrabNotify, ALCLObject);
 end;
 
-procedure TGtk2WidgetSet.SetLabelCaption(const ALabel: PGtkLabel;
+function TGtk2WidgetSet.SetLabelCaption(const ALabel: PGtkLabel;
-  const ACaption: String);
+  const ACaption: String): String;
-var
-  s: String;
-  i: Integer;
 begin
-  s := '';
+  Result:= Ampersands2Underscore(ACaption);
-  i := 1;
+  gtk_label_set_text_with_mnemonic(ALabel, PChar(Result));
-  while i <=  Length(ACaption) do
+end;
-  begin
+
-    case ACaption[i] of
+function TGtk2WidgetSet.SetLabelCaptionMarkup(const ALabel: PGtkLabel;
-      '_': s := s + '__';
+  const ACaption: String; AmpersandsEscape: Boolean; MarkupsEscape: Boolean): String;
-      '&':
+begin
-        if (i < Length(ACaption)) and (ACaption[i + 1] = '&') then
+  Result:= ACaption;
-        begin
+  if AmpersandsEscape then Result:= Ampersands2Underscore(Result);
-          s := s + '&';
+  if MarkupsEscape then Result:= EscapeMarkups(Result);
-          inc(i);
+
-        end
+  gtk_label_set_use_markup(ALabel, True);
-        else
+  gtk_label_set_markup_with_mnemonic(ALabel, PChar(Result));
-          s := s + '_';
-    else
-      s := s + ACaption[i];
-    end;
-    inc(i);
-  end;
-  gtk_label_set_text_with_mnemonic(ALabel, PChar(s));
 end;
 
 {------------------------------------------------------------------------------

lcl/interfaces/gtk2/gtk2wsmenus.pp

@@ -44,6 +44,7 @@ type
     class procedure SetShortCut(const AMenuItem: TMenuItem; const ShortCutK1, ShortCutK2: TShortCut); override;
     class procedure SetVisible(const AMenuItem: TMenuItem; const Visible: boolean); override;
     class function SetCheck(const AMenuItem: TMenuItem; const Checked: boolean): boolean; override;
+    class function SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean; override;
     class function SetEnable(const AMenuItem: TMenuItem; const Enabled: boolean): boolean; override;
     class function SetRadioItem(const AMenuItem: TMenuItem; const {%H-}RadioItem: boolean): boolean; override;
     class function SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean; override;
@@ -452,6 +453,23 @@ begin
   end;
 end;
 
+class function TGtk2WSMenuItem.SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean;
+var
+   MenuItemWidget: PGtkWidget;
+
+begin
+  Result:= False;
+
+  if not WSCheckMenuItem(AMenuItem, 'SetDefault') then
+      Exit;
+
+  MenuItemWidget:={%H-}PGtkWidget(AMenuItem.Handle);
+  UpdateInnerMenuItem(AMenuItem,MenuItemWidget);
+//  gtk_widget_set_sensitive({%H-}PGtkWidget(AMenuItem.Handle), AMenuItem.Enabled);
+
+  Result:= True;
+end;
+
 class function TGtk2WSMenuItem.SetEnable(const AMenuItem: TMenuItem;
   const Enabled: boolean): boolean;
 begin

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;

lcl/widgetset/wsmenus.pp

@@ -59,6 +59,7 @@ type
     class procedure SetShortCut(const AMenuItem: TMenuItem; const ShortCutK1, ShortCutK2: TShortCut); virtual;
     class procedure SetVisible(const AMenuItem: TMenuItem; const Visible: boolean); virtual;
     class function SetCheck(const AMenuItem: TMenuItem; const Checked: boolean): boolean; virtual;
+    class function SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean; virtual;
     class function SetEnable(const AMenuItem: TMenuItem; const Enabled: boolean): boolean; virtual;
     class function SetRadioItem(const AMenuItem: TMenuItem; const RadioItem: boolean): boolean; virtual;
     class function SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean; virtual;
@@ -157,6 +158,11 @@ begin
   Result := false;
 end;
 
+class function TWSMenuItem.SetDefault(const AMenuItem: TMenuItem; const ADefault: boolean): boolean;
+begin
+  Result := false;
+end;
+
 class function TWSMenuItem.SetEnable(const AMenuItem: TMenuItem; const Enabled: boolean): boolean;
 begin
   Result := false;