Fix issues thrown up by linting in #192

Author: gfwilliams

core/terminal.js

@@ -483,10 +483,9 @@
       var pos = cursor[0].getBoundingClientRect();
       var terminalfocus = document.getElementById("terminalfocus");
       var x = Math.min(pos.left, terminal.offsetWidth);
-      // TODO: 'y' is already defined in outer scope, but this redeclaration doesn't appear to be used in this scope?
-      var y = Math.min(pos.top-tPos.top, terminal.height-terminalfocus.offsetHeight); 
+      var y = Math.min(pos.top-tPos.top, terminal.height-terminalfocus.offsetHeight);
       terminalfocus.style.left=x+"px";
-      terminalfocus.style.top=(pos.top-tPos.top)+"px";
+      terminalfocus.style.top=y+"px";
     }
   };
 

core/utils.js

@@ -19,14 +19,6 @@
 
   }
 
-  // function decodeBase64(d) {
-  //   return Buffer.from(d,'base64').toString('binary');
-  // }
-
-  // function encodeBase64(d) {
-  //   return Buffer.from(d,'binary').toString('base64');
-  // }
-
   function isWindows() {
     return (typeof navigator!="undefined") && navigator.userAgent.indexOf("Windows")>=0;
   }

plugins/compiler.js

@@ -49,31 +49,33 @@
     });
   }
 
-  /* Replace this node with the given text, and
-  update node start/end positions of other nodes
-  we're interested in */
-  function replaceNode(node, newCode) {
-    // TODO: Where is 'code' defined? Is this a global?
-    code = code.substr(0,node.start) + newCode + code.substr(node.end);
-    var offs = newCode.length - (node.end-node.start); // offset for future code snippets
+  /** Given a string containing code, this parses it using acorn
+   * then attempts to find functions with the string "compiled"
+   * in them and sends them off to the compiler.
+   */
+  function compileCode(code, description, callback) {
+    var tasks = [];
 
-    // TODO: Also unclear where 'tasks' is defined, there's nothing in this scope to declare it
-    for (var i in tasks)
-      if (tasks[i].node.start > node.start) {
-        tasks[i].node.start += offs;
-        tasks[i].node.end += offs;
-      }
-  }
+    /* Replace this node with the given text, and
+    update node start/end positions of other nodes
+    we're interested in */
+    function replaceNode(node, newCode) {
+      code = code.substr(0,node.start) + newCode + code.substr(node.end);
+      var offs = newCode.length - (node.end-node.start); // offset for future code snippets
+      for (var i in tasks)
+        if (tasks[i].node.start > node.start) {
+          tasks[i].node.start += offs;
+          tasks[i].node.end += offs;
+        }
+    }
 
-  function compileCode(code, description, callback) {
     if (!Espruino.Config.COMPILATION)
       return callback(code);
 
     var board = Espruino.Core.Env.getBoardData();
-    var tasks = 0; // TODO: This is re-declared as an array at #73, but this outer scoped 'tasks' is not modified
     try {
-      var ast = acorn.parse(code);
-      var tasks = [];
+      var ast = acorn.parse(code, {ecmaVersion: 2020});
+      tasks = [];
       // function xyz() { "compiled" ... }
       ast.body.forEach(function(node) {
         if (node.type=="FunctionDeclaration") {

plugins/minify.js

@@ -194,8 +194,7 @@
         _callback(code);
       };
     })();
-    
-    // TODO: None of the below block is called
+
     var minifyCode = code;
     var minifyCallback = callback;
     if (isModule) {
@@ -208,13 +207,12 @@
         callback(minified.substr(header.length, minified.length-(header.length+footer.length+1)));
       }
     }
-    // End of unused block
 
     switch(level){
       case "WHITESPACE_ONLY":
       case "SIMPLE_OPTIMIZATIONS":
-      case "ADVANCED_OPTIMIZATIONS": minifyCodeGoogle(code, callback, level, description); break;
-      case "ESPRIMA": minifyCodeEsprima(code, callback, description); break;
+      case "ADVANCED_OPTIMIZATIONS": minifyCodeGoogle(minifyCode, minifyCallback, level, description); break;
+      case "ESPRIMA": minifyCodeEsprima(minifyCode, minifyCallback, description); break;
       default: callback(code); break;
     }
   }

plugins/pretokenise.js

@@ -236,13 +236,12 @@
       if (needSpaceBetween(lastCh, ch))
         resultCode += " ";
       if (ch>=LEX_OPERATOR_START) {
-        var len
         if (ch==LEX_RAW_STRING8) { // decode raw strings
-          len = code.charCodeAt(i+1);
+          let len = code.charCodeAt(i+1);
           resultCode += Espruino.Core.Utils.toJSONishString(code.substring(i+2, i+2+len));
           i+=1+len;
         } else if (ch==LEX_RAW_STRING16) {
-          len = code.charCodeAt(i+1) | (code.charCodeAt(i+2)<<8);
+          let len = code.charCodeAt(i+1) | (code.charCodeAt(i+2)<<8);
           resultCode += Espruino.Core.Utils.toJSONishString(code.substring(i+3, i+3+len));
           i+=2+len;
         } else if (ch<LEX_OPERATOR_START+TOKENS.length) // decoded other tokens