paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-01 23:19:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: FindJumpPointInProcNode: using start of code in target line

Browse Source 
git-svn-id: trunk@13488 -
This commit is contained in:
mattias 2007-12-27 18:50:52 +00:00
parent f8a6cc5969
commit 1ce58e87a3
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/codetools/methodjumptool.pas
View File

@ -681,6 +681,7 @@ function TMethodJumpingCodeTool.FindJumpPointInProcNode(ProcNode: TCodeTreeNode;
out NewPos: TCodeXYPosition; out NewTopLine: integer): boolean;
var DestNode: TCodeTreeNode;
i, NewCleanPos: integer;
LineStartPos: LongInt;
begin
Result:=false;
if ProcNode=nil then exit;
@ -699,14 +700,14 @@ begin
asm
|end
begin
|DoSomething;
end
asm
|
end
begin
|DoSomething;
end
}
MoveCursorToNodeStart(DestNode);
// if begin is indented then indent the cursor as well
@ -723,26 +724,39 @@ begin
DebugLn('[TMethodJumpingCodeTool.FindJumpPointInProcNode] B i=',dbgs(i),' IndentSize=',dbgs(IndentSize));
{$ENDIF}
// set cursor in the next line but before the next token/comment
// read 'begin' or 'asm'
ReadNextAtom;
NewCleanPos:=CurPos.EndPos;
// skip spaces
while (NewCleanPos<=SrcLen) and (Src[NewCleanPos] in [' ',#8]) do
inc(NewCleanPos);
if (NewCleanPos<=SrcLen) and (Src[NewCleanPos] in [#13,#10]) then begin
// skip newline chars
inc(NewCleanPos);
if (NewCleanPos<=SrcLen) and (Src[NewCleanPos] in [#13,#10])
and (Src[NewCleanPos-1]<>Src[NewCleanPos]) then
inc(NewCleanPos);
inc(i,IndentSize);
while (i>0) and (NewCleanPos<=SrcLen) and (Src[NewCleanPos] in [' ',#8])
do begin
// check if there is code in the line
LineStartPos:=NewCleanPos;
while (NewCleanPos<=SrcLen) and (Src[NewCleanPos] in [' ',#8]) do
inc(NewCleanPos);
dec(i);
end;
if not (Src[NewCleanPos] in [#13,#10]) then
if (NewCleanPos>SrcLen) or (Src[NewCleanPos] in [#10,#13]) then begin
// empty line
inc(i,IndentSize);
if NewCleanPos>LineStartPos+i then
NewCleanPos:=LineStartPos+i
else if NewCleanPos<LineStartPos+i then
i:=(LineStartPos+i)-NewCleanPos;
end else begin
// code in line
i:=0;
end;
end else
i:=0;
if NewCleanPos>SrcLen then NewCleanPos:=SrcLen;
if NewCleanPos>SrcLen then begin
NewCleanPos:=SrcLen;
inc(i);
end;
if not JumpToCleanPos(NewCleanPos,ProcNode.StartPos,ProcNode.EndPos,
NewPos,NewTopLine,true)