Merge pull request #11123 from adobe/marcel/js-hints-perf-min

Improve JS Code Hints performance in minified files
adobe · Sep 9, 2015 · e79fb4a · e79fb4a
2 parents 81925ce + d29288a
commit e79fb4a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/extensions/default/JavaScriptCodeHints/Session.js b/src/extensions/default/JavaScriptCodeHints/Session.js
@@ -28,6 +28,7 @@ define(function (require, exports, module) {
     "use strict";
 
     var StringMatch     = brackets.getModule("utils/StringMatch"),
+        TokenUtils      = brackets.getModule("utils/TokenUtils"),
         LanguageManager = brackets.getModule("language/LanguageManager"),
         HTMLUtils       = brackets.getModule("language/HTMLUtils"),
         HintUtils       = require("HintUtils"),
@@ -130,9 +131,9 @@ define(function (require, exports, module) {
         var cm = this.editor._codeMirror;
 
         if (cursor) {
-            return cm.getTokenAt(cursor);
+            return TokenUtils.getTokenAt(cm, cursor);
         } else {
-            return cm.getTokenAt(this.getCursor());
+            return TokenUtils.getTokenAt(cm, this.getCursor());
         }
     };
 

diff --git a/src/utils/TokenUtils.js b/src/utils/TokenUtils.js
@@ -62,7 +62,7 @@ define(function (require, exports, module) {
                 cm: cm,
                 line: line,
                 timeStamp: Date.now(),
-                tokens: tokens,
+                tokens: tokens
             };
             cm.off("changes", _clearCache);
             cm.on("changes", _clearCache);