Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,23 @@ jobs:
🧪 Test (Node@${{ matrix.node }} - ESLint@${{ matrix.eslint }} - ${{
matrix.os }})
strategy:
fail-fast: false
matrix:
eslint: [7]
eslint: [8]
node: [12.22.0, 12, 14.17.0, 14, 16.0.0, 16, 18.0.0, 18, 20]
os: [ubuntu-latest]
include:
# On other platforms
- os: windows-latest
eslint: 7
eslint: 8
node: 18
- os: macos-latest
eslint: 7
eslint: 8
node: 18
# On old ESLint versions
- eslint: 7
node: 18
os: ubuntu-latest
- eslint: 6
node: 18
os: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ npm install --save-dev eslint @eslint-community/eslint-plugin-eslint-comments

::: tip Requirements
- Node.js `^12.22.0 || ^14.17.0 || >=16.0.0`
- ESLint `^6.0.0 || ^7.0.0`
- ESLint `^6.0.0 || ^7.0.0 || ^8.0.0`
:::

## 📖 Usage
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lib"
],
"peerDependencies": {
"eslint": "^6.0.0 || ^7.0.0"
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
},
"dependencies": {
"escape-string-regexp": "^4.0.0",
Expand All @@ -23,7 +23,7 @@
"@types/node": "^14.18.54",
"@vuepress/plugin-pwa": "^1.9.9",
"cross-spawn": "^7.0.3",
"eslint": "^7.32.0",
"eslint": "^8.46.0",
"eslint4b": "^7.32.0",
"fs-extra": "^10.1.0",
"mocha": "^9.2.2",
Expand Down
302 changes: 186 additions & 116 deletions tests/lib/rules/no-unused-disable.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,48 +257,71 @@ var a = b /*eslint-disable-line no-undef*/`,
{
code: `/*eslint no-undef:off, no-unused-vars:off*/
var a = b //eslint-disable-line no-undef,no-unused-vars`,
errors: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 33,
endLine: 2,
endColumn: 41,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 42,
endLine: 2,
endColumn: 56,
suggestions: [],
},
],
errors: semver.satisfies(Linter.version, ">=8.0.0")
? [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 33,
endLine: 2,
endColumn: 41,
suggestions: [],
},
]
: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 33,
endLine: 2,
endColumn: 41,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 42,
endLine: 2,
endColumn: 56,
suggestions: [],
},
],
},
{
code: `/*eslint no-undef:off, no-unused-vars:off*/
var a = b /*eslint-disable-line no-undef,no-unused-vars*/`,
errors: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 33,
endLine: 2,
endColumn: 41,
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 42,
endLine: 2,
endColumn: 56,
},
],
errors: semver.satisfies(Linter.version, ">=8.0.0")
? [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 33,
endLine: 2,
endColumn: 41,
},
]
: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 33,
endLine: 2,
endColumn: 41,
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 42,
endLine: 2,
endColumn: 56,
},
],
},
{
code: `/*eslint no-undef:off*/
Expand Down Expand Up @@ -382,49 +405,72 @@ var a = b`,
code: `/*eslint no-undef:off, no-unused-vars:off*/
//eslint-disable-next-line no-undef,no-unused-vars
var a = b`,
errors: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 28,
endLine: 2,
endColumn: 36,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 37,
endLine: 2,
endColumn: 51,
suggestions: [],
},
],
errors: semver.satisfies(Linter.version, ">=8.0.0")
? [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 28,
endLine: 2,
endColumn: 36,
suggestions: [],
},
]
: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 28,
endLine: 2,
endColumn: 36,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 37,
endLine: 2,
endColumn: 51,
suggestions: [],
},
],
},
{
code: `/*eslint no-undef:off, no-unused-vars:off*/
/*eslint-disable-next-line no-undef,no-unused-vars*/
var a = b`,
errors: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 28,
endLine: 2,
endColumn: 36,
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 37,
endLine: 2,
endColumn: 51,
},
],
errors: semver.satisfies(Linter.version, ">=8.0.0")
? [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 28,
endLine: 2,
endColumn: 36,
},
]
: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 28,
endLine: 2,
endColumn: 36,
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 37,
endLine: 2,
endColumn: 51,
},
],
},
{
code: `/*eslint no-undef:off*/
Expand Down Expand Up @@ -478,26 +524,38 @@ var a = b`,
code: `/*eslint no-undef:off, no-unused-vars:off*/
/*eslint-disable no-undef,no-unused-vars*/
var a = b`,
errors: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 18,
endLine: 2,
endColumn: 26,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 27,
endLine: 2,
endColumn: 41,
suggestions: [],
},
],
errors: semver.satisfies(Linter.version, ">=8.0.0")
? [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 18,
endLine: 2,
endColumn: 26,
suggestions: [],
},
]
: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 18,
endLine: 2,
endColumn: 26,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 27,
endLine: 2,
endColumn: 41,
suggestions: [],
},
],
},
{
code: `/*eslint no-undef:off*/
Expand Down Expand Up @@ -554,26 +612,38 @@ var a = b
/*eslint-disable no-undef,no-unused-vars*/
var a = b
/*eslint-enable*/`,
errors: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 18,
endLine: 2,
endColumn: 26,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 27,
endLine: 2,
endColumn: 41,
suggestions: [],
},
],
errors: semver.satisfies(Linter.version, ">=8.0.0")
? [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 18,
endLine: 2,
endColumn: 26,
suggestions: [],
},
]
: [
{
message:
"'no-undef' rule is disabled but never reported.",
line: 2,
column: 18,
endLine: 2,
endColumn: 26,
suggestions: [],
},
{
message:
"'no-unused-vars' rule is disabled but never reported.",
line: 2,
column: 27,
endLine: 2,
endColumn: 41,
suggestions: [],
},
],
},
{
code: `/*eslint no-undef:error*/
Expand Down