From 3a996a5dade945e1846a71c227c13e7dcab88e8d Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 29 Sep 2009 18:36:17 +0000 Subject: [PATCH] IDE: identifier completion: do not show box on error in front git-svn-id: trunk@21922 - --- ide/sourceeditor.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 565dc7524b..9c8250b6e4 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -602,7 +602,7 @@ type procedure OnSynCompletionUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char); procedure OnSynCompletionPositionChanged(Sender: TObject); procedure DeactivateCompletionForm; - procedure InitIdentCompletion(S: TStrings); + function InitIdentCompletion(S: TStrings): boolean; procedure EditorMouseMove(Sender: TObject; Shift: TShiftstate; X,Y: Integer); @@ -3930,7 +3930,7 @@ begin end; end; -procedure TSourceNotebook.InitIdentCompletion(S: TStrings); +function TSourceNotebook.InitIdentCompletion(S: TStrings): boolean; var i: integer; Handled: boolean; @@ -3938,6 +3938,7 @@ var Prefix: string; ItemCnt: Integer; begin + Result:=false; Prefix := CurCompletionControl.CurrentString; if Assigned(OnInitIdentCompletion) then begin OnInitIdentCompletion(Self,fIdentCompletionJumpToError,Handled,Abort); @@ -3950,6 +3951,7 @@ begin CurCompletionControl.Position:=0; for i:=0 to ItemCnt-1 do s.Add('Dummy'); + Result:=true; exit; end; end; @@ -4108,7 +4110,7 @@ Begin CurEdit:=GetActiveSE.EditorComponent; case CurrentCompletionType of ctIdentCompletion: - InitIdentCompletion(S); + if not InitIdentCompletion(S) then exit; ctWordCompletion: begin