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

codetools: completeblock: skip if target line is not empty or code behind is more indented

Browse Source 
git-svn-id: trunk@22828 -
This commit is contained in:
mattias 2009-11-27 16:50:24 +00:00
parent 3ed535c5f2
commit dfc20b664d
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/codetools/stdcodetools.pas
View File

@ -5432,6 +5432,7 @@ var
AfterGap: TGapTyp; AfterGap: TGapTyp;
FrontGap: TGapTyp; FrontGap: TGapTyp;
BeautifyFlags: TBeautifyCodeFlags; BeautifyFlags: TBeautifyCodeFlags;
BehindPos: LongInt;
function EndBlockIsOk: boolean; function EndBlockIsOk: boolean;
begin begin
@ -5725,6 +5726,30 @@ var
if NeedCompletion then begin if NeedCompletion then begin
InsertPos:=CleanCursorPos; InsertPos:=CleanCursorPos;
Indent:=CursorBlockOuterIndent; Indent:=CursorBlockOuterIndent;
// check code behind
BehindPos:=FindNextNonSpace(Src,InsertPos);
if BehindPos<=SrcLen then begin
if PositionsInSameLine(Src,InsertPos,BehindPos) then begin
// target line not empty
{$IFDEF ShowCompleteBlock}
DebugLn(['CompleteStatements target line not empty => skip']);
{$ENDIF}
exit;
end;
if (GetLineIndent(Src,BehindPos)>Indent) then begin
// code behind is more indented
// for example
// repeat
// |
// DoSomething;
{$IFDEF ShowCompleteBlock}
DebugLn(['CompleteStatements code behind is indented more => skip']);
{$ENDIF}
exit;
end;
end;
NewCode:=''; NewCode:='';
FrontGap:=gtEmptyLine; FrontGap:=gtEmptyLine;
AfterGap:=gtNewLine; AfterGap:=gtNewLine;