Merge pull request #11474 from adobe/marcel/lodash-3

abose · abose · commit 7beb2cdbb1b4 · 2015-07-31T13:43:02.000+05:30
Update Lodash -&gt; 3.10.0
diff --git a/src/command/KeyBindingManager.js b/src/command/KeyBindingManager.js
@@ -406,13 +406,13 @@ define(function (require, exports, module) {
         // Ensure that the first letter of the key name is in upper case and the rest are
         // in lower case. i.e. 'a' => 'A' and 'up' => 'Up'
         if (/^[a-z]/i.test(key)) {
-            key = key.charAt(0).toUpperCase() + key.substr(1).toLowerCase();
+            key = _.capitalize(key.toLowerCase());
         }
         
         // Also make sure that the second word of PageUp/PageDown has the first letter in upper case.
         if (/^Page/.test(key)) {
             key = key.replace(/(up|down)$/, function (match, p1) {
-                return p1.charAt(0).toUpperCase() + p1.substr(1);
+                return _.capitalize(p1);
             });
         }
         
diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -957,7 +957,7 @@ define(function (require, exports, module) {
         menu = getMenu(id);
         
         _.forEach(menuItemMap, function (value, key) {
-            if (key.substring(0, id.length) === id) {
+            if (_.startsWith(key, id)) {
                 if (value.isDivider) {
                     menu.removeMenuDivider(key);
                 } else {
diff --git a/src/extensions/default/JavaScriptCodeHints/main.js b/src/extensions/default/JavaScriptCodeHints/main.js
@@ -219,16 +219,7 @@ define(function (require, exports, module) {
         }
 
         // trim leading and trailing string literal delimiters from the query
-        if (query.indexOf(HintUtils.SINGLE_QUOTE) === 0 ||
-                query.indexOf(HintUtils.DOUBLE_QUOTE) === 0) {
-            trimmedQuery = query.substring(1);
-            if (trimmedQuery.lastIndexOf(HintUtils.DOUBLE_QUOTE) === trimmedQuery.length - 1 ||
-                    trimmedQuery.lastIndexOf(HintUtils.SINGLE_QUOTE) === trimmedQuery.length - 1) {
-                trimmedQuery = trimmedQuery.substring(0, trimmedQuery.length - 1);
-            }
-        } else {
-            trimmedQuery = query;
-        }
+        trimmedQuery = _.trim(query, HintUtils.SINGLE_QUOTE + HintUtils.DOUBLE_QUOTE);
 
         if (hints) {
             formattedHints = formatHints(hints, trimmedQuery);
diff --git a/src/language/CodeInspection.js b/src/language/CodeInspection.js
@@ -422,7 +422,7 @@ define(function (require, exports, module) {
                                     (error.pos.line + 1) > 0 &&
                                     (error.codeSnippet = currentDoc.getLine(error.pos.line)) !== undefined) {
                                 error.friendlyLine = error.pos.line + 1;
-                                error.codeSnippet = error.codeSnippet.substr(0, Math.min(175, error.codeSnippet.length));  // limit snippet width
+                                error.codeSnippet = error.codeSnippet.substr(0, 175);  // limit snippet width
                             }
                             
                             if (error.type !== Type.META) {
diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js
@@ -1140,7 +1140,7 @@ define(function (require, exports, module) {
                 prefix = this.prefix;
             
             var onlyWithPrefix = function (id) {
-                if (id.substr(0, prefix.length) === prefix) {
+                if (_.startsWith(id, prefix)) {
                     return true;
                 }
                 return false;
diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js
@@ -407,9 +407,9 @@ define(function (require, exports, module) {
             if (before === -1) {
                 before = scopeOrder.length - 2;
             }
-            newScopeOrder = _.first(scopeOrder, before);
+            newScopeOrder = _.take(scopeOrder, before);
             newScopeOrder.push("project");
-            newScopeOrder.push.apply(newScopeOrder, _.rest(scopeOrder, before));
+            newScopeOrder.push.apply(newScopeOrder, _.drop(scopeOrder, before));
         } else {
             newScopeOrder = _.without(scopeOrder, "project");
         }
diff --git a/src/project/FileTreeView.js b/src/project/FileTreeView.js
@@ -469,7 +469,7 @@ define(function (require, exports, module) {
                 var aArgs = _.flatten([{
                     href: "#",
                     className: fileClasses
-                }, this.getIcons(), name, extension], true);
+                }, this.getIcons(), name, extension]);
                 nameDisplay = DOM.a.apply(DOM.a, aArgs);
             }
 
@@ -702,7 +702,7 @@ define(function (require, exports, module) {
             var aArgs = _.flatten([{
                 href: "#",
                 className: directoryClasses
-            }, this.getIcons()], true);
+            }, this.getIcons()]);
             if (!entry.get("rename")) {
                 aArgs.push(this.props.name);
             }
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
@@ -138,7 +138,7 @@ define(function (require, exports, module) {
             
             if (highlightEndCh <= MAX_DISPLAY_LENGTH) {
                 // Don't store more than 200 chars per line
-                line = line.substr(0, Math.min(MAX_DISPLAY_LENGTH, line.length));
+                line = line.substr(0, MAX_DISPLAY_LENGTH);
             } else if (totalMatchLength > MAX_DISPLAY_LENGTH) {
                 // impossible to display the whole match
                 line = line.substr(ch, ch + MAX_DISPLAY_LENGTH);
diff --git a/src/thirdparty/lodash.js b/src/thirdparty/lodash.js

Original file line number	Diff line number	Diff line change
`@@ -406,13 +406,13 @@ define(function (require, exports, module) {`
`406`	`406`	`// Ensure that the first letter of the key name is in upper case and the rest are`
`407`	`407`	`// in lower case. i.e. 'a' => 'A' and 'up' => 'Up'`
`408`	`408`	`if (/^[a-z]/i.test(key)) {`
`409`		`- key = key.charAt(0).toUpperCase() + key.substr(1).toLowerCase();`
	`409`	`+ key = _.capitalize(key.toLowerCase());`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`// Also make sure that the second word of PageUp/PageDown has the first letter in upper case.`
`413`	`413`	`if (/^Page/.test(key)) {`
`414`	`414`	`key = key.replace(/(up\|down)$/, function (match, p1) {`
`415`		`- return p1.charAt(0).toUpperCase() + p1.substr(1);`
	`415`	`+ return _.capitalize(p1);`
`416`	`416`	`});`
`417`	`417`	`}`
`418`	`418`
Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ define(function (require, exports, module) {`
`422`	`422`	`(error.pos.line + 1) > 0 &&`
`423`	`423`	`(error.codeSnippet = currentDoc.getLine(error.pos.line)) !== undefined) {`
`424`	`424`	`error.friendlyLine = error.pos.line + 1;`
`425`		`- error.codeSnippet = error.codeSnippet.substr(0, Math.min(175, error.codeSnippet.length)); // limit snippet width`
	`425`	`+ error.codeSnippet = error.codeSnippet.substr(0, 175); // limit snippet width`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`if (error.type !== Type.META) {`
Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,7 @@ define(function (require, exports, module) {`
`1140`	`1140`	`prefix = this.prefix;`
`1141`	`1141`
`1142`	`1142`	`var onlyWithPrefix = function (id) {`
`1143`		`- if (id.substr(0, prefix.length) === prefix) {`
	`1143`	`+ if (_.startsWith(id, prefix)) {`
`1144`	`1144`	`return true;`
`1145`	`1145`	`}`
`1146`	`1146`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -407,9 +407,9 @@ define(function (require, exports, module) {`
`407`	`407`	`if (before === -1) {`
`408`	`408`	`before = scopeOrder.length - 2;`
`409`	`409`	`}`
`410`		`- newScopeOrder = _.first(scopeOrder, before);`
	`410`	`+ newScopeOrder = _.take(scopeOrder, before);`
`411`	`411`	`newScopeOrder.push("project");`
`412`		`- newScopeOrder.push.apply(newScopeOrder, _.rest(scopeOrder, before));`
	`412`	`+ newScopeOrder.push.apply(newScopeOrder, _.drop(scopeOrder, before));`
`413`	`413`	`} else {`
`414`	`414`	`newScopeOrder = _.without(scopeOrder, "project");`
`415`	`415`	`}`