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

SynEdit: Added debug-info (IFDEFed)

Browse Source 
git-svn-id: trunk@28964 -
This commit is contained in:
martin 2011-01-11 21:02:45 +00:00
parent 60ec5e108d
commit fff1e9d51a
2 changed files with 90 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/synedit/synedit.pp
View File

@ -4828,7 +4828,7 @@ end;
procedure TCustomSynEdit.LineCountChanged(Sender: TSynEditStrings; procedure TCustomSynEdit.LineCountChanged(Sender: TSynEditStrings;
AIndex, ACount: Integer); AIndex, ACount: Integer);
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- LineCountChanged Aindex', AIndex, ' ACount=', ACount]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- LineCountChanged Aindex', AIndex, ' ACount=', ACount]);{$ENDIF}
if (AIndex < FBeautifyStartLineIdx) or (FBeautifyStartLineIdx < 0) then if (AIndex < FBeautifyStartLineIdx) or (FBeautifyStartLineIdx < 0) then
FBeautifyStartLineIdx := AIndex; FBeautifyStartLineIdx := AIndex;
if ACount > 0 then begin if ACount > 0 then begin
@ -4861,7 +4861,7 @@ end;
procedure TCustomSynEdit.LineTextChanged(Sender: TSynEditStrings; procedure TCustomSynEdit.LineTextChanged(Sender: TSynEditStrings;
AIndex, ACount: Integer); AIndex, ACount: Integer);
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- LineTextChanged Aindex', AIndex, ' ACount=', ACount]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- LineTextChanged Aindex', AIndex, ' ACount=', ACount]);{$ENDIF}
if (AIndex < FBeautifyStartLineIdx) or (FBeautifyStartLineIdx < 0) then if (AIndex < FBeautifyStartLineIdx) or (FBeautifyStartLineIdx < 0) then
FBeautifyStartLineIdx := AIndex; FBeautifyStartLineIdx := AIndex;
if (AIndex + ACount - 1 > FBeautifyEndLineIdx) then if (AIndex + ACount - 1 > FBeautifyEndLineIdx) then
@ -4909,7 +4909,7 @@ procedure TCustomSynEdit.FoldChanged(Index : integer);
var var
i: Integer; i: Integer;
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- FoldChanged; Index=', Index, ' topline=', TopLine, ' ScreenRowToRow(LinesInWindow + 1)=', ScreenRowToRow(LinesInWindow + 1)]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- FoldChanged; Index=', Index, ' topline=', TopLine, ' ScreenRowToRow(LinesInWindow + 1)=', ScreenRowToRow(LinesInWindow + 1)]);{$ENDIF}
TopLine := TopLine; TopLine := TopLine;
i := FFoldedLinesView.CollapsedLineForFoldAtLine(CaretY); i := FFoldedLinesView.CollapsedLineForFoldAtLine(CaretY);
if i > 0 then begin if i > 0 then begin

98
components/synedit/syneditfoldedview.pp
View File

@ -27,6 +27,14 @@ unit SynEditFoldedView;
{$coperators on} {$coperators on}
{$IFDEF CPUPOWERPC} {$INLINE OFF} {$ENDIF} (* Workaround for bug 12576 (fpc) see bugs.freepascal.org/view.php?id=12576 *) {$IFDEF CPUPOWERPC} {$INLINE OFF} {$ENDIF} (* Workaround for bug 12576 (fpc) see bugs.freepascal.org/view.php?id=12576 *)
{$IFDEF SynFoldDebug}
{$DEFINE SynDebug}
{$DEFINE SynFoldSaveDebug}
{$ENDIF}
{$IFDEF SynFoldSaveDebug}
{$DEFINE SynDebug}
{$ENDIF}
interface interface
uses uses
@ -229,6 +237,12 @@ type
); );
TSynEditFoldLineCapabilities = set of TSynEditFoldLineCapability; TSynEditFoldLineCapabilities = set of TSynEditFoldLineCapability;
TSynEditFoldType = (scftOpen, scftFold, scftHide, scftAll, scftInvalid); TSynEditFoldType = (scftOpen, scftFold, scftHide, scftAll, scftInvalid);
{$IFDEF SynFoldSaveDebug}
const
SynEditFoldTypeNames: Array [TSynEditFoldType] of string =
('scftOpen', 'scftFold', 'scftHide', 'scftAll', 'scftInvalid');
type
{$ENDIF}
{ TSynEditFoldProvider } { TSynEditFoldProvider }
@ -474,6 +488,12 @@ type
end; end;
TSynEditFoldExportCoderStates = TSynEditFoldExportCoderStates =
(sfecAtBegin, sfecAtPoint, sfecInRepeatCount, sfecInvalid, sfecAtEOF); (sfecAtBegin, sfecAtPoint, sfecInRepeatCount, sfecInvalid, sfecAtEOF);
{$IFDEF SynFoldSaveDebug}
const
SynEditFoldExportCoderStates: Array [TSynEditFoldExportCoderStates] of String =
('sfecAtBegin', 'sfecAtPoint', 'sfecInRepeatCount', 'sfecInvalid', 'sfecAtEOF');
type
{$ENDIF}
{ TSynEditFoldExportCoder } { TSynEditFoldExportCoder }
@ -857,6 +877,9 @@ end;
procedure TSynEditFoldExportStream.AppendMem(AMem: Pointer; ALen: Integer); procedure TSynEditFoldExportStream.AppendMem(AMem: Pointer; ALen: Integer);
begin begin
{$IFDEF SynFoldSaveDebug}
DebugLn(['TSynEditFoldExportStream.AppendMem len=', ALen]);
{$ENDIF}
FMem := nil; FMem := nil;
if ALen > 0 then if ALen > 0 then
System.Move(AMem^, GrowData(ALen)^, ALen); System.Move(AMem^, GrowData(ALen)^, ALen);
@ -866,6 +889,9 @@ procedure TSynEditFoldExportStream.AppendString(ATxt: String);
var var
l: Integer; l: Integer;
begin begin
{$IFDEF SynFoldSaveDebug}
DebugLn(['TSynEditFoldExportStream.AppendString ', ATxt]);
{$ENDIF}
FMem := nil; FMem := nil;
l := length(ATxt); l := length(ATxt);
if l > 0 then if l > 0 then
@ -874,12 +900,18 @@ end;
procedure TSynEditFoldExportStream.AppendNum(ANum: Integer); procedure TSynEditFoldExportStream.AppendNum(ANum: Integer);
begin begin
{$IFDEF SynFoldSaveDebug}
DebugLn(['TSynEditFoldExportStream.AppendNum ', ANum]);
{$ENDIF}
FMem := nil; FMem := nil;
AppendString(EncodeIntEx(ANum)); AppendString(EncodeIntEx(ANum));
end; end;
procedure TSynEditFoldExportStream.AppendNumEx(ANum: Integer); procedure TSynEditFoldExportStream.AppendNumEx(ANum: Integer);
begin begin
{$IFDEF SynFoldSaveDebug}
DebugLn(['TSynEditFoldExportStream.AppendNumEx ', ANum]);
{$ENDIF}
FMem := nil; FMem := nil;
AppendString(EncodeIntEx2(ANum)); AppendString(EncodeIntEx2(ANum));
end; end;
@ -939,11 +971,17 @@ end;
function TSynEditFoldExportStream.ReadNum: Integer; function TSynEditFoldExportStream.ReadNum: Integer;
begin begin
Result := InternalReadNum(FPos); Result := InternalReadNum(FPos);
{$IFDEF SynFoldSaveDebug}
DebugLn(['TSynEditFoldExportStream.ReadNum ', Result]);
{$ENDIF}
end; end;
function TSynEditFoldExportStream.ReadNumEx: Integer; function TSynEditFoldExportStream.ReadNumEx: Integer;
begin begin
Result := InternalReadNumEx(FPos); Result := InternalReadNumEx(FPos);
{$IFDEF SynFoldSaveDebug}
DebugLn(['TSynEditFoldExportStream.ReadNumEx ', Result]);
{$ENDIF}
end; end;
function TSynEditFoldExportStream.EOF: Boolean; function TSynEditFoldExportStream.EOF: Boolean;
@ -990,6 +1028,9 @@ begin
break; break;
FExportStream.AppendString(AStream.ReadString(2)); FExportStream.AppendString(AStream.ReadString(2));
end; end;
{$IFDEF SynFoldSaveDebug}
DebugLn(['TSynEditFoldExportCoder.Create(<from input-stream> FType=', dbgs(FFoldType), ' txtLen=', FExportStream.Len, ' Txt="', FExportStream.Text, '"']);
{$ENDIF}
Reset; Reset;
end; end;
@ -1065,6 +1106,9 @@ procedure TSynEditFoldExportCoder.AddNode(aX, aY, aLen: Integer; aFoldType: TSyn
In the first <ConsecutiveFoldedCount> after <NodePos> the bit is unused, since nodepos is continued. In the first <ConsecutiveFoldedCount> after <NodePos> the bit is unused, since nodepos is continued.
*) *)
begin begin
{$IFDEF SynFoldSaveDebug}
debugln(['TSynEditFoldExportCoder.AddNode FType=', dbgs(FFoldType),' X=', aX, ' Y=', aY, 'Len=', aLen, 'FType=', SynEditFoldTypeNames[aFoldType], ' WCacheLen=', FWriteCacheLen]);
{$ENDIF}
if (FWriteCacheLen = 0) and (aFoldType = scftOpen) then if (FWriteCacheLen = 0) and (aFoldType = scftOpen) then
exit; exit;
if FWriteCacheLen >= length(FWriteCache) then if FWriteCacheLen >= length(FWriteCache) then
@ -1172,6 +1216,9 @@ begin
FExportStream.Clear; FExportStream.Clear;
exit; exit;
end; end;
{$IFDEF SynFoldSaveDebug}
DebugLnEnter(['TSynEditFoldExportCoder.Finish FType=', dbgs(FFoldType)]);
{$ENDIF}
FirstLine := 0; FirstLine := 0;
if (FWriteCacheTypes * [scftFold, scftHide] = [scftFold, scftHide]) then begin if (FWriteCacheTypes * [scftFold, scftHide] = [scftFold, scftHide]) then begin
@ -1214,6 +1261,9 @@ begin
FExportStream.AppendNum (FWriteCache[i2-1].aY - FirstLine); // Last folded Coords FExportStream.AppendNum (FWriteCache[i2-1].aY - FirstLine); // Last folded Coords
FExportStream.AppendNumEx(FWriteCache[i2-1].aX); FExportStream.AppendNumEx(FWriteCache[i2-1].aX);
end; end;
{$IFDEF SynFoldSaveDebug}
DebugLnExit(['TSynEditFoldExportCoder.Finish FType=', dbgs(FFoldType), ' txtLen=', FExportStream.Len, ' Txt="', FExportStream.Text, '"']);
{$ENDIF}
end; end;
function TSynEditFoldExportCoder.ReadNode(aX, aY: Integer; aLen: Integer): TSynEditFoldType; function TSynEditFoldExportCoder.ReadNode(aX, aY: Integer; aLen: Integer): TSynEditFoldType;
@ -1229,12 +1279,23 @@ function TSynEditFoldExportCoder.ReadNode(aX, aY: Integer; aLen: Integer): TSynE
end; end;
function Invalidate: TSynEditFoldType; function Invalidate: TSynEditFoldType;
begin begin
{$IFDEF SynFoldSaveDebug}
DebugLn(['Invalidate']);
{$ENDIF}
FReadState := sfecInvalid; FReadState := sfecInvalid;
Result := scftInvalid; Result := scftInvalid;
end; end;
var var
i: Integer; i: Integer;
begin begin
{$IFDEF SynFoldSaveDebug}
DebugLnEnter(['TSynEditFoldExportCoder.Readnode X=', aX, ' Y=', aY, ' Len=',aLen,
' ReadState=',SynEditFoldExportCoderStates[FReadState],
' FReadCount=', FReadCount, ' FReadY=', FReadY, ' FReadX=', FReadX,
' FReadSumLen=', FReadSumLen, ' FReadType=', SynEditFoldTypeNames[FReadType]
]);
try
{$ENDIF}
case FReadState of case FReadState of
sfecAtBegin, sfecAtPoint: sfecAtBegin, sfecAtPoint:
begin begin
@ -1366,7 +1427,16 @@ begin
begin begin
exit(scftOpen); exit(scftOpen);
end; end;
sfecInvalid: begin exit(scftInvalid); end; end; sfecInvalid:
begin
exit(scftInvalid);
end;
end;
{$IFDEF SynFoldSaveDebug}
finally
DebugLnExit(['TSynEditFoldExportCoder.Readnode << ']);
end;
{$ENDIF}
end; end;
function TSynEditFoldExportCoder.EOF: Boolean; function TSynEditFoldExportCoder.EOF: Boolean;
@ -2090,7 +2160,7 @@ function TSynTextFoldAVLTree.InsertNewFold(ALine, AColumn, ACount, AVisibleLines
var var
r : TSynTextFoldAVLNodeData; r : TSynTextFoldAVLNodeData;
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- InsertNewFold ALine:=', ALine, ' AColumn=', AColumn]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- InsertNewFold ALine:=', ALine, ' AColumn=', AColumn]);{$ENDIF}
r := NewNode; r := NewNode;
r.LineOffset := ALine; // 1-based r.LineOffset := ALine; // 1-based
r.FoldIndex := AColumn; r.FoldIndex := AColumn;
@ -2109,7 +2179,7 @@ var
OldFold : TSynTextFoldAVLNode; OldFold : TSynTextFoldAVLNode;
lcount: Integer; lcount: Integer;
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- RemoveFoldForLine ALine:=', ALine, ' OnlyCol=',OnlyCol]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- RemoveFoldForLine ALine:=', ALine, ' OnlyCol=',OnlyCol]);{$ENDIF}
Result := ALine; // - 1; // Return index Result := ALine; // - 1; // Return index
OldFold := FindFoldForLine(ALine, False); OldFold := FindFoldForLine(ALine, False);
if OldFold.StartLine < Result then if OldFold.StartLine < Result then
@ -2143,7 +2213,7 @@ var
OnlyNested: Boolean; OnlyNested: Boolean;
Nested: TSynTextFoldAVLNode; Nested: TSynTextFoldAVLNode;
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- RemoveFoldForNodeAtLine: ALine:=', ALine, ' ANode.StartLine=', ANode.StartLine]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- RemoveFoldForNodeAtLine: ALine:=', ALine, ' ANode.StartLine=', ANode.StartLine]);{$ENDIF}
OnlyNested := ALine >= ANode.StartLine + ANode.FullCount; OnlyNested := ALine >= ANode.StartLine + ANode.FullCount;
// The cfCollapsed line is one line before the fold // The cfCollapsed line is one line before the fold
Result := ANode.StartLine-1; // Return the cfcollapsed that was unfolded Result := ANode.StartLine-1; // Return the cfcollapsed that was unfolded
@ -2725,7 +2795,7 @@ begin
node := tmpnode; node := tmpnode;
tpos := tpos - node.MergedLineCount; tpos := tpos - node.MergedLineCount;
end; end;
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- CalculateMaps fTopLine:=', fTopLine, ' tpos=',tpos]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- CalculateMaps fTopLine:=', fTopLine, ' tpos=',tpos]);{$ENDIF}
cnt := fLines.Count; cnt := fLines.Count;
for i := 0 to fLinesInWindow + 2 do begin for i := 0 to fLinesInWindow + 2 do begin
if (tpos > cnt) or (tpos < 0) then begin if (tpos > cnt) or (tpos < 0) then begin
@ -2992,6 +3062,9 @@ begin
*) *)
if AsText then if AsText then
begin (* *** Encode as Text for XML *** *) begin (* *** Encode as Text for XML *** *)
{$IFDEF SynFoldSaveDebug}
DebugLnEnter(['TSynEditFoldedView.GetFoldDescription as Text']);
{$ENDIF}
NdInfo := NdiHelper1.GotoNodeOpenPos(Node); NdInfo := NdiHelper1.GotoNodeOpenPos(Node);
while Node.IsInFold and (Node.StartLine-2 <= AEndIndex) do while Node.IsInFold and (Node.StartLine-2 <= AEndIndex) do
begin begin
@ -3023,6 +3096,9 @@ begin
end; end;
FoldHelper.AddChecksum; FoldHelper.AddChecksum;
FoldHelper.Compress; FoldHelper.Compress;
{$IFDEF SynFoldSaveDebug}
DebugLnExit(['TSynEditFoldedView.GetFoldDescription as Text']);
{$ENDIF}
end (* *** END: Encode as Text for XML *** *) end (* *** END: Encode as Text for XML *** *)
else else
begin (* *** Encode as Binary *** *) begin (* *** Encode as Binary *** *)
@ -3428,7 +3504,7 @@ var
FldIndex := FldLine - 1; FldIndex := FldLine - 1;
FldLen := node.FullCount; FldLen := node.FullCount;
if (FldLen <= 0) then begin if (FldLen <= 0) then begin
{$IFDEF SYNFOLDDEBUG}debugln(['>>FOLD-- FixFolding: Remove node with len<0 FldLine=', FldLine]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['>>FOLD-- FixFolding: Remove node with len<0 FldLine=', FldLine]);{$ENDIF}
DoRemoveNode(node); DoRemoveNode(node);
continue; continue;
end; end;
@ -3458,7 +3534,7 @@ var
CurLen := -1; CurLen := -1;
if CurLen <> FldLen then begin if CurLen <> FldLen then begin
{$IFDEF SYNFOLDDEBUG}debugln(['>>FOLD-- FixFolding: Remove node with len<>len FldLine=', FldLine, ' curlen=',CurLen, ' FldLen=',FldLen]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['>>FOLD-- FixFolding: Remove node with len<>len FldLine=', FldLine, ' curlen=',CurLen, ' FldLen=',FldLen]);{$ENDIF}
DoRemoveNode(node); DoRemoveNode(node);
continue; continue;
end; end;
@ -3489,7 +3565,7 @@ var
var var
node, tmpnode: TSynTextFoldAVLNode; node, tmpnode: TSynTextFoldAVLNode;
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['>>FOLD-- FixFolding: Start=', AStart, ' AMinEnd=',AMinEnd]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['>>FOLD-- FixFolding: Start=', AStart, ' AMinEnd=',AMinEnd]);{$ENDIF}
Result := false; Result := false;
if fLockCount > 0 then begin if fLockCount > 0 then begin
fNeedCaretCheck := true; // We may be here as a result of lines deleted/inserted fNeedCaretCheck := true; // We may be here as a result of lines deleted/inserted
@ -3526,7 +3602,7 @@ begin
CalculateMaps; CalculateMaps;
if Assigned(fOnFoldChanged) and (FirstchangedLine >= 0) then if Assigned(fOnFoldChanged) and (FirstchangedLine >= 0) then
fOnFoldChanged(FirstchangedLine); fOnFoldChanged(FirstchangedLine);
{$IFDEF SYNFOLDDEBUG}debugln(['<<FOLD-- FixFolding: DONE=', Result]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['<<FOLD-- FixFolding: DONE=', Result]);{$ENDIF}
end; end;
procedure TSynEditFoldedView.DoCaretChanged(Sender : TObject); procedure TSynEditFoldedView.DoCaretChanged(Sender : TObject);
@ -3538,14 +3614,14 @@ begin
exit; exit;
end; end;
i := TSynEditCaret(Sender).LinePos-1; i := TSynEditCaret(Sender).LinePos-1;
{$IFDEF SYNFOLDDEBUG}if FoldedAtTextIndex[i] then debugln(['FOLD-- DoCaretChanged about to unfold at Index=', i]);{$ENDIF} {$IFDEF SynFoldDebug}if FoldedAtTextIndex[i] then debugln(['FOLD-- DoCaretChanged about to unfold at Index=', i]);{$ENDIF}
if FoldedAtTextIndex[i] then if FoldedAtTextIndex[i] then
UnFoldAtTextIndexCollapsed(i); UnFoldAtTextIndexCollapsed(i);
end; end;
procedure TSynEditFoldedView.LineCountChanged(Sender: TSynEditStrings; AIndex, ACount : Integer); procedure TSynEditFoldedView.LineCountChanged(Sender: TSynEditStrings; AIndex, ACount : Integer);
begin begin
{$IFDEF SYNFOLDDEBUG}debugln(['FOLD-- LineCountChanged AIndex=', AIndex, ' Acount=',ACount]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- LineCountChanged AIndex=', AIndex, ' Acount=',ACount]);{$ENDIF}
// no need for fix folding => synedit will be called, and scanlines will call fixfolding // no need for fix folding => synedit will be called, and scanlines will call fixfolding
{TODO: a "need fix folding" flag => to ensure it will be called if synedit doesnt} {TODO: a "need fix folding" flag => to ensure it will be called if synedit doesnt}
if (fLockCount > 0) and (AIndex < max(fNeedFixFrom, fNeedFixMinEnd)) then begin if (fLockCount > 0) and (AIndex < max(fNeedFixFrom, fNeedFixMinEnd)) then begin