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

SynEdit, Pas-Highlighter: Improve highlight of "message" keyword. Add "constref". Issue #0017577, #0017732

Browse Source 
git-svn-id: trunk@27910 -
This commit is contained in:
martin 2010-10-27 22:48:15 +00:00
parent 3a062cd677
commit a4db8e39d0
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/synedit/synhighlighterpas.pp
View File

@ -71,9 +71,7 @@ type
rsAnsi, // *) comment
rsBor, // { comment
rsSlash, // //
{$IFDEF SYN_LAZARUS}
rsDirective,
{$ENDIF}
rsAsm, // assembler block
rsProperty,
rsInterface,
@ -85,7 +83,8 @@ type
rsAtClass,
rsAfterClass,
rsAtClosingBracket, // ')'
rsAtCaseLabel
rsAtCaseLabel,
rsInProcHeader // Declaration or implementation header of a Procedure, function, constructor...
);
TRangeStates = set of TRangeState;
@ -1288,7 +1287,8 @@ begin
if KeyComp('Dynamic') then
Result := tkKey
else
if KeyComp('Message') and (TopPascalCodeFoldBlockType in ProcModifierAllowed) and
if KeyComp('Message') and (not(rsInProcHeader in fRange)) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
Result := tkKey
@ -1626,7 +1626,15 @@ end;
function TSynPasSyn.Func100: TtkTokenKind;
begin
if KeyComp('Automated') then Result := tkKey else Result := tkIdentifier;
if KeyComp('Automated') then
Result := tkKey
else
if (rsInProcHeader in fRange) and KeyComp('constref') and
(PasCodeFoldRange.BracketNestLevel = 1)
then
Result := tkKey
else
Result := tkIdentifier
end;
function TSynPasSyn.Func101: TtkTokenKind;
@ -1652,6 +1660,7 @@ begin
not(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection]))
then
StartPascalCodeFoldBlock(cfbtProcedure);
fRange := fRange + [rsInProcHeader];
end;
Result := tkKey;
end
@ -1675,6 +1684,7 @@ begin
not(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection]))
then
StartPascalCodeFoldBlock(cfbtProcedure);
fRange := fRange + [rsInProcHeader];
end;
Result := tkKey;
end
@ -1848,6 +1858,7 @@ begin
not(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection]))
then
StartPascalCodeFoldBlock(cfbtProcedure);
fRange := fRange + [rsInProcHeader];
end;
Result := tkKey;
end else
@ -1892,6 +1903,7 @@ begin
not(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection]))
then
StartPascalCodeFoldBlock(cfbtProcedure);
fRange := fRange + [rsInProcHeader];
end;
Result := tkKey;
end else
@ -2601,8 +2613,10 @@ begin
EndPascalCodeFoldBlock(True);
if (tfb = cfbtCase) then
fRange := fRange + [rsAtCaseLabel];
if (rsProperty in fRange) and (PasCodeFoldRange.BracketNestLevel = 0) then
fRange := fRange - [rsProperty];
if (fRange * [rsProperty, rsInProcHeader] <> []) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
fRange := fRange - [rsProperty, rsInProcHeader];
end;
procedure TSynPasSyn.SlashProc;