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

codetools: find declaration: fixed search Result

Browse Source 
git-svn-id: trunk@30697 -
This commit is contained in:
mattias 2011-05-12 17:19:58 +00:00
parent 27c0fdd062
commit fbca65edab
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
components/codetools/finddeclarationtool.pas
View File

@ -2177,6 +2177,11 @@ begin
if Node.Desc = ctnGenericName then Node := Node.Parent;
case Node.Desc of
ctnIdentifier:
if Assigned(Node.Parent) and (Node.Parent.Desc = ctnProcedureHead) then
// function result
Result := 'var Result: ' + ExtractNode(Node, []);
ctnVarDefinition, ctnTypeDefinition, ctnConstDefinition,
ctnEnumIdentifier, ctnGenericType:
begin
@ -2394,12 +2399,13 @@ begin
SkipForward:=fdfSkipClassForward in Params.Flags;
Include(Params.Flags,fdfFindVariable);
ExprType:=FindExpressionTypeOfTerm(StartPos,EndPos,Params,false);
if (ExprType.Desc<>xtContext) then begin
if (ExprType.Desc=xtContext) then
Params.SetResult(ExprType.Context)
else
Params.SetResult(CleanFindContext);
end;
if SkipForward and (Params.NewNode<>nil) then
Params.NewCodeTool.FindNonForwardClass(Params);
{$IFDEF CTDEBUG}
{$IFDEF ShowExprEval}
DbgOut('[TFindDeclarationTool.FindDeclarationOfIdentAtParam] Ident=',
'"',GetIdentifier(Params.Identifier),'" ');
if Params.NewNode<>nil then
@ -6618,6 +6624,7 @@ var
ProcNode: TCodeTreeNode;
IdentFound: boolean;
OldFlags: TFindDeclarationFlags;
ResultNode: TCodeTreeNode;
begin
// for example 'AnObject[3]'
@ -6649,16 +6656,27 @@ var
if (ProcNode<>nil) then begin
if IsIdentifierEndOfVariable
and (fdfFindVariable in StartFlags) then begin
ExprType.Desc:=xtContext;
ExprType.Context.Node:=ProcNode.FirstChild;
BuildSubTreeForProcHead(ProcNode);
ResultNode:=ProcNode.FirstChild.FirstChild;
while (ResultNode<>nil) do begin
if ResultNode.Desc in [ctnVarDefinition,ctnIdentifier] then begin
// procedure: none
// operator: ctnVarDefinition,ctnIdentifier
// function: ctnIdentifier
ExprType.Desc:=xtContext;
ExprType.Context.Node:=ProcNode.FirstChild;
exit;
end;
ResultNode:=ResultNode.NextBrother;
end;
end else begin
OldFlags:=Params.Flags;
Params.Flags:=Params.Flags+[fdfFunctionResult,fdfFindChilds];
ExprType.Desc:=xtContext;
ExprType.Context:=FindBaseTypeOfNode(Params,ProcNode);
Params.Flags:=OldFlags;
exit;
end;
exit;
end;
end;
end;

11
components/codetools/pascalreadertool.pas
View File

@ -964,6 +964,8 @@ end;
function TPascalReaderTool.PositionInFuncResultName(ProcNode: TCodeTreeNode;
CleanPos: integer): boolean;
// true if position between ) and :
var
Node: TCodeTreeNode;
begin
Result:=false;
if ProcNode=nil then exit;
@ -977,6 +979,15 @@ begin
and (CleanPos>=ProcNode.StartPos) and (CleanPos<=ProcNode.EndPos) then begin
exit(true);
end;
if ProcNode.Desc=ctnProcedureHead then begin
Node:=ProcNode.FirstChild;
while (Node<>nil) and (Node.Desc<>ctnIdentifier) do begin
if (Node.Desc=ctnIdentifier)
and (CleanPos>=Node.StartPos) and (CleanPos<=Node.EndPos) then
exit(true);
Node:=Node.NextBrother;
end;
end;
// read behind parameter list
if ProcNode.Desc<>ctnProcedureHead then exit;
if (ProcNode.FirstChild<>nil) and (ProcNode.FirstChild.Desc=ctnParameterList)