Merge pull request #13147 from ficristo/tern-fix

zaggino · web-flow · commit 9a60020fcd04 · 2017-03-07T07:15:01.000+11:00
Remove normalizeFilename function
diff --git a/src/extensions/default/JavaScriptCodeHints/tern-worker.js b/src/extensions/default/JavaScriptCodeHints/tern-worker.js
@@ -106,30 +106,37 @@ var config = {};
                 delete fileCallBacks[file];
             }
 
+            function _getNormalizedFilename(fileName) {
+                if (ternServer.projectDir && fileName.indexOf(ternServer.projectDir) === -1) {
+                    fileName = ternServer.projectDir + fileName;
+                }
+                return fileName;
+            }
+
+            function _getDenormalizedFilename(fileName) {
+                if (ternServer.projectDir && fileName.indexOf(ternServer.projectDir) === 0) {
+                    fileName = fileName.slice(ternServer.projectDir.length);
+                }
+                return fileName;
+            }
+
             /**
              * Create a new tern server.
              *
              * @param {Object} env - an Object with the environment, as read in from
              *  the json files in node_modules/tern/defs
              * @param {Array.<string>} files - a list of filenames tern should be aware of
              */
-            function initTernServer(env, files) {
+            function initTernServer(dir, env, files) {
                 var ternOptions = {
+                    projectDir: dir,
                     defs: env,
                     async: true,
                     getFile: getFile,
                     plugins: {requirejs: {}, doc_comment: true, angular: true}
                 };
                 ternServer = new Tern.Server(ternOptions);
 
-                // Since we don't specify projectDir, Tern will "normalize" file names by
-                // removing any leading "/" (the default projectDir, which cannot be changed to "").
-                // This is not a problem on Windows, but on Mac and Linux, it will break
-                // absolute paths ("/home/" to "home/", for example)
-                ternServer.normalizeFilename = function (name) {
-                    return name;
-                };
-
                 files.forEach(function (file) {
                     ternServer.addFile(file);
                 });
@@ -207,8 +214,9 @@ var config = {};
                             self.postMessage({type: MessageIds.TERN_JUMPTODEF_MSG, file: fileInfo.name, offset: offset});
                             return;
                         }
+                        
                         var response = {type: MessageIds.TERN_JUMPTODEF_MSG,
-                                              file: fileInfo.name,
+                                              file: _getNormalizedFilename(fileInfo.name),
                                               resultFile: data.file,
                                               offset: offset,
                                               start: data.start,
@@ -264,7 +272,7 @@ var config = {};
 
                         // Post a message back to the main thread with the completions
                         self.postMessage({type: type,
-                                          file: fileInfo.name,
+                                          file: _getNormalizedFilename(fileInfo.name),
                                           offset: offset,
                                           properties: properties
                             });
@@ -310,7 +318,7 @@ var config = {};
                         if (completions.length > 0 || !isProperty) {
                             // Post a message back to the main thread with the completions
                             self.postMessage({type: MessageIds.TERN_COMPLETIONS_MSG,
-                                file: fileInfo.name,
+                                file: _getNormalizedFilename(fileInfo.name),
                                 offset: offset,
                                 completions: completions
                                 });
@@ -544,7 +552,7 @@ var config = {};
 
                 // Post a message back to the main thread with the completions
                 self.postMessage({type: MessageIds.TERN_CALLED_FUNC_TYPE_MSG,
-                    file: fileInfo.name,
+                    file: _getNormalizedFilename(fileInfo.name),
                     offset: offset,
                     fnType: fnType,
                     error: error
@@ -587,14 +595,21 @@ var config = {};
              * @param {string} path     - the path of the file
              */
             function handlePrimePump(path) {
-                var fileInfo = createEmptyUpdate(path),
+                var fileName = _getDenormalizedFilename(path);
+                var fileInfo = createEmptyUpdate(fileName),
                     request = buildRequest(fileInfo, "completions", {line: 0, ch: 0});
 
                 try {
                     ternServer.request(request, function (error, data) {
+                        if (error) {
+                            _log("Error returned from Tern 'completions' request: " + error);
+                            self.postMessage({type: MessageIds.TERN_PRIME_PUMP_MSG, file: fileInfo.name, path: path});
+                            return;
+                        }
+
                         // Post a message back to the main thread
                         self.postMessage({type: MessageIds.TERN_PRIME_PUMP_MSG,
-                            path: path
+                            path: _getNormalizedFilename(path)
                             });
                     });
                 } catch (e) {
@@ -622,11 +637,12 @@ var config = {};
 
                 if (type === MessageIds.TERN_INIT_MSG) {
 
-                    var env     = request.env,
+                    var dir     = request.dir,
+                        env     = request.env,
                         files   = request.files;
                     inferenceTimeout = request.timeout;
 
-                    initTernServer(env, files);
+                    initTernServer(dir, env, files);
                 } else if (type === MessageIds.TERN_COMPLETIONS_MSG) {
                     offset  = request.offset;
                     getTernHints(request.fileInfo, offset, request.isProperty);
