From 588edd1cabd10e58647d8c6557e598f435d98924 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 14 Jul 2008 22:21:35 +0000 Subject: [PATCH] IDE: identifier completion: always move cursor in front of semicolon git-svn-id: trunk@15784 - --- components/codetools/identcompletiontool.pas | 3 +-- ide/sourceeditprocs.pas | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/codetools/identcompletiontool.pas b/components/codetools/identcompletiontool.pas index 61d7212da1..b46a2c4f07 100644 --- a/components/codetools/identcompletiontool.pas +++ b/components/codetools/identcompletiontool.pas @@ -1523,8 +1523,7 @@ begin CurrentIdentifierList.ContextFlags:= CurrentIdentifierList.ContextFlags+[ilcfStartIsLValue]; end; - if UpAtomIs('IF') or UpAtomIs('FOR') or UpAtomIs('DO') - or UpAtomIs('CASE') or UpAtomIs('OF') or UpAtomIs('WHILE') then begin + if UpAtomIs('IF') or UpAtomIs('CASE') or UpAtomIs('WHILE') then begin CurrentIdentifierList.ContextFlags:= CurrentIdentifierList.ContextFlags+[ilcfIsExpression]; end; diff --git a/ide/sourceeditprocs.pas b/ide/sourceeditprocs.pas index 435009cc49..1587142a62 100644 --- a/ide/sourceeditprocs.pas +++ b/ide/sourceeditprocs.pas @@ -511,6 +511,7 @@ begin Result:=Result+' := '; CursorAtEnd:=false; end;} + if CursorAtEnd then ; // add assignment operator := if (ilcfStartIsLValue in IdentList.ContextFlags) @@ -534,9 +535,7 @@ begin if (ilcfNeedsEndSemicolon in IdentList.ContextFlags) and CodeToolsOpts.IdentComplAddSemicolon then begin Result:=Result+';'; - if (not CursorAtEnd) or IdentItem.HasChilds - or ([ilcfStartIsLValue,ilcfIsExpression]*IdentList.ContextFlags<>[]) then - inc(CursorToLeft); + inc(CursorToLeft); end; //DebugLn(['GetIdentCompletionValue END Result="',Result,'"']);