cody: find overloads: add nodes for classes and ancestors

git-svn-id: trunk@49959 -

components/codetools/finddeclarationtool.pas

@@ -885,7 +885,7 @@ type
     // ancestors
     function FindClassAndAncestors(ClassNode: TCodeTreeNode;
       out ListOfPFindContext: TFPList; ExceptionOnNotFound: boolean
-      ): boolean; // without interfaces
+      ): boolean; // without interfaces, recursive
     function FindContextClassAndAncestors(const CursorPos: TCodeXYPosition;
       var ListOfPFindContext: TFPList): boolean; // without interfaces
     function FindAncestorOfClass(ClassNode: TCodeTreeNode;
@@ -897,7 +897,7 @@ type
     function FindAncestorsOfClass(ClassNode: TCodeTreeNode;
       var ListOfPFindContext: TFPList;
       Params: TFindDeclarationParams; FindClassContext: boolean;
-      ExceptionOnNotFound: boolean = true): boolean; // with interfaces
+      ExceptionOnNotFound: boolean = true): boolean; // with interfaces, not recursive
 
     function FindExtendedExprOfHelper(HelperNode: TCodeTreeNode): TExpressionType;
 

components/codetools/ide/codyfindoverloads.pas

@@ -316,16 +316,54 @@ end;
 procedure TCodyFindOverloadsWindow.GatherProcsOfUnit(NodeGraph: TCodeGraph;
   ProgNode: TCodeTreeNode; CurUnit: TCFOUnit);
 
-  procedure AddAncestors(Tool: TFindDeclarationTool; ClassNode: TCodeTreeNode);
+  procedure AddAncestors(Tool: TFindDeclarationTool; ClassNode: TCodeTreeNode); forward;
-  begin
 
+  function AddClassNode(Tool: TFindDeclarationTool; ClassNode: TCodeTreeNode): TCFONode;
+  var
+    Edge: TCFOEdge;
+  begin
+    if ClassNode=nil then
+      RaiseCatchableException('');
+    Result:=TCFONode(NodeGraph.GetGraphNode(ClassNode,false));
+    if Result<>nil then exit;
+    debugln(['AddClassNode ',Tool.ExtractClassName(ClassNode,false)]);
+    Result:=TCFONode(NodeGraph.AddGraphNode(ClassNode));
+    Result.Tool:=Tool;
+    // create edge "reachable", so that all nodes are reachable
+    Edge:=TCFOEdge(NodeGraph.AddEdge(ClassNode,ProgNode));
+    Edge.Typ:=cfoetReachable;
+    AddAncestors(Tool,ClassNode);
+  end;
+
+  procedure AddAncestors(Tool: TFindDeclarationTool; ClassNode: TCodeTreeNode);
+  var
+    ListOfPFindContext: TFPList;
+    Params: TFindDeclarationParams;
+    Context: PFindContext;
+    i: Integer;
+  begin
+    debugln(['AddAncestors ',Tool.ExtractClassName(ClassNode,false)]);
+    ListOfPFindContext:=nil;
+    Params:=TFindDeclarationParams.Create(nil);
+    try
+      Tool.FindAncestorsOfClass(ClassNode,ListOfPFindContext,Params,true,false);
+      if ListOfPFindContext<>nil then begin
+        for i:=0 to ListOfPFindContext.Count-1 do begin
+          Context:=PFindContext(ListOfPFindContext[i]);
+          AddClassNode(Context^.Tool,Context^.Node);
+        end;
+      end;
+    finally
+      Params.Free;
+      FreeListOfPFindContext(ListOfPFindContext);
+    end;
   end;
 
 var
   Tool: TStandardCodeTool;
   ProcNode, ClassNode: TCodeTreeNode;
   CurProcName: String;
-  GraphProcNode, GraphClassNode: TCFONode;
+  GraphProcNode: TCFONode;
   Edge: TCFOEdge;
 begin
   if ugufLoadError in CurUnit.Flags then exit;
@@ -347,15 +385,10 @@ begin
           ClassNode:=ClassNode.Parent;
         end;
         if ClassNode<>nil then begin
-          GraphClassNode:=TCFONode(NodeGraph.AddGraphNode(ClassNode));
+          AddClassNode(Tool,ClassNode);
-          GraphClassNode.Tool:=Tool;
           // create edge "is method of"
           Edge:=TCFOEdge(NodeGraph.AddEdge(ProcNode,ClassNode));
           Edge.Typ:=cfoetMethodOf;
-          // create edge "reachable", so that all nodes are reachable
-          Edge:=TCFOEdge(NodeGraph.AddEdge(ClassNode,ProgNode));
-          Edge.Typ:=cfoetReachable;
-          AddAncestors(Tool,ClassNode);
         end else begin
           // not a method
           // create edge "reachable", so that all nodes are reachable
@@ -384,7 +417,6 @@ var
   sl: TStringList;
   ClassNode: TCodeTreeNode;
   ListOfPFindContext: TFPList;
-  Params: TFindDeclarationParams;
   i: Integer;
   aContext: PFindContext;
 begin
@@ -398,10 +430,8 @@ begin
       // method
       sl.Add('Only descendants of '+ProcTool.ExtractClassName(ClassNode,false));
       ListOfPFindContext:=nil;
-      Params:=TFindDeclarationParams.Create(nil);
       try
-        ProcTool.FindAncestorsOfClass(ClassNode,ListOfPFindContext,Params,
+        ProcTool.FindClassAndAncestors(ClassNode,ListOfPFindContext,false);
-          false,false);
         if ListOfPFindContext<>nil then begin
           for i:=0 to ListOfPFindContext.Count-1 do begin
             aContext:=PFindContext(ListOfPFindContext[i]);
@@ -409,7 +439,6 @@ begin
           end;
         end;
       finally
-        Params.Free;
         FreeListOfPFindContext(ListOfPFindContext);
       end;
       sl.Add('Only methods');

components/printers/languages/printer4lazstrconst.de.po

@@ -68,10 +68,6 @@ msgstr "Papiertyp"
 msgid "Portrait"
 msgstr "Hochformat"
 
-#: printer4lazstrconst.p4lrsprinterproperties
-msgid "Printer properties"
-msgstr ""
-
 #: printer4lazstrconst.p4lrsresolution
 msgid "Resolution"
 msgstr "Auflösung"

components/printers/languages/printer4lazstrconst.po

@@ -57,10 +57,6 @@ msgstr ""
 msgid "Portrait"
 msgstr ""
 
-#: printer4lazstrconst.p4lrsprinterproperties
-msgid "Printer properties"
-msgstr ""
-
 #: printer4lazstrconst.p4lrsresolution
 msgid "Resolution"
 msgstr ""

components/printers/languages/printer4lazstrconst.ru.po

@@ -67,10 +67,6 @@ msgstr "Тип бумаги"
 msgid "Portrait"
 msgstr "Книжная"
 
-#: printer4lazstrconst.p4lrsprinterproperties
-msgid "Printer properties"
-msgstr "Свойства принтера"
-
 #: printer4lazstrconst.p4lrsresolution
 msgid "Resolution"
 msgstr "Разрешение"
@@ -86,3 +82,4 @@ msgstr "Обратная книжная"
 #: printer4lazstrconst.p4lrsstart
 msgid "Start"
 msgstr "Верхний"
+