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

codetools: find declaration: check for overloaded procs: stop if call() fits, bug #24901

Browse Source 
git-svn-id: trunk@42454 -
This commit is contained in:
mattias 2013-08-23 08:08:05 +00:00
parent 5d0cb55801
commit f300bc6edc
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
components/codetools/finddeclarationtool.pas
View File

@ -8539,6 +8539,31 @@ function TFindDeclarationTool.CheckSrcIdentifier(
const FoundContext: TFindContext): TIdentifierFoundResult;
// this is a TOnIdentifierFound function
// if identifier found is a proc then it searches for the best overloaded proc
function CallHasEmptyParamsAndFoundProcFits: boolean;
var
FirstParameterNode: TCodeTreeNode;
TargetTool: TFindDeclarationTool;
begin
Result:=false;
FirstParameterNode:=FoundContext.Tool.GetFirstParameterNode(
FoundContext.Node);
if (FirstParameterNode<>nil)
and ((FirstParameterNode.SubDesc and ctnsHasDefaultValue)=0) then begin
// found proc needs at least one parameter
exit;
end;
// FoundContext is a proc with no or only default params
TargetTool:=Params.IdentifierTool;
TargetTool.MoveCursorToCleanPos(Params.Identifier);
TargetTool.ReadNextAtom; // read identifier
TargetTool.ReadNextAtom; // read bracket
if TargetTool.CurPos.Flag<>cafRoundBracketOpen then exit;
TargetTool.ReadNextAtom; // read bracket close
if TargetTool.CurPos.Flag<>cafRoundBracketClose then exit;
Result:=true;
end;
var
FirstParameterNode, StartContextNode: TCodeTreeNode;
ParamCompatibility: TTypeCompatibility;
@ -8591,6 +8616,22 @@ begin
Result:=ifrSuccess;
exit;
end;
if (not (fdfCollect in Params.Flags))
and CallHasEmptyParamsAndFoundProcFits then begin
// call has brackets without params (e.g. writeln() )
// and found proc fits exactly
// => stop search
{$IF defined(ShowFoundIdentifier) or defined(ShowProcSearch)}
debugln(['TFindDeclarationTool.CheckSrcIdentifier call is () and found proc fits exactly',
' Ident=',GetIdentifier(Params.Identifier),
' ',FoundContext.Tool.CleanPosToStr(FoundContext.Node.StartPos)
]);
{$ENDIF}
Params.SetResult(FoundContext);
Result:=ifrSuccess;
exit;
end;
Result:=ifrProceedSearch;
if (Params.FoundProc=nil) then begin