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

SynEdit: Ifdef Markup: fixed using invalid peer

Browse Source 
git-svn-id: trunk@41201 -
This commit is contained in:
martin 2013-05-14 23:50:49 +00:00
parent c1207958d0
commit 3f6ef5ad82
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/synedit/syneditmarkupifdef.pp
View File

@ -2649,8 +2649,11 @@ XXXCurTree := FIfDefTree; try
Continue;
Peer := EntryFound.ClosingPeer;
If Peer = nil then
// if the peer line is not valid, then it ends after the visible area (otherwise it would have a valid line)
If (Peer = nil) or not(idlValid in Peer.Line.LineFlags) then begin
Peer := nil;
break; // Disabled to end of display or beyond (end of validated)
end;
d := Peer.Line.GetPosition;
if (d >= TopLine) //or ( (idnMultiLineTag in Peer.NodeFlags) and (d + Peer.Line.LastEntryEndLineOffs) )
then

79
components/synedit/test/testmarkupifdef.pas
View File

@ -52,6 +52,7 @@ type
function TestText4: TStringArray;
function TestText5: TStringArray;
function TestText6: TStringArray;
function TestText7: TStringArray;
procedure CheckNodes(AName: String; ALine: Integer;
AExp: array of TNodeExpect);
@ -564,6 +565,36 @@ begin
end;
function TTestMarkupIfDef.TestText7: TStringArray;
procedure AddLine(s: String);
begin
SetLength(Result, Length(Result)+1);
Result[Length(Result)-1] := s;
end;
begin
// 1
AddLine('//' );
AddLine('{$IFDEF a}' );
AddLine('' );
AddLine('{$Endif}' );
// 5
AddLine('' );
AddLine('' );
AddLine('' );
AddLine('' );
AddLine('' );
// 10
AddLine(' {$IFDEF a}' );
AddLine('' );
AddLine('' );
AddLine('' );
AddLine(' {$Endif}' );
// 15
AddLine('' );
AddLine('' );
end;
function TTestMarkupIfDef.CreateTheHighLighter: TSynCustomFoldHighlighter;
begin
Result := TSynPasSyn.Create(nil);
@ -1419,6 +1450,54 @@ begin
{%endregion}
{%region Add outer lines by removing endif}
// No outer lines to begin
n := 'Extend outer lines by removing endif - BUT new peer for new outer ifdef is PAST visible (not scanned)';
ReCreateEditForTreeTest(TestText7);
FTestTree.ValidateRange(1, 16, FOpenings); // scan all, so the nodes to exist
CheckNodes(n, 2, [ ExpN( 1,11, idnIfdef, EpSkip, EpEnd(4, 1)) ]);
CheckNodes(n, 4, [ ExpN( 1, 9, idnEndIf, EpIf(2, 1)) ]);
CheckNodes(n,10, [ ExpN( 2,12, idnIfdef, EpSkip, EpEnd(14, 2)) ]);
CheckNodes(n,14, [ ExpN( 2,10, idnEndIf, EpIf(10, 2)) ]);
SynEdit.TextBetweenPoints[point(4,4),point(4,4)] := ' '; // remove ifdef (leaving invalid node)
FOpenings.Clear;
FTestTree.ValidateRange(6, 8, FOpenings); // scan empty text
// Expect outer node to be changed
// This is siped by markup
//CheckNodes(n, 2, [ ExpN( 1,11, idnIfdef, EpSkip, EpNil) ]);
n := 'Extend outer lines by removing endif - new endif in visible range';
ReCreateEditForTreeTest(TestText7);
FTestTree.ValidateRange(1, 16, FOpenings); // scan all, so the nodes to exist
CheckNodes(n, 2, [ ExpN( 1,11, idnIfdef, EpSkip, EpEnd(4, 1)) ]);
CheckNodes(n, 4, [ ExpN( 1, 9, idnEndIf, EpIf(2, 1)) ]);
CheckNodes(n,10, [ ExpN( 2,12, idnIfdef, EpSkip, EpEnd(14, 2)) ]);
CheckNodes(n,14, [ ExpN( 2,10, idnEndIf, EpIf(10, 2)) ]);
SynEdit.TextBetweenPoints[point(4,10),point(4,10)] := ' '; // remove ifdef so we have an extra endif
FOpenings.Clear;
FTestTree.ValidateRange(1, 16, FOpenings); // scan all, so the nodes to exist
FTestTree.DebugPrint(true);
CheckNodes(n, 2, [ ExpN( 1,11, idnIfdef, EpSkip, EpEnd(4, 1)) ]);
CheckNodes(n, 4, [ ExpN( 1, 9, idnEndIf, EpIf(2, 1)) ]);
CheckNodes(n,10, [ ]);
CheckNodes(n,14, [ ExpN( 2,10, idnEndIf, EpNil) ]);
SynEdit.TextBetweenPoints[point(4,4),point(4,4)] := ' '; // remove ifdef (leaving invalid node)
FOpenings.Clear;
FTestTree.ValidateRange(6, 16, FOpenings); // scan empty text
FTestTree.DebugPrint(true);
CheckNodes(n, 2, [ ExpN( 1,11, idnIfdef, EpSkip, EpEnd(14, 2)) ]);
// CheckNodes(n, 4, [ ]);
CheckNodes(n,10, [ ]);
CheckNodes(n,14, [ ExpN( 2,10, idnEndIf, EpIf(2, 1)) ]);
{%endregion}
{%endregion peers + edit}