Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5da0c85
chore(linter): no-unused-vars boilerplate
DonIsaac Jul 23, 2023
c7a1958
feat(linter): add no-unused-vars options parsing
DonIsaac Jul 23, 2023
bfa819a
refactor(linter): regex option parsing, clippy fixes
DonIsaac Jul 23, 2023
03d3358
feat: start reference resolution steps
DonIsaac Jul 23, 2023
fef74ce
fix(linter): start var impl
DonIsaac Jul 24, 2023
56b4c41
Merge branch 'main' of https://github.com/Boshen/oxc into don/feat/no…
DonIsaac Jul 25, 2023
3603c40
test(linter): more no-unused-vars test cases
DonIsaac Jul 25, 2023
a974932
test(linter): start enabling eslint test cases
DonIsaac Jul 26, 2023
d196582
feat(linter/no-unused-vars): support exports
DonIsaac Jul 27, 2023
f2b8019
test(linter/no-unused-vars): add more fail cases
DonIsaac Jul 27, 2023
6e413b5
feat(linter/no-unused-vars): support class decls
DonIsaac Jul 27, 2023
7a3d490
feat(linter/no-unused-vars): start supporting args
DonIsaac Jul 27, 2023
b3177d7
Merge branch 'main' of https://github.com/Boshen/oxc into don/feat/no…
DonIsaac Jul 27, 2023
23562d0
refactor(linter/no-unused-vars): remove reliance on experimental feat…
DonIsaac Jul 27, 2023
e6a6bf6
feat(linter/no-unused-args): support after-used
DonIsaac Jul 28, 2023
a473a28
refactor(linter/no-unused-vars): cleanup
DonIsaac Jul 28, 2023
5084705
feat(linter/no-unused-vars): support caught errors
DonIsaac Jul 28, 2023
477c61e
test(linter/no-unused-vars): enable more passing tests
DonIsaac Jul 28, 2023
36c9dd5
fix(linter/no-unused-vars): support var: local option
DonIsaac Jul 28, 2023
f34e746
fix(linter/no-unused-vars): support exported variables
DonIsaac Jul 28, 2023
ed59097
feat(linter/no-unused-vars): start recursive binding check
DonIsaac Jul 28, 2023
f284f56
Merge branch 'main' of https://github.com/Boshen/oxc into don/feat/no…
DonIsaac Jul 28, 2023
410d739
feat(linter/no-unused-vars): arr/obj unpacking
DonIsaac Jul 29, 2023
3730312
fix(linter/no-unused-vars): arr unpacking in function args
DonIsaac Jul 29, 2023
e5a9007
style(linter): fix clippy lints
DonIsaac Jul 29, 2023
8966874
style(linter/no-unused-vars): fix clippy lints
DonIsaac Jul 29, 2023
a886407
test(linter/no-unused-vars): report unused imports, add a lot of fail…
DonIsaac Jul 29, 2023
dcf2e40
test(linter/no-unused-vars): more testing
DonIsaac Jul 29, 2023
def7d6b
feat(linter/no-unused-vars): support ignore rest siblings
DonIsaac Jul 29, 2023
0267425
Merge branch 'main' of https://github.com/Boshen/oxc into don/feat/no…
DonIsaac Jul 29, 2023
8c6d70f
fix(linter/no-unused-vars): more progress
DonIsaac Jul 31, 2023
dd16c82
Merge branch 'main' of https://github.com/Boshen/oxc into don/feat/no…
DonIsaac Jul 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style(linter): fix clippy lints
  • Loading branch information
DonIsaac committed Jul 29, 2023
commit e5a9007756ae2bdd7bd573c700c06d1f5bf65be0
53 changes: 26 additions & 27 deletions crates/oxc_linter/src/rules/eslint/no_unused_vars.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::rc::Rc;

use bitflags::bitflags;
#[allow(clippy::wildcard_imports)]
use oxc_ast::{ast::*, AstKind};
use oxc_diagnostics::{
miette::{self, Diagnostic},
Expand All @@ -15,8 +14,8 @@ use serde_json::Value;
use crate::{context::LintContext, rule::Rule, AstNode};

// const ARGUMENTS_STR: Atom = Atom::from("arguments");
const DECLARED_STR: &'static Atom = &Atom::new_inline("declared");
const EMPTY_STR: &'static Atom = &Atom::new_inline("");
const DECLARED_STR: &Atom = &Atom::new_inline("declared");
const EMPTY_STR: &Atom = &Atom::new_inline("");

#[derive(Debug, Error, Diagnostic)]
#[error("eslint(no-unused-vars): Unused variables are not allowed")]
Expand All @@ -30,11 +29,11 @@ struct NoUnusedVarsDiagnostic(
impl NoUnusedVarsDiagnostic {
/// Diagnostic for unused declaration, with no additional message.
pub fn decl(var: Atom, span: Span) -> Self {
Self(var, &DECLARED_STR, EMPTY_STR.clone(), span)
Self(var, DECLARED_STR, EMPTY_STR.clone(), span)
}
}

#[derive(Debug, Default, Clone, PartialEq)]
#[derive(Debug, Default, Clone, PartialEq, Eq)]
pub enum VarsOption {
/// All variables are checked for usage, including those in the global scope.
#[default]
Expand Down Expand Up @@ -315,16 +314,16 @@ fn parse_unicode_rule(value: Option<&Value>, name: &str) -> Option<Regex> {
.and_then(Value::as_str)
.map(|pattern| regex::RegexBuilder::new(pattern).unicode(true).build())
.transpose()
.map_err(|err| panic!("Invalid '{}' option for no-unused-vars: {}", name, err))
.map_err(|err| panic!("Invalid '{name}' option for no-unused-vars: {err}"))
.unwrap()
}

impl NoUnusedVars {
fn check_unused_module_declaration<'a>(
&self,
symbol_id: SymbolId,
_symbol_id: SymbolId,
module: &'a ModuleDeclaration<'a>,
ctx: &LintContext<'a>,
_ctx: &LintContext<'a>,
) {
if module.is_export() {
// skip exported variables
Expand Down Expand Up @@ -497,7 +496,7 @@ impl NoUnusedVars {

fn check_unused_function<'a>(
&self,
symbol_id: SymbolId,
_symbol_id: SymbolId,
f: &'a Function,
ctx: &LintContext<'a>,
) {
Expand All @@ -518,7 +517,7 @@ impl NoUnusedVars {
ctx.diagnostic(NoUnusedVarsDiagnostic::decl(name.clone(), f.span))
}

fn check_unused_class<'a>(&self, symbol_id: SymbolId, class: &'a Class, ctx: &LintContext<'a>) {
fn check_unused_class<'a>(&self, _symbol_id: SymbolId, class: &'a Class, ctx: &LintContext<'a>) {
let Some(name) = class.id.as_ref().map(|binding| &binding.name) else { return };
if self.is_ignored_var(name.as_str()) {
return;
Expand Down Expand Up @@ -672,7 +671,7 @@ impl Rule for NoUnusedVars {
Value::String(vars) => {
let vars: VarsOption = vars
.try_into()
.map_err(|err| format!("Invalid 'vars' option for no-unused-vars: {:}", err))
.map_err(|err| format!("Invalid 'vars' option for no-unused-vars: {err:}"))
.unwrap();
Self { vars, ..Default::default() }
}
Expand All @@ -683,7 +682,7 @@ impl Rule for NoUnusedVars {
let vars: VarsOption = vars
.try_into()
.map_err(|err| {
format!("Invalid 'vars' option for no-unused-vars: {:}", err)
format!("Invalid 'vars' option for no-unused-vars: {err:}")
})
.unwrap();
vars
Expand All @@ -699,7 +698,7 @@ impl Rule for NoUnusedVars {
let args: ArgsOption = args
.try_into()
.map_err(|err| {
format!("Invalid 'args' option for no-unused-vars: {:}", err)
format!("Invalid 'args' option for no-unused-vars: {err:}")
})
.unwrap();
args
Expand All @@ -716,9 +715,9 @@ impl Rule for NoUnusedVars {
Value::String(s) => match s.as_str() {
"all" => true,
"none" => false,
_ => panic!("Invalid 'caughtErrors' option for no-unused-vars: Expected 'all' or 'none', got {}", s),
_ => panic!("Invalid 'caughtErrors' option for no-unused-vars: Expected 'all' or 'none', got {s}"),
},
_ => panic!("Invalid 'caughtErrors' option for no-unused-vars: Expected a string, got {}", caught_errors),
_ => panic!("Invalid 'caughtErrors' option for no-unused-vars: Expected a string, got {caught_errors}"),
}
}).unwrap_or_default();

Expand Down Expand Up @@ -766,7 +765,7 @@ impl Rule for NoUnusedVars {
.collect();

// Symbol is used, rule doesn't apply
if references.len() > 0 {
if !references.is_empty() {
return;
}

Expand All @@ -780,20 +779,20 @@ impl Rule for NoUnusedVars {

match declaration.kind() {
AstKind::ModuleDeclaration(decl) => {
self.check_unused_module_declaration(symbol_id, decl, ctx)
}
self.check_unused_module_declaration(symbol_id, decl, ctx);
},
AstKind::VariableDeclarator(decl) => {
self.check_unused_variable_declarator(symbol_id, decl, ctx)
}
self.check_unused_variable_declarator(symbol_id, decl, ctx);
},
AstKind::Function(f) => self.check_unused_function(symbol_id, f, ctx),
AstKind::Class(class) => self.check_unused_class(symbol_id, class, ctx),
AstKind::CatchClause(catch) => self.check_unused_catch_clause(symbol_id, catch, ctx),
AstKind::FormalParameters(params) => {
self.check_unused_arguments(symbol_id, declaration.scope_id(), params, ctx)
}
self.check_unused_arguments(symbol_id, declaration.scope_id(), params, ctx);
},
AstKind::FormalParameter(param) => self.check_unused_argument(symbol_id, param, ctx),
s => todo!("handle decl kind {:?}", s),
}
};
}
}

Expand Down Expand Up @@ -897,12 +896,12 @@ mod tests {
let ignore_underscore = Some(json!([{ "vars": "all", "varsIgnorePattern": "^_" }]));
let pass = vec![
// does const count?
("var a", local.clone()),
("var a", local),
("var _a", ignore_underscore.clone()),
("var a = 1; var _b = a", ignore_underscore.clone()),
];
let fail = vec![
("var a_", ignore_underscore.clone()),
("var a_", ignore_underscore),
// ("let a = 1;", None),
// ("let a = 1; a += 2;", None)
];
Expand Down Expand Up @@ -1009,7 +1008,7 @@ mod tests {
("function foo(a = 1) { return }; foo()", None),
("function foo() { return }", None),
("function foo(a, b) { return a }; foo()", None),
("function foo(a, b) { return b }; foo()", all.clone()),
("function foo(a, b) { return b }; foo()", all),
];
Tester::new(NoUnusedVars::NAME, pass, fail).test();
}
Expand Down