Skip to content

Commit

Permalink
Update: Add quotes around the label in no-redeclare error messages (f…
Browse files Browse the repository at this point in the history 
…ixes #3583)
  • Loading branch information
Ian VanSchooten committed Aug 30, 2015
1 parent 9c49c93 commit 232e1dc
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion lib/rules/no-redeclare.js
View file
Expand Up @@ -51,7 +51,7 @@ module.exports = function(context) {
for (var i = (hasBuiltin ? 0 : 1), l = variable.identifiers.length; i < l; i++) {
context.report(
variable.identifiers[i],
"{{a}} is already defined",
"\"{{a}}\" is already defined",
{a: variable.name});
}
}
Expand Down
40 changes: 20 additions & 20 deletions tests/lib/rules/no-redeclare.js
View file
Expand Up @@ -33,53 +33,53 @@ ruleTester.run("no-redeclare", rule, {
{ code: "var top = 0;", options: [{builtinGlobals: true}] }
],
invalid: [
{ code: "var a = 3; var a = 10;", ecmaFeatures: { globalReturn: true }, errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "switch(foo) { case a: let b = 3;\ncase b: let b = 4}", ecmaFeatures: { blockBindings: true }, errors: [{ message: "b is already defined", type: "Identifier"}] },
{ code: "var a = 3; var a = 10;", errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "var a = {}; var a = [];", errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "var a; function a() {}", errors: [{ message: "a is already defined", type: "Identifier" }] },
{ code: "function a() {} function a() {}", errors: [{ message: "a is already defined", type: "Identifier" }] },
{ code: "var a = function() { }; var a = function() { }", errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "var a = function() { }; var a = new Date();", errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "var a = 3; var a = 10; var a = 15;", errors: [{ message: "a is already defined", type: "Identifier"}, { message: "a is already defined", type: "Identifier"}] },
{ code: "var a; var a;", ecmaFeatures: { modules: true }, errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "export var a; export var a;", ecmaFeatures: { modules: true }, errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "export class A {} export class A {}", ecmaFeatures: { classes: true, modules: true }, errors: [{ message: "A is already defined", type: "Identifier"}] },
{ code: "export var a; var a;", ecmaFeatures: { modules: true, globalReturn: true }, errors: [{ message: "a is already defined", type: "Identifier"}] },
{ code: "var a = 3; var a = 10;", ecmaFeatures: { globalReturn: true }, errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "switch(foo) { case a: let b = 3;\ncase b: let b = 4}", ecmaFeatures: { blockBindings: true }, errors: [{ message: "\"b\" is already defined", type: "Identifier"}] },
{ code: "var a = 3; var a = 10;", errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "var a = {}; var a = [];", errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "var a; function a() {}", errors: [{ message: "\"a\" is already defined", type: "Identifier" }] },
{ code: "function a() {} function a() {}", errors: [{ message: "\"a\" is already defined", type: "Identifier" }] },
{ code: "var a = function() { }; var a = function() { }", errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "var a = function() { }; var a = new Date();", errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "var a = 3; var a = 10; var a = 15;", errors: [{ message: "\"a\" is already defined", type: "Identifier"}, { message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "var a; var a;", ecmaFeatures: { modules: true }, errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "export var a; export var a;", ecmaFeatures: { modules: true }, errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{ code: "export class A {} export class A {}", ecmaFeatures: { classes: true, modules: true }, errors: [{ message: "\"A\" is already defined", type: "Identifier"}] },
{ code: "export var a; var a;", ecmaFeatures: { modules: true, globalReturn: true }, errors: [{ message: "\"a\" is already defined", type: "Identifier"}] },
{
code: "var Object = 0;",
options: [{builtinGlobals: true}],
errors: [{ message: "Object is already defined", type: "Identifier"}]
errors: [{ message: "\"Object\" is already defined", type: "Identifier"}]
},
{
code: "var top = 0;",
options: [{builtinGlobals: true}],
env: {browser: true},
errors: [{ message: "top is already defined", type: "Identifier"}]
errors: [{ message: "\"top\" is already defined", type: "Identifier"}]
},
{
code: "var a; var {a = 0, b: Object = 0} = {};",
options: [{builtinGlobals: true}],
ecmaFeatures: {destructuring: true},
errors: [
{ message: "a is already defined", type: "Identifier"},
{ message: "Object is already defined", type: "Identifier"}
{ message: "\"a\" is already defined", type: "Identifier"},
{ message: "\"Object\" is already defined", type: "Identifier"}
]
},
{
code: "var a; var {a = 0, b: Object = 0} = {};",
options: [{builtinGlobals: true}],
ecmaFeatures: {modules: true, destructuring: true},
errors: [
{ message: "a is already defined", type: "Identifier"},
{ message: "Object is already defined", type: "Identifier"}
{ message: "\"a\" is already defined", type: "Identifier"},
{ message: "\"Object\" is already defined", type: "Identifier"}
]
},
{
code: "var a; var {a = 0, b: Object = 0} = {};",
options: [{builtinGlobals: false}],
ecmaFeatures: {modules: true, destructuring: true},
errors: [{ message: "a is already defined", type: "Identifier"}]
errors: [{ message: "\"a\" is already defined", type: "Identifier"}]
}
]
});

0 comments on commit 232e1dc

Please sign in to comment.