From c2313cc16301b4b1562c7c2444028a70fab7acb8 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 29 Jun 2010 17:53:04 +0000 Subject: [PATCH] codetools: added debugging git-svn-id: trunk@26331 - --- components/codetools/basiccodetools.pas | 17 ++++++++--------- components/codetools/codecompletiontool.pas | 3 +++ components/codetools/linkscanner.pas | 3 +++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/components/codetools/basiccodetools.pas b/components/codetools/basiccodetools.pas index a83cb20b56..163d827331 100644 --- a/components/codetools/basiccodetools.pas +++ b/components/codetools/basiccodetools.pas @@ -2363,20 +2363,19 @@ var SrcLen: integer; procedure DoSkipEmptyLines(var p: integer); var - OldPos: LongInt; + r: LongInt; begin - OldPos:=p; + r:=p; repeat - while (p<=SrcLen) and (Source[p] in [' ',#9]) do inc(p); - if (p<=SrcLen) and (Source[p] in [#10,#13]) then begin + while (r<=SrcLen) and (Source[r] in [' ',#9]) do inc(r); + if (r<=SrcLen) and (Source[r] in [#10,#13]) then begin // an empty line => skip - OldPos:=p;// remember position in front of new line characters - inc(p); - if (p<=SrcLen) and (Source[p] in [#10,#13]) and (Source[p]<>Source[p-1]) + p:=r;// remember position in front of new line characters + inc(r); + if (r<=SrcLen) and (Source[r] in [#10,#13]) and (Source[r]<>Source[r-1]) then - inc(p); + inc(r); end else begin - p:=OldPos; exit; end; until false; diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas index 2192af868e..ac6643125b 100644 --- a/components/codetools/codecompletiontool.pas +++ b/components/codetools/codecompletiontool.pas @@ -4930,6 +4930,9 @@ begin // delete group FromPos:=FindLineEndOrCodeInFrontOfPosition(FirstNodeExt.Node.StartPos,true); ToPos:=FindLineEndOrCodeAfterPosition(LastNodeExt.Node.EndPos,true); + {$IFDEF VerboseBug16168} + debugln(['TCodeCompletionCodeTool.RemoveEmptyMethods ',dbgstr(copy(Src,FromPos,ToPos-FromPos))]); + {$ENDIF} if AllRemoved and FirstGroup and FindClassMethodsComment(FromPos,CommentStart,CommentEnd) then begin // all method bodies will be removed => remove the default comment too diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas index f7beaa008f..c83c5ddc64 100644 --- a/components/codetools/linkscanner.pas +++ b/components/codetools/linkscanner.pas @@ -3716,6 +3716,9 @@ begin else Len:=aLinkSize-StartPos; inc(StartPos,FLinks[LinkIndex].SrcPos); + {$IFDEF VerboseBug16168} + DebugLn(['[TLinkScanner.DeleteRange] Pos=',StartPos,'-',StartPos+Len,' ',dbgstr(copy(Src,StartPos,Len))]); + {$ENDIF} FOnDeleteSource(Self,FLinks[LinkIndex].Code,StartPos,Len); if FLinks[LinkIndex].CleanedPos<=CleanStartPos then break; dec(LinkIndex);