Fix prettify for files with syntax errors in CodeMirror

Author: Ives van Hoorne

src/app/components/sandbox/CodeEditor/CodeMirror.js

@@ -286,7 +286,7 @@ export default class CodeEditor extends React.PureComponent<Props, State> {
       if (kind[1] === 'css') {
         await System.import('codemirror/mode/css/css');
         return 'css';
-      } else if (kind[1] === 'html') {
+      } else if (kind[1] === 'html' || kind[1] === 'vue') {
         await System.import('codemirror/mode/htmlmixed/htmlmixed');
         return 'htmlmixed';
       } else if (kind[1] === 'md') {
@@ -442,7 +442,6 @@ export default class CodeEditor extends React.PureComponent<Props, State> {
         const newCode = await prettify.default(
           code,
           mode,
-          preferences.lintEnabled,
           preferences.prettierConfig
         );
 

src/app/components/sandbox/CodeEditor/Monaco.js

@@ -735,15 +735,14 @@ export default class CodeEditor extends React.PureComponent<Props, State> {
   prettify = async () => {
     const { id, title, preferences } = this.props;
     const code = this.getCode();
-    const mode = this.getMode(title);
+    const mode = await this.getMode(title);
 
     if (mode === 'javascript' || mode === 'css') {
       try {
         const prettify = await import('app/utils/codemirror/prettify');
         const newCode = await prettify.default(
           code,
           mode === 'javascript' ? 'jsx' : mode,
-          false, // Force false for eslint, since we would otherwise include 2 eslint bundles
           preferences.prettierConfig
         );
 

src/app/utils/codemirror/prettify.js

@@ -15,7 +15,6 @@ function getParser(mode) {
 export default (function prettify(
   code,
   mode,
-  eslintEnabled,
   prettierConfig = DEFAULT_PRETTIER_CONFIG
 ) {
   return new Promise(resolve => {
@@ -36,6 +35,8 @@ export default (function prettify(
       }
       if (formatted) {
         resolve(formatted);
+      } else {
+        resolve(text);
       }
     };
   });