paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 22:41:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

synedit:

Browse Source 
- limit 'enumerator' highlighting to the sections where it is a keyword
  - operator starts the similar code folding block as procedure and function

git-svn-id: trunk@22483 -
This commit is contained in:
paul 2009-11-07 18:38:10 +00:00
parent 19d3a509bd
commit a59d9d39b9
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/synedit/synhighlighterpas.pp
View File

@ -913,7 +913,7 @@ begin
EndPascalCodeFoldBlock;
end else if TopPascalCodeFoldBlockType in [cfbtTopBeginEnd, cfbtAsm] then begin
EndPascalCodeFoldBlock;
if TopPascalCodeFoldBlockType = cfbtProcedure then
if TopPascalCodeFoldBlockType in [cfbtProcedure] then
EndPascalCodeFoldBlock;
if TopPascalCodeFoldBlockType = cfbtProgram then
EndPascalCodeFoldBlock;
@ -1624,7 +1624,22 @@ end;
function TSynPasSyn.Func108: TtkTokenKind;
begin
if KeyComp('Operator') then Result := tkKey else Result := tkIdentifier;
if KeyComp('Operator') then
begin
if not(rsAfterEqual in fRange) then
begin
PasCodeFoldRange.BracketNestLevel := 0; // Reset in case of partial code
CloseBeginEndBlocksBeforeProc;
if TopPascalCodeFoldBlockType in [cfbtVarType, cfbtLocalVarType] then
EndPascalCodeFoldBlockLastLine;
if ((rsImplementation in fRange) and
not(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection])) then
StartPascalCodeFoldBlock(cfbtProcedure);
end;
Result := tkKey;
end
else
Result := tkIdentifier;
end;
function TSynPasSyn.Func112: TtkTokenKind;
@ -1668,7 +1683,7 @@ begin
if KeyComp('Ansistring') then
Result := tkKey
else
if KeyComp('Enumerator') then
if KeyComp('Enumerator') and (TopPascalCodeFoldBlockType in [cfbtClassSection]) then
Result := tkKey
else
Result := tkIdentifier;