ESLint: enable more rules (#129)

no-else-return
comma-spacing
comma-style
computed-property-spacing
func-call-spacing
semi-spacing

Author: ficristo

.eslintrc.js

@@ -33,11 +33,11 @@ module.exports = {
         "valid-typeof": "error",
         // http://eslint.org/docs/rules/#best-practices
         "curly": "error",
-        "eqeqeq": ["error", "always", {"null": "ignore"}],
+        "eqeqeq": ["error", "always", { "null": "ignore" }],
         "guard-for-in": "off",
         "no-caller": "error",
         "no-case-declarations": "error",
-        "no-else-return": "warn",
+        "no-else-return": ["error", { allowElseIf: false }],
         "no-empty-pattern": "error",
         "no-fallthrough": "error",
         "no-global-assign": "error",
@@ -63,7 +63,7 @@ module.exports = {
         "no-shadow-restricted-names": "error",
         "no-shadow": "warn",
         "no-undef": "error",
-        "no-unused-vars": ["error", {"vars": "all", "args": "none"}],
+        "no-unused-vars": ["error", { "vars": "all", "args": "none" }],
         "no-use-before-define": "off",
         // http://eslint.org/docs/rules/#nodejs-and-commonjs
         "no-new-require": "error",
@@ -72,11 +72,11 @@ module.exports = {
         "brace-style": ["error", "1tbs", { allowSingleLine: true }],
         "camelcase": "warn",
         "comma-dangle": "error",
-        "comma-spacing": "warn",
-        "comma-style": ["warn", "last"],
-        "computed-property-spacing": "warn",
+        "comma-spacing": "error",
+        "comma-style": ["error", "last"],
+        "computed-property-spacing": "error",
         "eol-last": "error",
-        "func-call-spacing": "warn",
+        "func-call-spacing": "error",
         "indent": ["warn", 4, { "SwitchCase": 1 }],
         "key-spacing": ["off", { beforeColon: false, afterColon: true }],
         "max-len": ["off", 120],
@@ -96,7 +96,7 @@ module.exports = {
         "no-new-object": "error",
         "no-trailing-spaces": "error",
         "quotes": ["error", "double", { "allowTemplateLiterals": true }],
-        "semi-spacing": "warn",
+        "semi-spacing": "error",
         "semi": "error",
         // https://eslint.org/docs/rules/#ecmascript-6
         "constructor-super": "error",

app/socket-server/BaseDomain.ts

@@ -41,9 +41,9 @@ function cmdLoadDomainModulesFromPaths(paths: string[]): boolean {
             _domainManager.emitEvent("base", "newDomains");
         }
         return success;
-    } else {
-        return false;
     }
+
+    return false;
 }
 
 /**

src/LiveDevelopment/Agents/RemoteFunctions.js

@@ -69,10 +69,10 @@ function RemoteFunctions(config, remoteWSPort) {
         if (window.navigator.platform.substr(0, 3) === "Mac") {
             // Mac
             return event.metaKey;
-        } else {
-            // Windows
-            return event.ctrlKey;
         }
+
+        // Windows
+        return event.ctrlKey;
     }
 
     // determine the color for a type

src/LiveDevelopment/LiveDevelopment.js

@@ -857,13 +857,13 @@ define(function LiveDevelopment(require, exports, module) {
         WebSocketTransport.closeWebSocketServer();
         if (_closeDeferred) {
             return _closeDeferred;
-        } else {
-            _closeDeferred = new $.Deferred();
-            _closeDeferred.always(function () {
-                _closeDeferred = null;
-            });
         }
 
+        _closeDeferred = new $.Deferred();
+        _closeDeferred.always(function () {
+            _closeDeferred = null;
+        });
+
         var promise = _closeDeferred.promise();
 
         /*
@@ -1338,12 +1338,12 @@ define(function LiveDevelopment(require, exports, module) {
             // Return existing promise if it is still pending
             if (_isPromisePending(_openDeferred)) {
                 return _openDeferred;
-            } else {
-                _openDeferred = new $.Deferred();
-                _openDeferred.always(function () {
-                    _openDeferred = null;
-                });
             }
+
+            _openDeferred = new $.Deferred();
+            _openDeferred.always(function () {
+                _openDeferred = null;
+            });
         }
 
         // Register user defined server provider and keep handlers for further clean-up

src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js

@@ -585,12 +585,12 @@ define(function (require, exports, module) {
             // TODO: should we consider ripping through the dom and fixing up other offsets?
             result.dom.fullBuild = false;
             return { edits: result.edits };
-        } else {
-            if (cachedValue) {
-                cachedValue.invalid = true;
-            }
-            return { errors: result.errors };
         }
+
+        if (cachedValue) {
+            cachedValue.invalid = true;
+        }
+        return { errors: result.errors };
     }
 
     /**
@@ -829,7 +829,9 @@ define(function (require, exports, module) {
         if (!dom) {
             console.error("Couldn't find the dom for " + editor.document.file.fullPath);
             return;
-        } else if (!dom.fullBuild) {
+        }
+
+        if (!dom.fullBuild) {
             console.error("Tried to mark text from a stale DOM for " + editor.document.file.fullPath);
             return;
         }

src/LiveDevelopment/MultiBrowserImpl/language/HTMLSimpleDOM.js

@@ -306,7 +306,9 @@ define(function (require, exports, module) {
                 PerfUtils.addMeasurement(timerBuildPart);       // use
                 this._logError(token);
                 return null;
-            } else if (token.type === "opentagname") {
+            }
+
+            if (token.type === "opentagname") {
                 var newTagName = token.contents.toLowerCase(),
                     newTag;
 
@@ -457,15 +459,15 @@ define(function (require, exports, module) {
                 PerfUtils.addMeasurement(timerBuildPart);
                 this._logError(token);
                 return null;
-            } else {
-                // Manually compute the position of the end of the text (we can't rely on the
-                // tokenizer for this since it may not get to the very end)
-                // TODO: should probably make the tokenizer get to the end...
-                var lines = this.text.split("\n"),
-                    lastPos = {line: lines.length - 1, ch: lines[lines.length - 1].length};
-                while (stack.length) {
-                    closeTag(this.text.length, lastPos);
-                }
+            }
+
+            // Manually compute the position of the end of the text (we can't rely on the
+            // tokenizer for this since it may not get to the very end)
+            // TODO: should probably make the tokenizer get to the end...
+            var lines = this.text.split("\n"),
+                lastPos = {line: lines.length - 1, ch: lines[lines.length - 1].length};
+            while (stack.length) {
+                closeTag(this.text.length, lastPos);
             }
         }
 

src/LiveDevelopment/main.js

@@ -386,7 +386,7 @@ define(function main(require, exports, module) {
                 config.remoteHighlight = prefs.get(PREF_REMOTEHIGHLIGHT);
 
                 if (LiveDevImpl && LiveDevImpl.status >= LiveDevImpl.STATUS_ACTIVE) {
-                    LiveDevImpl.agents.remote.call("updateConfig",JSON.stringify(config));
+                    LiveDevImpl.agents.remote.call("updateConfig", JSON.stringify(config));
                 }
             });
 

src/command/CommandManager.js

@@ -96,9 +96,9 @@ define(function (require, exports, module) {
             // If command does not return a promise, assume that it handled the
             // command and return a resolved promise
             return (new $.Deferred()).resolve().promise();
-        } else {
-            return result;
         }
+
+        return result;
     };
 
     /**
@@ -286,9 +286,9 @@ define(function (require, exports, module) {
             }
 
             return command.execute.apply(command, Array.prototype.slice.call(arguments, 1));
-        } else {
-            return (new $.Deferred()).reject().promise();
         }
+
+        return (new $.Deferred()).reject().promise();
     }
 
     EventDispatcher.makeEventDispatcher(exports);

src/command/KeyBindingManager.js

@@ -437,9 +437,11 @@ define(function (require, exports, module) {
         // by subtracting KeyEvent.DOM_VK_0 from keycode. ie. [48-57] --> [0-9]
         if (keycode >= KeyEvent.DOM_VK_0 && keycode <= KeyEvent.DOM_VK_9) {
             return String(keycode - KeyEvent.DOM_VK_0);
+        }
+
         // Do the same with the numpad numbers
         // by subtracting KeyEvent.DOM_VK_NUMPAD0 from keycode. ie. [96-105] --> [0-9]
-        } else if (keycode >= KeyEvent.DOM_VK_NUMPAD0 && keycode <= KeyEvent.DOM_VK_NUMPAD9) {
+        if (keycode >= KeyEvent.DOM_VK_NUMPAD0 && keycode <= KeyEvent.DOM_VK_NUMPAD9) {
             return String(keycode - KeyEvent.DOM_VK_NUMPAD0);
         }
 

src/command/Menus.js

@@ -430,7 +430,9 @@ define(function (require, exports, module) {
 
             return $relativeElement;
 
-        } else if (position && position !== FIRST && position !== LAST) {
+        }
+
+        if (position && position !== FIRST && position !== LAST) {
             console.error("Bad Parameter in _getRelativeMenuItem(): relative position specified with no relativeID");
             return null;
         }

src/document/Document.js

@@ -305,15 +305,14 @@ define(function (require, exports, module) {
                 }
             }
             return codeMirrorText;
+        }
 
-        } else {
-            // Optimized path that doesn't require creating master editor
-            if (useOriginalLineEndings) {
-                return this._text;
-            } else {
-                return Document.normalizeText(this._text);
-            }
+        // Optimized path that doesn't require creating master editor
+        if (useOriginalLineEndings) {
+            return this._text;
         }
+
+        return Document.normalizeText(this._text);
     };
 
     /** Normalizes line endings the same way CodeMirror would */
@@ -640,11 +639,13 @@ define(function (require, exports, module) {
             // doesn't really matter, as long as they sort out of the way of the real edits).
             if (!edit1) {
                 return -1;
-            } else if (!edit2) {
+            }
+
+            if (!edit2) {
                 return 1;
-            } else {
-                return CodeMirror.cmpPos(edit2.start, edit1.start);
             }
+
+            return CodeMirror.cmpPos(edit2.start, edit1.start);
         });
 
         // Pull out the selections, in the same order as the edits.

src/document/DocumentCommandHandlers.js

@@ -240,9 +240,9 @@ define(function (require, exports, module) {
         // current project or the full absolute path if it's not in the project.
         if (doc.isUntitled()) {
             return fullPath.substring(fullPath.lastIndexOf("/") + 1);
-        } else {
-            return ProjectManager.makeProjectRelativeIfPossible(fullPath);
         }
+
+        return ProjectManager.makeProjectRelativeIfPossible(fullPath);
     }
 
     /**
@@ -1028,9 +1028,9 @@ define(function (require, exports, module) {
                 }
 
                 return _doSaveAs(doc, settings);
-            } else {
-                return doSave(doc);
             }
+
+            return doSave(doc);
         }
 
         return $.Deferred().reject().promise();
@@ -1075,11 +1075,11 @@ define(function (require, exports, module) {
                             }
                         });
                     return savePromise;
-                } else {
-                    // workingset entry that was never actually opened - ignore
-                    filesAfterSave.push(file);
-                    return (new $.Deferred()).resolve().promise();
                 }
+
+                // workingset entry that was never actually opened - ignore
+                filesAfterSave.push(file);
+                return (new $.Deferred()).resolve().promise();
             },
             false  // if any save fails, continue trying to save other files anyway; then reject at end
         ).then(function () {