paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 14:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: PascalHighlighter, fixes for declaration type highlights

Browse Source
This commit is contained in:
Martin 2025-04-13 00:54:11 +02:00
parent 88384e653a
commit 266a8bffbf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/synedit/synhighlighterpas.pp
View File

@ -2427,8 +2427,8 @@ var
tfb: TPascalCodeFoldBlockType;
begin
if KeyComp('Public') then begin
tfb := CloseFolds(TopPascalCodeFoldBlockType, [cfbtClassConstBlock, cfbtClassTypeBlock]);
if (tfb in [cfbtClass, cfbtClassSection, cfbtRecord]) and
tfb := TopPascalCodeFoldBlockType;
if (tfb in [cfbtClass, cfbtClassSection, cfbtRecord, cfbtClassConstBlock, cfbtClassTypeBlock]) and
(PasCodeFoldRange.BracketNestLevel = 0) and
(fRange * [rsInProcHeader, rsAfterEqualOrColon] = []) and
( (FTokenState in [tsAtBeginOfStatement, tsAfterVarConstType, tsAfterClass, tsAfterTypedConst]) or (fRange * [rsInClassHeader, rsInObjcProtocol, rsAfterIdentifierOrValue] <> []) )
@ -2436,6 +2436,7 @@ begin
Result := tkKey;
FNextTokenState := tsAtBeginOfStatement;
fRange := fRange - [rsAfterClassMembers, rsVarTypeInSpecification];
tfb := CloseFolds(tfb, [cfbtClassConstBlock, cfbtClassTypeBlock]);
if (tfb=cfbtClassSection) then
EndPascalCodeFoldBlockLastLine;
StartPascalCodeFoldBlock(cfbtClassSection);
@ -5493,7 +5494,7 @@ begin
if rsAfterEqual in fRange then begin
if (rsAfterEqual in FOldRange) then begin
case tfb of
cfbtTypeBlock, cfbtLocalTypeBlock:
cfbtTypeBlock, cfbtLocalTypeBlock, cfbtClassTypeBlock:
if (reaDeclType in FRequiredStates) and
CanApplyExtendedDeclarationAttribute(FDeclaredTypeAttributeMode)
then
@ -5516,7 +5517,7 @@ begin
else
if FTokenID = tkIdentifier then
case tfb of
cfbtTypeBlock, cfbtLocalTypeBlock:
cfbtTypeBlock, cfbtLocalTypeBlock, cfbtClassTypeBlock:
if (reaDeclTypeName in FRequiredStates) then
FTokenTypeDeclExtraAttrib := eaDeclTypeName;
otherwise