paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-31 08:12:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fixed identifier completion searching interfaces

Browse Source 
git-svn-id: trunk@19649 -
This commit is contained in:
mattias 2009-04-27 12:25:19 +00:00
parent 5eb71b62d3
commit 704ca1cbd9
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/codetools/finddeclarationcache.pas
View File

@ -79,6 +79,7 @@ type
procedure ConsistencyCheck;
property Tool: TPascalParserTool read FTool;
property Complete: boolean read FComplete write SetComplete;
property Items: TAVLTree read FItems;
end;
{

47
components/codetools/finddeclarationtool.pas
View File

@ -4975,9 +4975,23 @@ end;
function TFindDeclarationTool.FindIdentifierInInterface(
AskingTool: TFindDeclarationTool; Params: TFindDeclarationParams): boolean;
function CheckEntry(Entry: PInterfaceIdentCacheEntry): TIdentifierFoundResult;
begin
while Entry<>nil do begin
Params.SetResult(Self,Entry^.Node,Entry^.CleanPos);
Result:=DoOnIdentifierFound(Params,Params.NewNode);
if Result in [ifrSuccess,ifrAbortSearch] then
exit;
// proceed
Entry:=Entry^.Overloaded;
end;
Result:=ifrProceedSearch;
end;
var
CacheEntry: PInterfaceIdentCacheEntry;
IdentFoundResult: TIdentifierFoundResult;
AVLNode: TAVLTreeNode;
begin
Result:=false;
// build code tree
@ -4998,20 +5012,25 @@ begin
AskingTool.AddToolDependency(Self);
// search identifier in cache
CacheEntry:=FInterfaceIdentifierCache.FindIdentifier(Params.Identifier);
while CacheEntry<>nil do begin
Params.SetResult(Self,CacheEntry^.Node,CacheEntry^.CleanPos);
IdentFoundResult:=DoOnIdentifierFound(Params,Params.NewNode);
{$IFDEF ShowProcSearch}
DebugLn(['[TFindDeclarationTool.FindIdentifierInContext.CheckResult] DoOnIdentifierFound=',IdentifierFoundResultNames[IdentFoundResult]]);
{$ENDIF}
if (IdentFoundResult=ifrSuccess) then
exit(true);
if IdentFoundResult=ifrAbortSearch then exit(false);
// proceed
CacheEntry:=CacheEntry^.Overloaded;
if fdfCollect in Params.Flags then begin
AVLNode:=FInterfaceIdentifierCache.Items.FindLowest;
while AVLNode<>nil do begin
CacheEntry:=PInterfaceIdentCacheEntry(AVLNode.Data);
case CheckEntry(CacheEntry) of
ifrSuccess: exit(true);
ifrAbortSearch: exit(false);
end;
AVLNode:=FInterfaceIdentifierCache.Items.FindSuccessor(AVLNode);
end;
end else begin
CacheEntry:=FInterfaceIdentifierCache.FindIdentifier(Params.Identifier);
case CheckEntry(CacheEntry) of
ifrSuccess: exit(true);
ifrAbortSearch: exit(false);
end;
end;
exit(false);
Result:=false;
end;
function TFindDeclarationTool.BuildInterfaceIdentifierCache(