Fix recursive caller nodes (#569)

Avoid recursions in caller tree and remove any previous reference count labels before appending one.

Author: andocz

plugins/cpp/webgui/js/cppInfoTree.js

@@ -31,7 +31,11 @@ function (model, viewHandler, util) {
   }
 
   function createReferenceCountLabel(label, count) {
-    return label + '<span class="reference-count">(' + count + ')</span>';
+    var parsedLabel = $('<div>').append($.parseHTML(label));
+    parsedLabel.children('span.reference-count').remove();
+    parsedLabel.append('<span class="reference-count">(' + count + ')</span>');
+
+    return parsedLabel.html();
   }
 
   function createLabel(astNodeInfo) {
@@ -119,10 +123,12 @@ function (model, viewHandler, util) {
     return res;
   }
 
-  function loadReferenceNodes(parentNode, nodeInfo, refTypes) {
+  function loadReferenceNodes(parentNode, nodeInfo, refTypes, scratch) {
     var res = [];
     var fileGroupsId = [];
 
+    scratch = scratch || {};
+
     var references = model.cppservice.getReferences(
       nodeInfo.id,
       parentNode.refType);
@@ -148,6 +154,12 @@ function (model, viewHandler, util) {
         });
 
         var fileInfo = model.project.getFileInfo(fileId);
+
+        if (parentNode.refType === refTypes['Caller']) {
+          scratch.visitedNodeIDs =
+            (scratch.visitedNodeIDs || []).concat(nodeInfo.id);
+        }
+
         res.push({
           id          : fileGroupsId[fileId],
           name        : createReferenceCountLabel(
@@ -161,14 +173,17 @@ function (model, viewHandler, util) {
 
             referenceInFile.forEach(function (reference) {
               if (parentNode.refType === refTypes['Caller']) {
+                var showChildren =
+                  scratch.visitedNodeIDs.indexOf(reference.id) == -1;
                 res.push({
                   id          : reference.id,
                   name        : createLabel(reference),
                   nodeInfo    : reference,
                   refType     : parentNode.refType,
                   cssClass    : 'icon icon-Method',
-                  hasChildren : true,
-                  getChildren : function () {
+                  hasChildren : showChildren,
+                  getChildren : showChildren
+                  ? function () {
                     var res = [];
 
                     //--- Recursive Node ---//
@@ -185,7 +200,9 @@ function (model, viewHandler, util) {
                         refType     : parentNode.refType,
                         cssClass    : parentNode.cssClass,
                         hasChildren : true,
-                        getChildren : parentNode.getChildren
+                        getChildren : function () {
+                          return loadReferenceNodes(this, reference, refTypes, scratch);
+                        }
                       });
 
                     //--- Call ---//
@@ -206,6 +223,7 @@ function (model, viewHandler, util) {
                     });
                     return res;
                   }
+                  : undefined
                 });
               } else if (parentNode.refType === refTypes['Usage']) {
                 res.push({