Merge pull request eslint#3669 from eslint/issue-3654

Fix: `space-after-keywords` not working for `catch`
EnableSoftware · Sep 5, 2015 · 7877229 · 7877229
2 parents b72dde4 + 6589658
commit 7877229
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -201,7 +201,7 @@ function getPluginsConfig(pluginNames) {
             try {
                 plugin = require(pluginNamespace + util.PLUGIN_NAME_PREFIX + pluginNameWithoutPrefix);
                 loadedPlugins[pluginNameWithoutPrefix] = plugin;
-            } catch(err) {
+            } catch (err) {
                 debug("Failed to load plugin configuration for " + pluginNameWithoutPrefix + ". Proceeding without it.");
                 plugin = { rulesConfig: {}};
             }

diff --git a/lib/eslint.js b/lib/eslint.js
@@ -83,7 +83,7 @@ function parseJsonConfig(string, location, messages) {
     string = string.replace(/([a-zA-Z0-9\-\/]+):/g, "\"$1\":").replace(/(\]|[0-9])\s+(?=")/, "$1,");
     try {
         items = JSON.parse("{" + string + "}");
-    } catch(ex) {
+    } catch (ex) {
 
         messages.push({
             fatal: true,
@@ -755,7 +755,7 @@ module.exports = (function() {
                             : rule[nodeType]
                         );
                     });
-                } catch(ex) {
+                } catch (ex) {
                     ex.message = "Error while loading rule '" + key + "': " + ex.message;
                     throw ex;
                 }

diff --git a/lib/rules/no-invalid-regexp.js b/lib/rules/no-invalid-regexp.js
@@ -39,7 +39,7 @@ module.exports = function(context) {
 
             try {
                 void new RegExp(node.arguments[0].value);
-            } catch(e) {
+            } catch (e) {
                 context.report(node, e.message);
             }
 

diff --git a/lib/rules/space-after-keywords.js b/lib/rules/space-after-keywords.js
@@ -78,7 +78,7 @@ module.exports = function(context) {
                 checkTokens(node.finalizer, context.getTokenBefore(node.finalizer), context.getFirstToken(node.finalizer));
             }
         },
-        "CatchStatement": check,
+        "CatchClause": check,
         "WithStatement": check
     };
 };

diff --git a/tests/lib/cli-engine.js b/tests/lib/cli-engine.js
@@ -937,7 +937,7 @@ describe("CLIEngine", function() {
                 try {
                     fs.unlinkSync(path.resolve(".eslintcache"));
                     fs.unlinkSync(path.resolve(".cache/custom-cache"));
-                } catch(ex) {
+                } catch (ex) {
                     // we don't care if the file didn't exist
                     // since our intention was to remove the file
                 }

diff --git a/tests/lib/rules/space-after-keywords.js b/tests/lib/rules/space-after-keywords.js
@@ -38,7 +38,9 @@ ruleTester.run("space-after-keywords", rule, {
         { code: "if (a) {} else foo();", options: ["always"]},
         { code: "if(a) {} else foo();", options: ["never"]},
         { code: "try {}finally {}", args: [1]},
+        { code: "try {}catch (e) {}", args: [1]},
         { code: "try{} finally{}", options: ["never"]},
+        { code: "try{} catch(e) {}", options: ["never"]},
         { code: "(function(){})", args: [1] },
         { code: "(function(){})", args: [1] }
     ],
@@ -59,8 +61,11 @@ ruleTester.run("space-after-keywords", rule, {
         { code: "if(a){}else if(b){}else {}", options: ["never"], errors: [{ message: "Keyword \"else\" must not be followed by whitespace." }]},
         { code: "try{}finally {}", args: [1], errors: [{ message: "Keyword \"try\" must be followed by whitespace." }]},
         { code: "try {}finally{}", args: [1], errors: [{ message: "Keyword \"finally\" must be followed by whitespace." }]},
+        { code: "try {}catch(e) {}", args: [1], errors: [{ message: "Keyword \"catch\" must be followed by whitespace." }]},
         { code: "try{}finally {}", options: ["never"], errors: [{ message: "Keyword \"finally\" must not be followed by whitespace." }]},
+        { code: "try{}catch (e) {}", options: ["never"], errors: [{ message: "Keyword \"catch\" must not be followed by whitespace." }]},
         { code: "try {}finally{}", options: ["never"], errors: [{ message: "Keyword \"try\" must not be followed by whitespace." }]},
+        { code: "try {}catch(e) {}", options: ["never"], errors: [{ message: "Keyword \"try\" must not be followed by whitespace." }]},
         { code: "if\n(a) {} else\n{}", options: ["never"], errors: [{ message: "Keyword \"if\" must not be followed by whitespace." }, { message: "Keyword \"else\" must not be followed by whitespace." }]},
         { code: "if\n(a) {} else\n{}", options: ["always"], errors: [{ message: "Keyword \"if\" must not be followed by a newline." }, { message: "Keyword \"else\" must not be followed by a newline." }]},
         { code: "do\n{} while\n(0)", options: ["always"], errors: [{ message: "Keyword \"do\" must not be followed by a newline." }, { message: "Keyword \"while\" must not be followed by a newline." }]}