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

SynEdit: Pas Highlighter, add keywords for MacPas objcprotocol

Browse Source
This commit is contained in:
Martin 2023-03-08 22:45:47 +01:00
parent cd05b3a45e
commit a8c5822dde
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
components/synedit/synhighlighterpas.pp
View File

@ -89,6 +89,7 @@ type
// or full class declaration TFoo = class ... end;
// Also included after class modifiers "sealed" and "abstract"
rsAtClass,
rsInObjcProtocol,
rsAfterClass,
rsAfterIdentifierOrValue, // anywhere where a ^ deref can happen "foo^", "foo^^", "foo()^", "foo[]^"
rsAfterIdentifierOrValueAdd,
@ -1083,8 +1084,10 @@ begin
if tfb = cfbtClassSection then
EndPascalCodeFoldBlockLastLine;
// after class-section either a class OR a record can close with the same "end"
if TopPascalCodeFoldBlockType = cfbtClass then
EndPascalCodeFoldBlock
if TopPascalCodeFoldBlockType = cfbtClass then begin
EndPascalCodeFoldBlock;
fRange := fRange - [rsInObjcProtocol];
end
else
if TopPascalCodeFoldBlockType = cfbtRecord then
EndPascalCodeFoldBlock;
@ -1194,6 +1197,16 @@ begin
EndPascalCodeFoldBlockLastLine;
StartPascalCodeFoldBlock(cfbtAsm);
end
else
if (fRange * [rsAfterClass, rsInObjcProtocol] = [rsAfterClass, rsInObjcProtocol]) and
KeyComp('name') and
(PasCodeFoldRange.BracketNestLevel = 0) and
(TopPascalCodeFoldBlockType in [cfbtClass])
then
begin
Result := tkKey;
fRange := fRange + [rsAtClass];
end
else Result := tkIdentifier;
end;
@ -2001,7 +2014,18 @@ end;
function TSynPasSyn.Func97: TtkTokenKind;
begin
if KeyComp('Threadvar') then Result := tkKey else Result := tkIdentifier;
if KeyComp('Threadvar') then Result := tkKey
else
if (rsInObjcProtocol in fRange) and
KeyComp('required') and
(PasCodeFoldRange.BracketNestLevel = 0) and
(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection])
then begin
Result := tkKey;
fRange := fRange - [rsAfterClassMembers, rsVarTypeInSpecification];
StartPascalCodeFoldBlock(cfbtClassSection);
end
else Result := tkIdentifier;
end;
function TSynPasSyn.Func98: TtkTokenKind;
@ -2095,6 +2119,16 @@ begin
fRange := fRange + [rsInProcHeader];
Result := tkKey;
end
else
if (rsInObjcProtocol in fRange) and
KeyComp('optional') and
(PasCodeFoldRange.BracketNestLevel = 0) and
(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection])
then begin
Result := tkKey;
fRange := fRange - [rsAfterClassMembers, rsVarTypeInSpecification];
StartPascalCodeFoldBlock(cfbtClassSection);
end
else Result := tkIdentifier;
end;
@ -2391,7 +2425,7 @@ begin
Result := tkKey;
if (rsAfterEqualOrColon in fRange) and (PasCodeFoldRange.BracketNestLevel = 0) then
begin
fRange := fRange + [rsAtClass];
fRange := fRange + [rsAtClass, rsInObjcProtocol];
StartPascalCodeFoldBlock(cfbtClass);
end;
end
@ -3314,8 +3348,10 @@ begin
if tfb = cfbtUses then
EndPascalCodeFoldBlock;
if (tfb = cfbtClass) and ((rsAfterClass in fRange) or InSkipBlocks) then
if (tfb = cfbtClass) and ((rsAfterClass in fRange) or InSkipBlocks) then begin
EndPascalCodeFoldBlock(True, True);
fRange := fRange - [rsInObjcProtocol];
end;
while (tfb in [cfbtIfThen,cfbtIfElse,cfbtForDo,cfbtWhileDo,cfbtWithDo]) do begin
EndPascalCodeFoldBlock(True);