Skip to content

Commit

Permalink
test(linter/no-unused-vars): enable now-passing tests (#6556)
Browse files Browse the repository at this point in the history 
Un-comment tests that are now passing. This PR does not change rule behavior; these have been passing for a while now, but were not getting run.
  • Loading branch information
@DonIsaac
DonIsaac committed Oct 14, 2024
1 parent badd11c commit 06b09b2
Show file tree
Hide file tree
Showing 3 changed files with 211 additions and 216 deletions.
197 changes: 89 additions & 108 deletions crates/oxc_linter/src/rules/eslint/no_unused_vars/tests/eslint.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ use crate::{tester::Tester, RuleMeta as _};
#[test]
fn fixme() {
let pass = vec![
// ESLint says this one should pass, but I disagree. foox could be
// safely removed here.
("function foo(cb) { cb = function(a) { return cb(1 + a); }(); } foo();", None),
("function foo(cb) { cb = (0, function(a) { cb(1 + a); }); } foo();", None),
(
Expand All @@ -34,30 +32,28 @@ fn test() {
"var foo = 5;
label: while (true) {
console.log(foo);
break label;
console.log(foo);
break label;
}",
None,
),
(
"var foo = 5;
while (true) {
console.log(foo);
break;
console.log(foo);
break;
}",
None,
),
(
"for (let prop in box) {
box[prop] = parseInt(box[prop]);
}",
"for (let prop in box) { box[prop] = parseInt(box[prop]); }",
None,
), // { "ecmaVersion": 6 },
(
"var box = {a: 2};
for (var prop in box) {
box[prop] = parseInt(box[prop]);
for (var prop in box) {
box[prop] = parseInt(box[prop]);
}",
None,
),
Expand Down Expand Up @@ -223,44 +219,44 @@ fn test() {
), // { "ecmaVersion": 6 },
(
"
let _a, b;
foo.forEach(item => {
[_a, b] = item;
doSomething(b);
});
",
let _a, b;
foo.forEach(item => {
[_a, b] = item;
doSomething(b);
});
",
Some(serde_json::json!([{ "destructuredArrayIgnorePattern": "^_" }])),
), // { "ecmaVersion": 6 },
(
"
// doesn't report _x
let _x, y;
_x = 1;
[_x, y] = foo;
y;
// doesn't report _x
let _x, y;
_x = 1;
[_x, y] = foo;
y;
// doesn't report _a
let _a, b;
[_a, b] = foo;
_a = 1;
b;
",
// doesn't report _a
let _a, b;
[_a, b] = foo;
_a = 1;
b;
",
Some(serde_json::json!([{ "destructuredArrayIgnorePattern": "^_" }])),
), // { "ecmaVersion": 2018 },
(
"
// doesn't report _x
let _x, y;
_x = 1;
[_x, y] = foo;
y;
// doesn't report _a
let _a, b;
_a = 1;
({_a, ...b } = foo);
b;
",
// doesn't report _x
let _x, y;
_x = 1;
[_x, y] = foo;
y;
// doesn't report _a
let _a, b;
_a = 1;
({_a, ...b } = foo);
b;
",
Some(
serde_json::json!([{ "destructuredArrayIgnorePattern": "^_", "ignoreRestSiblings": true }]),
),
Expand Down Expand Up @@ -508,18 +504,8 @@ fn test() {
Some(serde_json::json!([{}])),
),
(r#"import x from "y";"#, None), // { "ecmaVersion": 6, "sourceType": "module" },
(
"export function fn2({ x, y }) {
console.log(x);
};",
None,
), // { "ecmaVersion": 6, "sourceType": "module" },
(
"export function fn2( x, y ) {
console.log(x);
};",
None,
), // { "ecmaVersion": 6, "sourceType": "module" },
("export function fn2({ x, y }) { console.log(x); };", None), // { "ecmaVersion": 6, "sourceType": "module" },
("export function fn2( x, y ) { console.log(x); };", None), // { "ecmaVersion": 6, "sourceType": "module" },
("/*exported max*/ var max = 1, min = {min: 1}", None),
("/*exported x*/ var { x, y } = z", None), // { "ecmaVersion": 6 },
("var _a; var b;", Some(serde_json::json!([{ "vars": "all", "varsIgnorePattern": "^_" }]))),
Expand All @@ -545,56 +531,56 @@ fn test() {
), // { "ecmaVersion": 6 },
(
"
const array = ['a', 'b', 'c'];
const [a, _b, c] = array;
const newArray = [a, c];
",
const array = ['a', 'b', 'c'];
const [a, _b, c] = array;
const newArray = [a, c];
",
Some(serde_json::json!([{ "destructuredArrayIgnorePattern": "^_" }])),
), // { "ecmaVersion": 2020 },
(
"
const array = ['a', 'b', 'c', 'd', 'e'];
const [a, _b, c] = array;
",
const array = ['a', 'b', 'c', 'd', 'e'];
const [a, _b, c] = array;
",
Some(serde_json::json!([{ "destructuredArrayIgnorePattern": "^_" }])),
), // { "ecmaVersion": 2020 },
(
"
const array = ['a', 'b', 'c'];
const [a, _b, c] = array;
const fooArray = ['foo'];
const barArray = ['bar'];
const ignoreArray = ['ignore'];
",
const array = ['a', 'b', 'c'];
const [a, _b, c] = array;
const fooArray = ['foo'];
const barArray = ['bar'];
const ignoreArray = ['ignore'];
",
Some(
serde_json::json!([{ "destructuredArrayIgnorePattern": "^_", "varsIgnorePattern": "ignore" }]),
),
), // { "ecmaVersion": 2020 },
(
"
const array = [obj];
const [{_a, foo}] = array;
console.log(foo);
",
const array = [obj];
const [{_a, foo}] = array;
console.log(foo);
",
Some(serde_json::json!([{ "destructuredArrayIgnorePattern": "^_" }])),
), // { "ecmaVersion": 2020 },
(
"
function foo([{_a, bar}]) {
bar;
}
foo();
",
function foo([{_a, bar}]) {
bar;
}
foo();
",
Some(serde_json::json!([{ "destructuredArrayIgnorePattern": "^_" }])),
), // { "ecmaVersion": 2020 },
(
"
let _a, b;
foo.forEach(item => {
[a, b] = item;
});
",
let _a, b;
foo.forEach(item => {
[a, b] = item;
});
",
Some(serde_json::json!([{ "destructuredArrayIgnorePattern": "^_" }])),
), // { "ecmaVersion": 2020 },
("(function(obj) { var name; for ( name in obj ) { i(); return; } })({});", None),
Expand Down Expand Up @@ -722,7 +708,7 @@ fn test() {
(
"try{}catch(err){};",
Some(
serde_json::json!([ { "vars": "all", "args": "all", "caughtErrors": "all", "argsIgnorePattern": "^er" } ]),
serde_json::json!([{ "vars": "all", "args": "all", "caughtErrors": "all","argsIgnorePattern": "^er" }]),
),
),
("var a = 0; a = a + 1;", None),
Expand Down Expand Up @@ -801,9 +787,9 @@ fn test() {
("let x = 0; 0, x = x+1;", None), // { "ecmaVersion": 2020 },
("let x = 0; x = x+1, 0;", None), // { "ecmaVersion": 2020 },
// https://github.com/oxc-project/oxc/issues/4437
// ("let x = 0; foo = ((0, x = x + 1), 0);", None), // { "ecmaVersion": 2020 },
// ("let x = 0; foo = (x = x+1, 0);", None), // { "ecmaVersion": 2020 },
("let x = 0; 0, (1, x=x+1);", None), // { "ecmaVersion": 2020 },
("let x = 0; foo = ((0, x = x + 1), 0);", None), // { "ecmaVersion": 2020 },
("let x = 0; foo = (x = x+1, 0);", None), // { "ecmaVersion": 2020 },
("let x = 0; 0, (1, x=x+1);", None), // { "ecmaVersion": 2020 },
("(function ({ a, b }, { c } ) { return b; })();", None), // { "ecmaVersion": 2015 },
("(function ([ a ], b ) { return b; })();", None), // { "ecmaVersion": 2015 },
("(function ([ a ], [ b, c ] ) { return b; })();", None), // { "ecmaVersion": 2015 },
Expand Down Expand Up @@ -834,41 +820,38 @@ fn test() {
// ), // { "ecmaVersion": 2015 },
(
"let a = 'a';
a = 10;
function foo(){
a = 11;
a = () => {
a = 13
}
}",
a = 10;
function foo(){
a = 11;
a = () => {
a = 13
}
}",
None,
), // { "ecmaVersion": 2020 },
(
"let foo;
init();
foo = foo + 2;
function init() {
foo = 1;
}",
init();
foo = foo + 2;
function init() {
foo = 1;
}",
None,
), // { "ecmaVersion": 2020 },
(
"function foo(n) {
if (n < 2) return 1;
return n * foo(n - 1);
}",
if (n < 2) return 1;
return n * foo(n - 1);
}",
None,
), // { "ecmaVersion": 2020 },
(
"let c = 'c'
c = 10
function foo1() {
c = 11
c = () => {
c = 13
}
c = 11
c = () => { c = 13 }
}
c = foo1",
None,
), // { "ecmaVersion": 2020 },
Expand Down Expand Up @@ -972,7 +955,7 @@ fn test() {
}
",
Some(
serde_json::json!([{ "caughtErrorsIgnorePattern": "ignored", "varsIgnorePattern": "_" }]),
serde_json::json!([{ "caughtErrorsIgnorePattern": "ignored", "varsIgnorePattern": "_" }]),
),
),
(
Expand All @@ -987,9 +970,7 @@ fn test() {
"
_ => { _ = _ + 1 };
",
Some(
serde_json::json!([{ "argsIgnorePattern": "ignored", "varsIgnorePattern": "_" }]),
),
Some(serde_json::json!([{ "argsIgnorePattern": "ignored", "varsIgnorePattern": "_" }])),
), // { "ecmaVersion": 2015 }
];

Expand Down
16 changes: 7 additions & 9 deletions crates/oxc_linter/src/rules/eslint/no_unused_vars/tests/oxc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ fn test_vars_simple() {
),
// vars with references get renamed
("let x = 1; x = 2;", "let _x = 1; _x = 2;", None, FixKind::DangerousFix),
(
"let a = 1; a = 2; a = 3;",
"let _a = 1; _a = 2; _a = 3;",
Some(json!([{ "varsIgnorePattern": "^_" }])),
FixKind::DangerousFix,
),
(
"let x = 1; x = 2;",
"let x = 1; x = 2;",
Expand All @@ -126,8 +132,6 @@ fn test_vars_simple() {
),
// type annotations do not get clobbered
("let x: number = 1; x = 2;", "let _x: number = 1; _x = 2;", None, FixKind::DangerousFix),
("const { a } = obj;", "", None, FixKind::DangerousSuggestion),
("let [f,\u{a0}a]=p", "let [,a]=p", None, FixKind::DangerousSuggestion),
];

Tester::new(NoUnusedVars::NAME, pass, fail)
Expand Down Expand Up @@ -355,6 +359,7 @@ fn test_vars_destructure() {
None,
FixKind::DangerousSuggestion,
),
("let [f,\u{a0}a]=p", "let [,a]=p", None, FixKind::DangerousSuggestion),
(
"const [a, b, c, d, e] = arr; f(a, e)",
"const [a, ,,,e] = arr; f(a, e)",
Expand Down Expand Up @@ -382,13 +387,6 @@ fn test_vars_destructure() {
),
// TODO: destructures in VariableDeclarations with more than one declarator
(r#"const l="",{e}=r"#, r"const {e}=r", None, FixKind::All),
// renaming
// (
// "let a = 1; a = 2;",
// "let _a = 1; _a = 2;",
// Some(json!([{ "varsIgnorePattern": "^_" }])),
// FixKind::DangerousSuggestion,
// ),
];

Tester::new(NoUnusedVars::NAME, pass, fail)
Expand Down
Loading

0 comments on commit 06b09b2

Please sign in to comment.