fix block statements. - fixes #2

fix .config unset not working

Author: tintinweb

bin/main.js

@@ -117,7 +117,7 @@ cheers 🙌
                 case '.config':
                     switch(commandParts[1]){
                         case 'set': shell.setSetting(commandParts[2], convert(commandParts[3])); break;
-                        case 'del': delete shell.settings[commandParts[2]]; break;
+                        case 'unset': delete shell.settings[commandParts[2]]; break;
                         default: return cb(shell.settings); 
                     } break;
                 case '.session': 
@@ -159,7 +159,6 @@ cheers 🙌
                         return cb();
                     }
                     return cb(`${c.bold(c.yellow(shell.blockchain.proc.pid))} - ${shell.blockchain.proc.spawnargs.join(', ')}`)
-
                 default:
                     console.error(`Unknown Command: '${command}'. Type '${c.bold('.help')}' for a list of commands.`);
             }
@@ -171,7 +170,7 @@ cheers 🙌
 
         /* REPL cmd */
         shell.run(statement).then(res => {
-            if(typeof res === 'object'){
+            if(!Array.isArray(res) && typeof res === 'object'){
                 return cb();
             }
             LAST_KNOWN_RESULT = res;

src/handler.js

@@ -60,7 +60,7 @@ class SolidityStatement {
                 this.scope = SCOPE.VERSION_PRAGMA;
                 this.hasNoReturnValue = true;
                 this.rawCommand = this.fixStatement(this.rawCommand);
-            } else if (this.rawCommand.startsWith('pragma ')) {
+            } else if (this.rawCommand.startsWith('pragma ') || this.rawCommand.startsWith('import ')) {
                 this.scope = SCOPE.SOURCE_UNIT;
                 this.hasNoReturnValue = true;
                 this.rawCommand = this.fixStatement(this.rawCommand);
@@ -91,7 +91,7 @@ class SolidityStatement {
     }
 
     fixStatement(stm) {
-        return stm.endsWith(';') ? stm : `${stm};`
+        return (stm.endsWith(';') || stm.endsWith('}')) ? stm : `${stm};`
     }
 
     toString() {
@@ -287,13 +287,11 @@ contract ${this.settings.templateContractName} {
                 let contractData = res.contracts[''];
                 contractData[this.settings.templateContractName]['main'] = this.settings.templateFuncMain;
 
-
                 this.blockchain.deploy(contractData, (err, retval) => {
                     if (err) {
                         this.revert();
                         return reject(err)
                     }
-
                     return resolve(retval) // return value
                 })
             }).catch(errors => {
@@ -426,5 +424,6 @@ class Blockchain {
 
 module.exports = {
     InteractiveSolidityShell,
-    SolidityStatement
+    SolidityStatement,
+    SCOPE
 }