diff --git a/core/field.js b/core/field.js
index c93cbc95b..2dbb16919 100644
--- a/core/field.js
+++ b/core/field.js
@@ -528,7 +528,7 @@ Blockly.Field.prototype.setValue = function(newValue) {
  * @private
  */
 Blockly.Field.prototype.onMouseDown_ = function(
-  /* eslint-disable no-unused-vars */ e /* eslint-enable no-unused-vars */) {
+    /* eslint-disable no-unused-vars */ e /* eslint-enable no-unused-vars */) {
   if (!this.sourceBlock_ || !this.sourceBlock_.workspace) {
     return;
   }
@@ -544,8 +544,8 @@ Blockly.Field.prototype.onMouseDown_ = function(
  *     link to for its tooltip.
  */
 Blockly.Field.prototype.setTooltip = function(
-  /* eslint-disable no-unused-vars */ newTip
-  /* eslint-enable no-unused-vars */) {
+    /* eslint-disable no-unused-vars */ newTip
+    /* eslint-enable no-unused-vars */) {
   // Non-abstract sub-classes may wish to implement this.  See FieldLabel.
 };
 
diff --git a/core/toolbox.js b/core/toolbox.js
index 759bbebfc..5531f1c4a 100644
--- a/core/toolbox.js
+++ b/core/toolbox.js
@@ -297,7 +297,7 @@ Blockly.Toolbox.prototype.populate_ = function(newTree) {
  * Sync trees of the toolbox.
  * @param {!Node} treeIn DOM tree of blocks.
  * @param {!Blockly.Toolbox.TreeControl} treeOut The TreeContorol object built
- *  from treeIn.
+ *     from treeIn.
  * @param {string} pathToMedia The path to the Blockly media directory.
  * @return {Node} Tree node to open at startup (or null).
  * @private
@@ -631,7 +631,7 @@ Blockly.Toolbox.TreeNode.prototype.getExpandIconSafeHtml = function() {
  * @override
  */
 Blockly.Toolbox.TreeNode.prototype.onClick_ = function(
-  /* eslint-disable no-unused-vars */ e /* eslint-disable no-unused-vars */) {
+    /* eslint-disable no-unused-vars */ e /* eslint-disable no-unused-vars */) {
   // Expand icon.
   if (this.hasChildren() && this.isUserCollapsible_) {
     this.toggle();
@@ -651,7 +651,7 @@ Blockly.Toolbox.TreeNode.prototype.onClick_ = function(
  * @private
  */
 Blockly.Toolbox.TreeNode.prototype.onMouseDown = function(
-  /* eslint-disable no-unused-vars */ e /* eslint-disable no-unused-vars */) {
+    /* eslint-disable no-unused-vars */ e /* eslint-disable no-unused-vars */) {
   // NOPE.
 };
 
@@ -662,7 +662,7 @@ Blockly.Toolbox.TreeNode.prototype.onMouseDown = function(
  * @private
  */
 Blockly.Toolbox.TreeNode.prototype.onDoubleClick_ = function(
-  /* eslint-disable no-unused-vars */ e /* eslint-disable no-unused-vars */) {
+    /* eslint-disable no-unused-vars */ e /* eslint-disable no-unused-vars */) {
   // NOP.
 };
 
diff --git a/core/tooltip.js b/core/tooltip.js
index f256c02cf..d210d009d 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -185,7 +185,7 @@ Blockly.Tooltip.onMouseOver_ = function(e) {
  * @private
  */
 Blockly.Tooltip.onMouseOut_ = function(/* eslint-disable no-unused-vars */e
-  /* eslint-enable no-unused-vars */) {
+    /* eslint-enable no-unused-vars */) {
   if (Blockly.Tooltip.blocked_) {
     // Someone doesn't want us to show tooltips.
     return;
diff --git a/core/workspace.js b/core/workspace.js
index fcbd1a0a6..f3c6ca4a4 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -412,7 +412,8 @@ Blockly.Workspace.prototype.deleteVariableInternal_ = function(variable) {
  */
 
 Blockly.Workspace.prototype.variableIndexOf = function(
-   /* eslint-disable no-unused-vars */name /* eslint-enable no-unused-vars */) {
+    /* eslint-disable no-unused-vars */ name
+    /* eslint-enable no-unused-vars */) {
   console.warn(
       'Deprecated call to Blockly.Workspace.prototype.variableIndexOf');
   return -1;