Merge pull request #61 from ember-cli/revert

Revert "Open editor on clicking compilation error"

Author: mansona

lib/templates/error.html

@@ -1099,9 +1099,7 @@
       <article class="content">
         <h1 class="error-header">Dang! Looks like a {{errorType}}.</h1>
         {{#if location.file}}
-          <h2 class="error-message" onclick="openEditorForTemplateError()">
-            {{location.file}}{{#if location.line}}:{{location.line}}{{/if}}
-          </h2>
+          <h2 class="error-message">{{location.file}}{{#if location.line}}:{{location.line}}{{/if}}</h2>
         {{/if}}
 
           {{#if codeFrame}}
@@ -1142,12 +1140,5 @@ <h2>Environment</h2>
         <span>{{versionString}}</span>
       </article>
     </main>
-    <script>
-      function openEditorForTemplateError() {
-        let xhr = new XMLHttpRequest();
-        xhr.open('GET', '/ember_open_editor_for_template_compilation_error', true);
-        xhr.send();
-      }
-    </script>
   </body>
 </html>

lib/utils/filename-normaliser.js

@@ -2,10 +2,8 @@
 
 const url = require('url');
 const path = require('path');
-const launchEditor = require('launch-editor');
 
 const errorHandler = require('./utils/error-handler');
-const { getNormalisedFileName } = require('./utils/filename-normaliser');
 
 module.exports = function watcherMiddleware(watcher, options) {
   options = options || {};
@@ -36,49 +34,10 @@ module.exports = function watcherMiddleware(watcher, options) {
 
       next();
     }, (buildError) => {
-      if (request.url === '/ember_open_editor_for_template_compilation_error') {
-        let errorLocation = buildError.broccoliPayload.error.location || {};
-        let { originalError } = buildError.broccoliPayload;
-        if (originalError) {
-          let originalLocation = originalError.loc || originalError.location || {};
-          errorLocation.line = originalLocation.line || errorLocation.line || 1;
-          errorLocation.column = originalLocation.column || errorLocation.column || 1;
-        }
-
-        let {
-          file: fileName,
-          line,
-          column
-        } = errorLocation;
-
-        if (fileName) {
-          let normalisedFileName = getNormalisedFileName(fileName, line, column);
-
-          // 1) If the EMBER_CLI_EDITOR is set, it's value will be used as the editor.
-          // 2) If EMBER_CLI_EDITOR is not set, launchEditor will try to guess which editor is open.
-          //    a) If it succeeds, that guessed editor will be opened.
-          //    b) Else, it will fall back to VISUAL and EDITOR.
-          // 3) If none of these work, it will display a message asking the user to set EMBER_CLI_EDITOR
-          let emberCliEditor = process.env.EMBER_CLI_EDITOR;
-
-          launchEditor(normalisedFileName, emberCliEditor, () => {
-            if (!emberCliEditor) {
-              console.log(
-                'To set up the editor integration, set the env variable EMBER_CLI_EDITOR ' +
-                'to an editor of your choice and restart the server.'
-              );
-            }
-          });
-        }
-
-        response.writeHead(200);
-        response.end();
-      } else {
-        errorHandler(response, {
-          'buildError': buildError,
-          'liveReloadPath': options.liveReloadPath
-        });
-      }
+      errorHandler(response, {
+        'buildError': buildError,
+        'liveReloadPath': options.liveReloadPath
+      });
     })
     .catch((err) => {
       console.log(err);

lib/watcher-middleware.js

@@ -24,10 +24,8 @@
   },
   "dependencies": {
     "ansi-html": "^0.0.9",
-    "find-up": "^3.0.0",
     "handlebars": "^4.0.4",
     "has-ansi": "^3.0.0",
-    "launch-editor": "^2.2.1",
     "mime-types": "^2.1.18"
   },
   "devDependencies": {