🐛 transpile + babel

princejwesley · Nov 26, 2015 · 9062ade · 9062ade
1 parent afb4f40
commit 9062ade
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/common/ReplInput.js b/src/common/ReplInput.js
@@ -10,7 +10,7 @@ let asyncWrapper = (code) => {
   return `(async function() { let result = (${code}); return result; }())`;
 };
 
-let cook = (plain, transpile) => {
+let cook = (plain) => {
   let tplain = plain.trim();
   let source = tplain.match(sourceMatcher);
   if(source) {
@@ -24,7 +24,7 @@ let cook = (plain, transpile) => {
 
   let output = plain;
 
-  if(!transpile && global.Mancy.preferences.asyncWrap && global.Mancy.preferences.lang === 'js') {
+  if(global.Mancy.preferences.asyncWrap && global.Mancy.preferences.lang === 'js') {
     // bare await
     let match = plain.match(awaitMatcher);
     if(match && match[1].indexOf('async') === -1) {
@@ -34,23 +34,23 @@ let cook = (plain, transpile) => {
 
   return {
     local: false,
-    output: global.Mancy.preferences.babel && global.Mancy.preferences.lang === 'js' ? babelTransfrom(output, transpile) : output
+    output: global.Mancy.preferences.babel && global.Mancy.preferences.lang === 'js' ? babelTransfrom(output) : output
   };
 };
 
-let babelTransfrom = (plain, transpile = false) => {
+let babelTransfrom = (plain) => {
   try {
     return babel
       .transform(plain, ReplConstants.BABEL_OPTIONS)
       .code;
   } catch(e) {
-    return transpile ? e : plain;
+    return plain;
   }
 }
 
 let ReplInput = {
-  transform: (plain, transpile = false) => {
-    return cook(plain, transpile);
+  transform: (plain) => {
+    return cook(plain);
   }
 };
 

diff --git a/src/components/ReplActiveInput.js b/src/components/ReplActiveInput.js
@@ -378,7 +378,7 @@ export default class ReplActiveInput extends React.Component {
       cli.$lastExpression = ReplOutput.none();
       cli.context = ReplContext.getContext();
       this.promptInput = text;
-      let {local, output, input} = ReplInput.transform(text, transpile);
+      let {local, output, input} = ReplInput.transform(text);
 
       if(local) {
         return this.addEntryAction(output, true, input, text);
@@ -388,7 +388,7 @@ export default class ReplActiveInput extends React.Component {
         if(global.Mancy.session.lang !== 'js') {
           cli.transpile(output, cli.context, this.transpileAndExecute);
         } else {
-          this.transpileAndExecute(_.isError(output), output);
+          this.transpileAndExecute(_.isError(output) ? output : null, output);
         }
         return;
       }