paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-07 13:57:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: find declaration: selfunit.implementationidentifie

Browse Source 
git-svn-id: trunk@37078 -
This commit is contained in:
mattias 2012-04-29 10:35:52 +00:00
parent 3068fe7d5d
commit 3c82a53c6b
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
components/codetools/finddeclarationtool.pas
View File

@ -3493,6 +3493,7 @@ var
TestContext: TFindContext;
IdentStart: LongInt;
SubParams: TFindDeclarationParams;
aNode: TCodeTreeNode;
begin
IsPredefined:=false;
SubParams:=TFindDeclarationParams.Create;
@ -3546,7 +3547,20 @@ var
AtomIsIdentifier(true);
SubParams.SetIdentifier(Self,@Src[IdentStart],nil);
SubParams.Flags:=[fdfExceptionOnNotFound];
TypeFound:=SubParams.NewCodeTool.FindIdentifierInInterface(Self,SubParams);
if SubParams.NewCodeTool=Self then begin
// search in whole unit/program
aNode:=Tree.Root;
if aNode.Desc=ctnUnit then begin
aNode:=FindImplementationNode;
if aNode=nil then
aNode:=FindInterfaceNode;
end;
SubParams.ContextNode:=aNode;
TypeFound:=FindIdentifierInContext(SubParams);
end else begin
// search in interface
TypeFound:=SubParams.NewCodeTool.FindIdentifierInInterface(Self,SubParams);
end;
end;
if TypeFound and (SubParams.NewNode.Desc=ctnGenericParameter) then begin
TypeFound:=SubParams.FindGenericParamType;
@ -7062,24 +7076,13 @@ var
NewNode: TCodeTreeNode;
begin
aTool:=ExprType.Context.Tool;
if aTool=Self then begin
NewCodeTool:=Self;
NewNode:=Tree.Root.LastChild;
while (NewNode<>nil)
and (NewNode.Desc in [ctnInitialization,ctnFinalization,ctnEndPoint]) do
NewNode:=NewNode.PriorBrother;
{$IFDEF ShowExprEval}
debugln([' FindExpressionTypeOfTerm ResolveChildren self unit -> ',NewNode.DescAsString]);
{$ENDIF}
end else begin
{$IFDEF ShowExprEval}
debugln([' FindExpressionTypeOfTerm ResolveChildren used unit -> interface node ',dbgstr(ExprType.Context.Tool.ExtractNode(ExprType.Context.Node,[]))]);
{$ENDIF}
AnUnitName:=aTool.ExtractUsedUnitName(ExprType.Context.Node,@InFilename);
NewCodeTool:=aTool.FindCodeToolForUsedUnit(AnUnitName,InFilename,true);
NewCodeTool.BuildInterfaceIdentifierCache(true);
NewNode:=NewCodeTool.FindInterfaceNode;
end;
{$IFDEF ShowExprEval}
debugln([' FindExpressionTypeOfTerm ResolveChildren used unit -> interface node ',dbgstr(ExprType.Context.Tool.ExtractNode(ExprType.Context.Node,[]))]);
{$ENDIF}
AnUnitName:=aTool.ExtractUsedUnitName(ExprType.Context.Node,@InFilename);
NewCodeTool:=aTool.FindCodeToolForUsedUnit(AnUnitName,InFilename,true);
NewCodeTool.BuildInterfaceIdentifierCache(true);
NewNode:=NewCodeTool.FindInterfaceNode;
ExprType.Context.Tool:=NewCodeTool;
ExprType.Context.Node:=NewNode;
end;