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

SynEdit: Fixed save folding if none highlighter folds needs to be skipped

Browse Source 
git-svn-id: trunk@33644 -
This commit is contained in:
martin 2011-11-20 15:52:21 +00:00
parent 205972e34c
commit 44e910ac93
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/synedit/syneditfoldedview.pp
View File

@ -1901,6 +1901,7 @@ begin
FActions := [sfaClose, sfaFold];
NdInfo := FHighlighter.FoldNodeInfo[ANode.StartLine - ANode.SourceLineOffset - 1,
ANode.FoldIndex, [sfaOpen, sfaFold]];
if sfaInvalid in NdInfo.FoldAction then exit(NdInfo);
EndLineIdx := FHighlighter.FoldEndLine(ANode.StartLine - ANode.SourceLineOffset - 1,
ANode.FoldIndex);
@ -3338,6 +3339,11 @@ begin
{$IFDEF SynFoldSaveDebug}
DebugLnEnter(['TSynEditFoldedView.GetFoldDescription as Text']);
{$ENDIF}
while Node.IsInFold and (Node.fData.Classification <> fncHighlighter) do
Node := NodeIterator.Next;
if not node.IsInFold then
exit;
NdInfo := NdiHelper1.GotoNodeOpenPos(Node);
while Node.IsInFold and (Node.StartLine-2 <= AEndIndex) do
begin
@ -3346,17 +3352,20 @@ begin
NodeFoldType := scftFold;
if Node.SourceLineOffset = 0 then
NodeFoldType := scftHide;
if not(sfaDefaultCollapsed in NdInfo.FoldAction) then // Currently skip default nodes
if (NdInfo.FoldAction * [sfaInvalid, sfaDefaultCollapsed] = []) then // Currently skip default nodes
FoldCoderForType(NdInfo.FoldType).AddNode
(NdInfo.LogXStart, NdInfo.LineIndex, Node.FullCount, NodeFoldType);
Node := NodeIterator.Next;
while Node.IsInFold and (Node.fData.Classification <> fncHighlighter) do
Node := NodeIterator.Next;
if not Node.IsInFold then
break;
NdInfo := NdiHelper1.Next;
while NdiHelper1.IsValid and (not NdiHelper1.IsAtNodeOpenPos(Node)) do begin
// Add unfolded nodes
if not(sfaDefaultCollapsed in NdInfo.FoldAction) then // Currently skip default nodes
if (NdInfo.FoldAction * [sfaInvalid, sfaDefaultCollapsed] = []) then // Currently skip default nodes
FoldCoderForType(NdInfo.FoldType).AddNode
(NdInfo.LogXStart, NdInfo.LineIndex, 0, scftOpen);
NdInfo := NdiHelper1.Next;