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

codetools: fixed identifier completion type definition

Browse Source
This commit is contained in:
mattias 2025-08-08 21:18:03 +02:00
parent 44c9ea2cb7
commit 57d749259b
3 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/codetools/finddeclarationtool.pas
View File

@ -3712,9 +3712,6 @@ begin
ctnProcedure,ctnProcedureHead:
begin
// ToDo: ppu, dcu files
Result+=ExtractProcHead(Node,
[phpAddClassName,phpWithStart,phpWithVarModifiers,phpWithParameterNames,
phpWithDefaultValues,phpWithResultType,phpWithOfObject,phpCommentsToSpace]);
@ -3723,9 +3720,6 @@ begin
ctnProperty,ctnGlobalProperty:
begin
IdentNode:=Node;
// ToDo: ppu, dcu files
Result+='property ';
MoveCursorToNodeStart(IdentNode);
ReadNextAtom;
@ -3773,9 +3767,6 @@ begin
ctnProgram,ctnUnit,ctnPackage,ctnLibrary:
begin
IdentNode:=Node;
// ToDo: ppu, dcu files
MoveCursorToNodeStart(IdentNode);
ReadNextAtom;
if (IdentNode.Desc=ctnProgram) and not UpAtomIs('PROGRAM') then begin

36
components/codetools/identcompletiontool.pas
View File

@ -1364,7 +1364,7 @@ var
var
NewItem: TIdentifierListItem;
Node: TCodeTreeNode;
Node, SubNode: TCodeTreeNode;
ProtectedForeignClass: Boolean;
Lvl: LongInt;
HasLowerVisibility: Boolean;
@ -1392,23 +1392,24 @@ begin
HasLowerVisibility:=False;
ProtectedForeignClass:=false;
Node:=FoundContext.Node;
if FoundContext.Tool=Self then begin
// identifier is in the same unit
//DebugLn('::: COLLECT IDENT in SELF ',FoundContext.Node.DescAsString,
// ' "',dbgstr(FoundContext.Tool.Src,FoundContext.Node.StartPos,50),'"'
// ,' fdfIgnoreUsedUnits='+dbgs(fdfIgnoreUsedUnits in Params.Flags));
if (FoundContext.Node=CurrentIdentifierList.StartContext.Node)
or (FoundContext.Node=CurrentIdentifierList.Context.Node)
or (FoundContext.Node.StartPos=CurrentIdentifierList.StartAtom.StartPos)
if (Node=CurrentIdentifierList.StartContext.Node)
or (Node=CurrentIdentifierList.Context.Node)
or (Node.StartPos=CurrentIdentifierList.StartAtom.StartPos)
then begin
// found identifier is in cursor node
// found identifier is cursor node
// => do not show it
exit;
end;
end
else if FoundContext.Node<>nil then begin
else if Node<>nil then begin
// identifier is in another unit
Node:=FoundContext.Node.Parent;
Node:=Node.Parent;
if (Node<>nil) and (Node.Desc in AllClassSubSections) then
Node:=Node.Parent;
if (Node<>nil) and (Node.Desc in AllClassBaseSections) then begin
@ -1419,10 +1420,7 @@ begin
in ([ctnProcedure,ctnProcedureHead,ctnProperty]+AllClassSections))
then begin
// the user wants to override a method or property
// => ignore all with a higher visibility, because fpc does not allow
// to downgrade the visibility and will give a hint when trying
//---- No, allow visibility downgrading to reduce confusion tha CodeTools do not list those functions.
//---- FPC actually allows it although it shows a warning
// Note that although FPC gives a warning when downgrading visibility, it is allowed.
//debugln(['TIdentCompletionTool.CollectAllIdentifiers skipping member, because it would downgrade: ',dbgstr(FoundContext.Tool.ExtractNode(FoundContext.Node,[]),1,30)]);
HasLowerVisibility:=True;
end;
@ -1452,6 +1450,7 @@ begin
end;
end;
end;
Node:=FoundContext.Node;
Ident:=nil;
PlaceForDotted:='';
@ -1459,20 +1458,17 @@ begin
ctnTypeDefinition,ctnGenericType:
begin
Node:=FoundContext.Node.FirstChild;
SubNode:=FoundContext.Node.FirstChild;
if FoundContext.Node.Desc=ctnTypeDefinition then
Ident:=@FoundContext.Tool.Src[FoundContext.Node.StartPos]
else begin
// generic
if Node=nil then exit;
Ident:=@FoundContext.Tool.Src[Node.StartPos];
if SubNode=nil then exit;
Ident:=@FoundContext.Tool.Src[SubNode.StartPos];
end;
if Node=nil then begin
// type without definition
end;
if (Node<>nil)
and (Node.Desc in AllClasses)
and ((ctnsForwardDeclaration and Node.SubDesc)>0)
if (SubNode<>nil)
and (SubNode.Desc in AllClasses)
and ((ctnsForwardDeclaration and SubNode.SubDesc)>0)
then begin
// forward definition of a class
if CurrentIdentifierList.FindIdentifier(Ident,'')<>nil then begin

16
ide/fpdochints.pas
View File

@ -138,22 +138,8 @@ begin
if (Item.Tool.Scanner=nil) then exit;
//DebugLn(['TFPDocHintProvider.DoUpdateHint Src={',copy(Item.Tool.Src,Node.StartPos,30),'} ',Node.DescAsString]);
// search the position of the identifier, not the keyword
CleanPos:=Node.StartPos;
case Node.Desc of
ctnProcedure:
begin
Item.Tool.MoveCursorToProcName(Node,true);
CleanPos:=Item.Tool.CurPos.StartPos;
end;
ctnProperty:
begin
if Item.Tool.MoveCursorToPropName(Node) then
CleanPos:=Item.Tool.CurPos.StartPos;
end;
end;
// get help text
CleanPos:=Node.StartPos;
if (not Item.Tool.CleanPosToCaret(CleanPos,Caret)) then begin
DebugLn(['TFPDocHintProvider.DoUpdateHint FAILED CleanPosToCaret Tool=',Item.Tool.MainFilename,' CleanPos=',CleanPos,' SrcLen=',Item.Tool.SrcLen]);
exit;