From b940e9e6a67ec794a3430914f03a97319a437aa6 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 5 Dec 2011 23:30:24 +0000 Subject: [PATCH] codetools: class completion: fixed checking if ancestor method is proc git-svn-id: trunk@33985 - --- components/codetools/codecompletiontool.pas | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas index 816eb92912..e189470b0b 100644 --- a/components/codetools/codecompletiontool.pas +++ b/components/codetools/codecompletiontool.pas @@ -7056,12 +7056,13 @@ begin Tool:=Params.NewCodeTool; ClassNode:=Params.NewNode; Params.ContextNode:=ClassNode; - Params.IdentifierTool:=Tool; + Params.IdentifierTool:=Self; // FirstChild skips keyword 'procedure' or 'function' Params.SetIdentifier(Self,@Src[ProcNode.FirstChild.StartPos],nil); - // Found ancestor definition. if Tool.FindIdentifierInContext(Params) then begin - if Params.NewNode<>nil then + // Found ancestor definition. + if (Params.NewNode<>nil) + and (Params.NewNode.Desc in [ctnProcedure,ctnProcedureHead]) then InclProcCall:=not Tool.ProcNodeHasSpecifier(Params.NewNode,psABSTRACT); Break; end;