cleanup jslint warnings

Author: eztierney

src/extensions/default/JavaScriptCodeHints/HintUtils.js

@@ -94,7 +94,7 @@ define(function (require, exports, module) {
     function splitPath(path) {
         var index   = path.lastIndexOf("/"),
             dir     = path.substring(0, index),
-            file    = path.substring(index+1, path.length);
+            file    = path.substring(index + 1, path.length);
 
         return {dir: dir, file: file };
     }

src/extensions/default/JavaScriptCodeHints/ScopeManager.js

@@ -124,6 +124,17 @@ define(function (require, exports, module) {
         }
     }
 
+    /**
+     * Send a message to the tern worker - if the worker is being initialized,
+     * the message will not be posted until initialization is complete
+     */
+    function postMessage(msg) {
+        ternPromise.done(function (ternWorker) {
+            ternWorker.postMessage(msg);
+        });
+    }
+    
+
     /**
      * Get a Promise for the definition from TernJS, for the file & offset passed in.
      * @return {jQuery.Promise} - a promise that will resolve to definition when
@@ -132,10 +143,10 @@ define(function (require, exports, module) {
     function getJumptoDef(dir, file, offset, text) {
         postMessage({
             type: HintUtils.TERN_JUMPTODEF_MSG,
-            dir:dir,
-            file:file,
-            offset:offset,
-            text:text
+            dir: dir,
+            file: file,
+            offset: offset,
+            text: text
         });
 
         var $deferredJump = $.Deferred();
@@ -160,7 +171,7 @@ define(function (require, exports, module) {
 
         var ternPromise = getJumptoDef(dir, file, offset, document.getText());
 
-        return {promise:ternPromise};
+        return {promise: ternPromise};
     }
 
     /**
@@ -176,74 +187,35 @@ define(function (require, exports, module) {
 
         pendingTernRequests[file] = null;
 
-        if( $deferredJump ) { 
+        if ($deferredJump) {
             $deferredJump.resolveWith(null, [response]);
         }
     }
-    
+
     /**
-     * Request hints from Tern.
+     * Add a pending request waiting for the tern-worker to complete.
      *
-     * Note that successive calls to getScope may return the same objects, so
-     * clients that wish to modify those objects (e.g., by annotating them based
-     * on some temporary context) should copy them first. See, e.g.,
-     * Session.getHints().
-     * 
-     * @param {Document} document - the document for which scope info is 
-     *      desired
-     * @param {number} offset - the offset into the document at which scope
-     *      info is desired
-     * @return {jQuery.Promise} - The promise will not complete until the tern
-     *      hints have completed.
+     * @param {string} file - the name of the file
+     * @param {string} type - the type of request
+     * @param {jQuery.Deferred} deferredRequest - the $.Deferred object to save     
      */
-    function requestHints(session, document, offset) {
-        var path    = document.file.fullPath,
-            split   = HintUtils.splitPath(path),
-            dir     = split.dir,
-            file    = split.file;
-        
-        var $deferredHints = $.Deferred(),
-            hintPromise,
-            fnTypePromise,
-            propsPromise;
-        
-        hintPromise = getTernHints(dir, file, offset, document.getText());
-        var sessionType = session.getType();
-        if (sessionType.property) {
-            propsPromise = getTernProperties(dir, file, offset, document.getText());
+    function addPendingRequest(file, offset, type) {
+        var requests,
+            key = file + "@" + offset,
+            $deferredRequest;
+        if (Object.prototype.hasOwnProperty.call(pendingTernRequests, key)) {
+            requests = pendingTernRequests[key];
         } else {
-            var $propsDeferred = $.Deferred();
-            propsPromise = $propsDeferred.promise();
-            $propsDeferred.resolveWith(null);
+            requests = {};
+            pendingTernRequests[key] = requests;
         }
 
-        if( sessionType.showFunctionType ) {
-            // Show function sig
-            fnTypePromise = getTernFunctionType(dir, file, sessionType.functionCallPos, offset, document.getText());            
+        if (Object.prototype.hasOwnProperty.call(requests, type)) {
+            $deferredRequest = requests[type];
         } else {
-            var $fnTypeDeferred = $.Deferred();
-            fnTypePromise = $fnTypeDeferred.promise();
-            $fnTypeDeferred.resolveWith(null);
+            requests[type] = $deferredRequest = $.Deferred();
         }
-        $.when(hintPromise, fnTypePromise, propsPromise).done(
-            function(completions, fnType, properties){
-                session.setTernHints(completions);
-                session.setFnType(fnType);
-                session.setTernProperties(properties);
-
-                $deferredHints.resolveWith(null);
-            });
-        return {promise:$deferredHints.promise()};
-    }
-
-    /**
-     * Send a message to the tern worker - if the worker is being initialized,
-     * the message will not be posted until initialization is complete
-     */
-    function postMessage(msg) {
-        ternPromise.done(function (ternWorker){
-            ternWorker.postMessage(msg);
-        });
+        return $deferredRequest.promise();
     }
 
     /**
@@ -254,13 +226,13 @@ define(function (require, exports, module) {
     function getTernHints(dir, file, offset, text) {
         postMessage({
             type: HintUtils.TERN_COMPLETIONS_MSG,
-            dir:dir,
-            file:file,
-            offset:offset,
-            text:text
+            dir: dir,
+            file: file,
+            offset: offset,
+            text: text
         });
 
-        return addPendingRequest(file, offset, HintUtils.TERN_COMPLETIONS_MSG);        
+        return addPendingRequest(file, offset, HintUtils.TERN_COMPLETIONS_MSG);
     }
 
     /**
@@ -273,10 +245,10 @@ define(function (require, exports, module) {
     function getTernProperties(dir, file, offset, text) {
         postMessage({
             type: HintUtils.TERN_GET_PROPERTIES_MSG,
-            dir:dir,
-            file:file,
+            dir: dir,
+            file: file,
             offset: offset,
-            text:text
+            text: text
         });
 
         return addPendingRequest(file, offset, HintUtils.TERN_GET_PROPERTIES_MSG);
@@ -289,55 +261,86 @@ define(function (require, exports, module) {
     function getTernFunctionType(dir, file, pos, offset, text) {
         postMessage({
             type: HintUtils.TERN_CALLED_FUNC_TYPE_MSG,
-            dir:dir,
-            file:file,
-            pos:pos,
-            offset:offset,
-            text:text
+            dir: dir,
+            file: file,
+            pos: pos,
+            offset: offset,
+            text: text
         });
 
-        return addPendingRequest(file, offset, HintUtils.TERN_CALLED_FUNC_TYPE_MSG);        
+        return addPendingRequest(file, offset, HintUtils.TERN_CALLED_FUNC_TYPE_MSG);
     }
 
+    
     /**
-     * Add a pending request waiting for the tern-worker to complete.
+     * Request hints from Tern.
      *
-     * @param {string} file - the name of the file
-     * @param {string} type - the type of request
-     * @param {jQuery.Deferred} deferredRequest - the $.Deferred object to save     
-     */     
-    function addPendingRequest(file, offset, type) {
-        var requests,
-            key = file+"@"+offset,
-            $deferredRequest;
-        if( Object.prototype.hasOwnProperty.call(pendingTernRequests, key) ) {
-            requests = pendingTernRequests[key];
+     * Note that successive calls to getScope may return the same objects, so
+     * clients that wish to modify those objects (e.g., by annotating them based
+     * on some temporary context) should copy them first. See, e.g.,
+     * Session.getHints().
+     * 
+     * @param {Document} document - the document for which scope info is 
+     *      desired
+     * @param {number} offset - the offset into the document at which scope
+     *      info is desired
+     * @return {jQuery.Promise} - The promise will not complete until the tern
+     *      hints have completed.
+     */
+    function requestHints(session, document, offset) {
+        var path    = document.file.fullPath,
+            split   = HintUtils.splitPath(path),
+            dir     = split.dir,
+            file    = split.file;
+        
+        var $deferredHints = $.Deferred(),
+            hintPromise,
+            fnTypePromise,
+            propsPromise;
+        
+        hintPromise = getTernHints(dir, file, offset, document.getText());
+        var sessionType = session.getType();
+        if (sessionType.property) {
+            propsPromise = getTernProperties(dir, file, offset, document.getText());
         } else {
-            requests = {};
-            pendingTernRequests[key] = requests;            
+            var $propsDeferred = $.Deferred();
+            propsPromise = $propsDeferred.promise();
+            $propsDeferred.resolveWith(null);
         }
 
-        if (Object.prototype.hasOwnProperty.call(requests, type)) {
-            $deferredRequest = requests[type];
+        if (sessionType.showFunctionType) {
+            // Show function sig
+            fnTypePromise = getTernFunctionType(dir, file, sessionType.functionCallPos, offset, document.getText());
         } else {
-            requests[type] = $deferredRequest = $.Deferred();        
+            var $fnTypeDeferred = $.Deferred();
+            fnTypePromise = $fnTypeDeferred.promise();
+            $fnTypeDeferred.resolveWith(null);
         }
-        return $deferredRequest.promise();
-    }        
-    
+        $.when(hintPromise, fnTypePromise, propsPromise).done(
+            function (completions, fnType, properties) {
+                session.setTernHints(completions);
+                session.setFnType(fnType);
+                session.setTernProperties(properties);
+
+                $deferredHints.resolveWith(null);
+            }
+        );
+        return {promise: $deferredHints.promise()};
+    }
+
     /**
      * Get any pending $.Deferred object waiting on the specified file and request type
      * @param {string} file - the file
      * @param {string} type - the type of request
      * @param {jQuery.Deferred} - the $.Deferred for the request     
-     */     
+     */
     function getPendingRequest(file, offset, type) {
-        var key = file +"@"+offset;
-        if( Object.prototype.hasOwnProperty.call(pendingTernRequests, key) ) {
+        var key = file + "@" + offset;
+        if (Object.prototype.hasOwnProperty.call(pendingTernRequests, key)) {
             var requests = pendingTernRequests[key];
-            return requests[type];            
-        }            
-    }   
+            return requests[type];
+        }
+    }
 
     /**
      * Handle the response from the tern web worker when
@@ -352,17 +355,17 @@ define(function (require, exports, module) {
             completions = response.completions,
             properties = response.properties,
             fnType  = response.fnType,
-            type = response.type,            
+            type = response.type,
             $deferredHints = getPendingRequest(file, offset, type);
 
-        if( $deferredHints ) {
-            if( completions ) {            
+        if ($deferredHints) {
+            if (completions) {
                 $deferredHints.resolveWith(null, [completions]);
-            } else if ( properties ) {
+            } else if (properties) {
                 $deferredHints.resolveWith(null, [properties]);
-            } else if ( fnType ) {
+            } else if (fnType) {
                 $deferredHints.resolveWith(null, [fnType]);
-            }                
+            }
         }
     }
 
@@ -384,33 +387,33 @@ define(function (require, exports, module) {
 
         function replyWith(name, txt) {
             postMessage({
-                type:HintUtils.TERN_GET_FILE_MSG,
-                file:name, 
-                text:txt
+                type: HintUtils.TERN_GET_FILE_MSG,
+                file: name,
+                text: txt
             });
         }
 
         var name = request.file;
-        DocumentManager.getDocumentForPath(rootTernDir + name).done(function(document){
+        DocumentManager.getDocumentForPath(rootTernDir + name).done(function (document) {
             resolvedFiles[name] = rootTernDir + name;
             replyWith(name, document.getText());
         })
-        .fail(function(){
-            if (projectRoot) {
-                // Try relative to project root
-                DocumentManager.getDocumentForPath(projectRoot + name).done(function(document) {
-                    resolvedFiles[name] = projectRoot + name;
-                    replyWith(name, document.getText());
-                })
-                .fail(function(){
+            .fail(function () {
+                if (projectRoot) {
+                    // Try relative to project root
+                    DocumentManager.getDocumentForPath(projectRoot + name).done(function (document) {
+                        resolvedFiles[name] = projectRoot + name;
+                        replyWith(name, document.getText());
+                    })
+                        .fail(function () {
+                            replyWith(name, "");
+                        });
+                } else {
+                    // Need to send something back to tern - it will wait
+                    // until all the files have been retrieved before doing its calculations
                     replyWith(name, "");
-                });
-            } else {
-                // Need to send something back to tern - it will wait
-                // until all the files have been retrieved before doing its calculations
-                replyWith(name, "");    
-            }
-        });
+                }
+            });
     }
 
     /**
@@ -475,15 +478,15 @@ define(function (require, exports, module) {
         var response = e.data,
             type = response.type;
 
-        if( type === HintUtils.TERN_COMPLETIONS_MSG ||
-            type === HintUtils.TERN_CALLED_FUNC_TYPE_MSG ||
-            type === HintUtils.TERN_GET_PROPERTIES_MSG) {
+        if (type === HintUtils.TERN_COMPLETIONS_MSG ||
+                type === HintUtils.TERN_CALLED_FUNC_TYPE_MSG ||
+                type === HintUtils.TERN_GET_PROPERTIES_MSG) {
             // handle any completions the worker calculated
             handleTernCompletions(response);
-        } else if ( type === HintUtils.TERN_GET_FILE_MSG ) {
+        } else if (type === HintUtils.TERN_GET_FILE_MSG) {
             // handle a request for the contents of a file
             handleTernGetFile(response);
-        } else if ( type === HintUtils.TERN_JUMPTODEF_MSG ) {
+        } else if (type === HintUtils.TERN_JUMPTODEF_MSG) {
             handleJumptoDef(response);
         } else {
             console.log("Worker: " + (response.log || response));