Refactor forEach to CollectionUtils

jbalsas · jbalsas · commit fa51bfd832dc · 2012-12-18T17:34:23.000+01:00
diff --git a/src/language/JSUtils.js b/src/language/JSUtils.js
@@ -35,6 +35,7 @@ define(function (require, exports, module) {
         DocumentManager         = require("document/DocumentManager"),
         ChangedDocumentTracker  = require("document/ChangedDocumentTracker"),
         NativeFileSystem        = require("file/NativeFileSystem").NativeFileSystem,
+        CollectionUtils         = require("utils/CollectionUtils"),
         PerfUtils               = require("utils/PerfUtils"),
         StringUtils             = require("utils/StringUtils");
 
@@ -400,27 +401,19 @@ define(function (require, exports, module) {
         var allFunctions = _findAllFunctionsInText(text);
         var result = [];
         var lines = text.split("\n");
-        var functionName;
         
-        function makeAddFunction(functionName) {
-            return function (funcEntry) {
-                var endOffset = _getFunctionEndOffset(text, funcEntry.offsetStart);
-                result.push({
-                    name: functionName,
-                    lineStart: StringUtils.offsetToLineNum(lines, funcEntry.offsetStart),
-                    lineEnd: StringUtils.offsetToLineNum(lines, endOffset)
+        CollectionUtils.forEach(allFunctions, function (functionName, functions) {
+            if (functionName === searchName || searchName === "*") {
+                functions.forEach(function (funcEntry) {
+                    var endOffset = _getFunctionEndOffset(text, funcEntry.offsetStart);
+                    result.push({
+                        name: functionName,
+                        lineStart: StringUtils.offsetToLineNum(lines, funcEntry.offsetStart),
+                        lineEnd: StringUtils.offsetToLineNum(lines, endOffset)
+                    });
                 });
-            };
-        }
-        
-        for (functionName in allFunctions) {
-            if (allFunctions.hasOwnProperty(functionName)) {
-                if (functionName === searchName || searchName === "*") {
-                    var addFunctionEntry = makeAddFunction(functionName);
-                    allFunctions[functionName].forEach(addFunctionEntry);
-                }
             }
-        }
+        });
          
         return result;
     }
diff --git a/src/utils/CollectionUtils.js b/src/utils/CollectionUtils.js
@@ -46,7 +46,23 @@ define(function (require, exports, module) {
         return -1;
     }
     
+    /**
+     * Iterates over all the properties in an object or elements in an array. Differs from
+     * $.each in that it iterates over array-like objects like regular objects.
+     * @param {*} object The object or array to iterate over.
+     * @param {function(index, value)} callback The function that will be executed on every object.
+     */
+    function forEach(object, callback) {
+        var keys = Object.keys(object),
+            len = keys.length,
+            i;
+        
+        for (i = 0; i < len; i++) {
+            callback(keys[i], object[keys[i]]);
+        }
+    }
     
     // Define public API
     exports.indexOf = indexOf;
+    exports.forEach = forEach;
 });
