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

SynEdit, fixes to IFDEFED debugln

Browse Source 
git-svn-id: trunk@53132 -
This commit is contained in:
martin 2016-10-17 02:22:41 +00:00
parent d54596a90f
commit 61eed71c13
3 changed files with 8 additions and 8 deletions

8
components/synedit/synedit.pp
View File

@ -7142,7 +7142,7 @@ begin
DecPaintLock;
aList.EndBlock; // Todo: Doing this after DecPaintLock, can cause duplicate calls to StatusChanged(scModified)
{$IFDEF SynUndoDebugBeginEnd}
DebugLnEnter(['<< TCustomSynEdit.InternalEndUndoBlock', DbgSName(self), ' ', dbgs(Self), ' aList=', aList, ' FPaintLock=', FPaintLock, ' InGroupCount=',aList.InGroupCount]);
DebugLnExit(['<< TCustomSynEdit.InternalEndUndoBlock', DbgSName(self), ' ', dbgs(Self), ' aList=', aList, ' FPaintLock=', FPaintLock, ' InGroupCount=',aList.InGroupCount]);
{$ENDIF}
end;
@ -7179,7 +7179,7 @@ begin
////FFoldedLinesView.UnLock;
fUndoList.EndBlock;
{$IFDEF SynUndoDebugBeginEnd}
DebugLnEnter(['<< TCustomSynEdit.EndUndoBlock', DbgSName(self), ' ', dbgs(Self), ' Caller=', ACaller, ' FPaintLock=', FPaintLock, ' InGroupCount=',fUndoList.InGroupCount, ' FIsInDecPaintLock=',dbgs(FIsInDecPaintLock)]);
DebugLnExit(['<< TCustomSynEdit.EndUndoBlock', DbgSName(self), ' ', dbgs(Self), ' Caller=', ACaller, ' FPaintLock=', FPaintLock, ' InGroupCount=',fUndoList.InGroupCount, ' FIsInDecPaintLock=',dbgs(FIsInDecPaintLock)]);
//if ACaller = '' then DumpStack;
{$ENDIF}
end;
@ -7624,7 +7624,7 @@ begin
fTSearch.Backwards:=bBackward;
// search while the current search position is inside of the search range
IncPaintLock;
BeginUndoBlock;
BeginUndoBlock{$IFDEF SynUndoDebugBeginEnd}('SynEdit.SearchReplaceEx'){$ENDIF};
try
ptFoundStartSel.y := -1;
//DebugLn(['TCustomSynEdit.SearchReplace ptStart=',dbgs(ptStart),' ptEnd=',dbgs(ptEnd),' ASearch="',dbgstr(ASearch),'" AReplace="',dbgstr(AReplace),'"']);
@ -7660,7 +7660,7 @@ begin
ptFoundStart.Y,ptFoundStart.X);
finally
IncPaintLock;
BeginUndoBlock
BeginUndoBlock{$IFDEF SynUndoDebugBeginEnd}('SynEdit.SearchReplaceEx(prompt)'){$ENDIF};
end;
if nAction = raCancel then exit;
end else

4
components/synedit/syneditmarkupifdef.pp
View File

@ -1229,9 +1229,9 @@ function TSynMarkupHighIfDefEntry.DebugText(Short: Boolean): String;
begin
If Self = nil then
exit('NODE IS NIL');
Result := Format('Line=%d NType=%s State=%s OpenState=%s Flags=%s ' +
Result := Format('Line=%s NType=%s State=%s OpenState=%s Flags=%s ' +
' StartCol=%d EndCol=%d',
[FLine, dbgs(FNodeType), dbgs(FNodeState), dbgs(FOpeningPeerNodeState) ,
[FLine.DebugText, dbgs(FNodeType), dbgs(FNodeState), dbgs(FOpeningPeerNodeState) ,
dbgs(FNodeFlags), FStartColumn, FEndColumn]
);
if Short or (FPeers[idpOpeningPeer] = nil) then

4
components/synedit/test/testtrimspace.pas
View File

@ -957,10 +957,10 @@ var UpdateMode: TUpdateMode;
SetCaret(1,1);
// need to add space later, so it is regocnized as trailing
BeginUndoBlock{$IFDEF SynUndoDebugBeginEnd}('test'){$ENDIF};
BeginUndoBlock;
SynEdit.TextBetweenPointsEx[point(5,1), point(6,1), scamEnd] := ''; // delete d
SynEdit.TextBetweenPointsEx[point(4,2), point(4,2), scamEnd] := ' '; // add space
EndUndoBlock{$IFDEF SynUndoDebugBeginEnd}('test'){$ENDIF};
EndUndoBlock;
TestIsFullText ('modified after block', ['abc', 'mno ', 'xyz', '']);
TestIsCaret('modified after block', 5,2);