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

codetools: fixed search atttibute

Browse Source
This commit is contained in:
mattias 2023-07-15 11:45:48 +02:00
parent c472699a81
commit 86c8874b0c
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/codetools/finddeclarationtool.pas
View File

@ -9419,28 +9419,36 @@ var
end; end;
function ResolveAttribute(const Context: TFindContext): boolean; function ResolveAttribute(const Context: TFindContext): boolean;
var
Identifier: String; function Find(const Identifier: string): boolean;
I: Integer;
begin
Result:=false;
if CurAtom.Flag<>cafWord then exit;
Identifier:=GetAtom;
Params.Flags := Params.Flags - [fdfExceptionOnNotFound];
for I := 0 to 1 do
begin begin
// first check for attribute with exactly the same name
// if not found, append 'Attribute'
if I=1 then // append 'attribute' to typename
Identifier+='Attribute';
Params.SetIdentifier(Self,PChar(Identifier),@CheckSrcIdentifier); Params.SetIdentifier(Self,PChar(Identifier),@CheckSrcIdentifier);
if Context.Tool.FindIdentifierInContext(Params) then begin if Context.Tool.FindIdentifierInContext(Params) then begin
ExprType.Desc:=xtContext; ExprType.Desc:=xtContext;
ExprType.Context:=CreateFindContext(Params); ExprType.Context:=CreateFindContext(Params);
Params.Load(OldInput,true); Params.Load(OldInput,true);
exit(true); exit(true);
end; end else
Result:=false;
end; end;
var
Identifier: String;
begin
Result:=false;
if CurAtom.Flag<>cafWord then exit;
Identifier:=GetAtom;
Params.Flags := Params.Flags - [fdfExceptionOnNotFound];
if (CurAtom.EndPos-CurAtom.StartPos<length('Attribute'))
or (not CompareSrcIdentifiers(CurAtom.EndPos-length('Attribute'),'attribute')) then
begin
// attribute name does not end with 'attribute'
// -> first search IdentifierAttribute
if Find(Identifier+'Attribute') then exit(true);
end;
// then search the name
if Find(Identifier) then exit(true);
Params.Load(OldInput,false); Params.Load(OldInput,false);
end; end;