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

codetools: class completion: do not create bodies for external methods

Browse Source 
git-svn-id: trunk@54448 -
This commit is contained in:
mattias 2017-03-18 18:29:19 +00:00
parent 54f80e0923
commit c18cdcb495
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/codetools/codecompletiontool.pas
View File

@ -8474,7 +8474,9 @@ procedure TCodeCompletionCodeTool.GuessProcDefBodyMapping(ProcDefNodes,
AVLNodeExt:=NodeExtTree.FindLowest; AVLNodeExt:=NodeExtTree.FindLowest;
while AVLNodeExt<>nil do begin while AVLNodeExt<>nil do begin
NodeExt:=TCodeTreeNodeExtension(AVLNodeExt.Data); NodeExt:=TCodeTreeNodeExtension(AVLNodeExt.Data);
if (not SkipNodesWithData) or (NodeExt.Data=nil) then begin AVLNodeExt:=NodeExtTree.FindSuccessor(AVLNodeExt);
if (not SkipNodesWithData) or (NodeExt.Data=nil)
or (ProcNodeHasSpecifier(NodeExt.Node,psEXTERNAL)) then begin
{$IFDEF VerboseUpdateProcBodySignatures} {$IFDEF VerboseUpdateProcBodySignatures}
if NodeExtTree=ProcBodyNodes then if NodeExtTree=ProcBodyNodes then
debugln(['CreateNameTree body without corresponding def: ',NodeExt.Txt]) debugln(['CreateNameTree body without corresponding def: ',NodeExt.Txt])
@ -8491,7 +8493,6 @@ procedure TCodeCompletionCodeTool.GuessProcDefBodyMapping(ProcDefNodes,
Result:=TAVLTree.Create(@CompareCodeTreeNodeExtMethodHeaders); Result:=TAVLTree.Create(@CompareCodeTreeNodeExtMethodHeaders);
Result.Add(NewNodeExt); Result.Add(NewNodeExt);
end; end;
AVLNodeExt:=NodeExtTree.FindSuccessor(AVLNodeExt);
end; end;
end; end;
@ -9062,9 +9063,10 @@ begin
MissingNode:=ClassProcs.FindHighest; MissingNode:=ClassProcs.FindHighest;
while (MissingNode<>nil) do begin while (MissingNode<>nil) do begin
ANodeExt:=TCodeTreeNodeExtension(MissingNode.Data); ANodeExt:=TCodeTreeNodeExtension(MissingNode.Data);
MissingNode:=ClassProcs.FindPrecessor(MissingNode);
if ProcNodeHasSpecifier(ANodeExt.Node,psEXTERNAL) then continue;
CreateCodeForMissingProcBody(ANodeExt,Indent); CreateCodeForMissingProcBody(ANodeExt,Indent);
InsertProcBody(ANodeExt,InsertPos,Indent); InsertProcBody(ANodeExt,InsertPos,Indent);
MissingNode:=ClassProcs.FindPrecessor(MissingNode);
end; end;
end else begin end else begin
@ -9084,11 +9086,13 @@ begin
NearestNodeValid:=false; NearestNodeValid:=false;
while (MissingNode<>nil) do begin while (MissingNode<>nil) do begin
ANodeExt:=TCodeTreeNodeExtension(MissingNode.Data); ANodeExt:=TCodeTreeNodeExtension(MissingNode.Data);
ExistingNode:=ProcBodyNodes.Find(MissingNode.Data); MissingNode:=ClassProcs.FindPrecessor(MissingNode);
ExistingNode:=ProcBodyNodes.Find(ANodeExt);
{$IFDEF VerboseCreateMissingClassProcBodies} {$IFDEF VerboseCreateMissingClassProcBodies}
DebugLn(['TCodeCompletionCodeTool.CreateMissingClassProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',ExistingNode<>nil]); DebugLn(['TCodeCompletionCodeTool.CreateMissingClassProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',ExistingNode<>nil]);
{$ENDIF} {$ENDIF}
if ExistingNode=nil then begin if (ExistingNode=nil) and (not ProcNodeHasSpecifier(ANodeExt.Node,psEXTERNAL))
then begin
{$IFDEF VerboseCreateMissingClassProcBodies} {$IFDEF VerboseCreateMissingClassProcBodies}
DebugLn(['TCodeCompletionCodeTool.CreateMissingClassProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',TCodeTreeNodeExtension(ExistingNode.Data).Txt]); DebugLn(['TCodeCompletionCodeTool.CreateMissingClassProcBodies ANodeExt.Txt=',ANodeExt.Txt,' ExistingNode=',TCodeTreeNodeExtension(ExistingNode.Data).Txt]);
{$ENDIF} {$ENDIF}
@ -9097,8 +9101,8 @@ begin
mipAlphabetically: mipAlphabetically:
begin begin
// search alphabetically nearest proc body // search alphabetically nearest proc body
ExistingNode:=ProcBodyNodes.FindNearest(MissingNode.Data); ExistingNode:=ProcBodyNodes.FindNearest(ANodeExt);
cmp:=CompareCodeTreeNodeExtMethodHeaders(ExistingNode.Data,MissingNode.Data); cmp:=CompareCodeTreeNodeExtMethodHeaders(ExistingNode.Data,ANodeExt);
if (cmp<0) then begin if (cmp<0) then begin
AnAVLNode:=ProcBodyNodes.FindSuccessor(ExistingNode); AnAVLNode:=ProcBodyNodes.FindSuccessor(ExistingNode);
if AnAVLNode<>nil then begin if AnAVLNode<>nil then begin
@ -9159,7 +9163,6 @@ begin
CreateCodeForMissingProcBody(ANodeExt,Indent); CreateCodeForMissingProcBody(ANodeExt,Indent);
InsertProcBody(ANodeExt,InsertPos,0); InsertProcBody(ANodeExt,InsertPos,0);
end; end;
MissingNode:=ClassProcs.FindPrecessor(MissingNode);
end; end;
end; end;
Result:=true; Result:=true;