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

SynEdit: Highlighter: fix ending var/const fold-sections, if procedure starts with "asm"

Browse Source 
git-svn-id: trunk@31797 -
This commit is contained in:
martin 2011-07-25 08:18:21 +00:00
parent ec0495ca9b
commit d87451781e
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/synedit/synhighlighterpas.pp
View File

@ -482,7 +482,7 @@ type
procedure EndCustomCodeFoldBlock(ABlockType: TPascalCodeFoldBlockType);
function GetFoldNodeInfo(Line, Index: Integer; Filter: TSynFoldActions): TSynFoldNodeInfo; override;
function GetFoldNodeInfoCount(Line: Integer; Filter: TSynFoldActions): Integer; override;
function GetFoldNodeInfoCount(Line: Integer; Filter: TSynFoldActions): Integer; override; // Line: 0-based
property PasCodeFoldRange: TSynPasSynRange read GetPasCodeFoldRange;
function TopPascalCodeFoldBlockType
@ -1097,17 +1097,19 @@ end;
function TSynPasSyn.Func33: TtkTokenKind;
begin
if KeyComp('Or') then Result := tkKey else
if KeyComp('Asm') then
begin
Result := tkKey;
fRange := fRange + [rsAsm];
fAsmStart := True;
{$IFDEF SYN_LAZARUS}
StartPascalCodeFoldBlock(cfbtAsm);
//debugln('TSynPasSyn.Func37 BEGIN ',dbgs(ord(TopPascalCodeFoldBlockType)),' LineNumber=',dbgs(fLineNumber),' ',dbgs(MinimumCodeFoldBlockLevel),' ',dbgs(CurrentCodeFoldBlockLevel));
{$ENDIF}
end else Result := tkIdentifier;
if KeyComp('Or') then Result := tkKey
else
if KeyComp('Asm') then
begin
Result := tkKey;
fRange := fRange + [rsAsm];
fAsmStart := True;
if TopPascalCodeFoldBlockType in [cfbtVarType, cfbtLocalVarType] then
EndPascalCodeFoldBlockLastLine;
StartPascalCodeFoldBlock(cfbtAsm);
//debugln('TSynPasSyn.Func37 BEGIN ',dbgs(ord(TopPascalCodeFoldBlockType)),' LineNumber=',dbgs(fLineNumber),' ',dbgs(MinimumCodeFoldBlockLevel),' ',dbgs(CurrentCodeFoldBlockLevel));
end
else Result := tkIdentifier;
end;
function TSynPasSyn.Func35: TtkTokenKind;
@ -3944,6 +3946,7 @@ function TSynPasSyn.GetFoldNodeInfoCount(Line: Integer;
var
i: Integer;
begin
// TODO: assert line > 0
if FNodeInfoLine <> Line then
GetFoldNodeInfo(Line, 0, []);
Result := FNodeInfoCount;