Merge pull request #3836 from eztierney/issue-3827

[JS Code Hints] Fix crash when hinting with angular.js.
adobe · May 15, 2013 · d092dd2 · d092dd2
2 parents 3c1614b + 05e7252
commit d092dd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
@@ -57,8 +57,8 @@ define(function (require, exports, module) {
         numResolvedFiles    = 0,
         numAddedFiles       = 0,
         stopAddingFiles     = false,
-        excludedFilesString = "require\\.js$|jquery-[\\d]\\.[\\d]\\.js$|\\.min\\.js$",
-        excludedFilesRegEx  = new RegExp(excludedFilesString),
+        // exclude require and jquery since we have special knowledge of those
+        excludedFilesRegEx  = /require\.js$|jquery-[\d]\.[\d]\.js$/,
         _ternWorker         = (function () {
             var path = ExtensionUtils.getModulePath(module, "tern-worker.js");
             return new Worker(path);

diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern