forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, ddoc fold as option, close according to options, not both

This commit is contained in:
Basile Burg 2015-03-24 07:39:45 +01:00
parent a955a0557d
commit 6d7193877c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ce_d2syn.pas
View File

@ -553,9 +553,11 @@ begin
else fTokKind := tkCommt; else fTokKind := tkCommt;
if readUntil(reader, fTokStop, '*/') then if readUntil(reader, fTokStop, '*/') then
begin begin
fCurrRange.rangeKinds -= [rkBlockDoc1, rkBlockCom1]; if (fkComments1 in fFoldKinds) and (fTokKind = tkCommt) then
if (fkComments1 in fFoldKinds) or (fkDDoc in fFoldKinds) then EndCodeFoldBlock()
else if (fkDDoc in fFoldKinds) and (fTokKind = tkDDocs) then
EndCodeFoldBlock(); EndCodeFoldBlock();
fCurrRange.rangeKinds -= [rkBlockDoc1, rkBlockCom1];
exit; exit;
end; end;
readLine(reader, fTokStop); readLine(reader, fTokStop);
@ -595,9 +597,11 @@ begin
dec(fCurrRange.nestedCommentsCount); dec(fCurrRange.nestedCommentsCount);
if fCurrRange.nestedCommentsCount <> 0 then if fCurrRange.nestedCommentsCount <> 0 then
exit; exit;
fCurrRange.rangeKinds -= [rkBlockDoc2, rkBlockCom2]; if (fkComments2 in fFoldKinds) and (fTokKind = tkCommt) then
if (fkComments2 in fFoldKinds) or (fkDDoc in fFoldKinds) then EndCodeFoldBlock()
else if (fkDDoc in fFoldKinds) and (fTokKind = tkDDocs) then
EndCodeFoldBlock(); EndCodeFoldBlock();
fCurrRange.rangeKinds -= [rkBlockDoc2, rkBlockCom2];
exit; exit;
end; end;
readLine(reader, fTokStop); readLine(reader, fTokStop);