Skip to content

Commit a4bdfb0

Browse files
Res42Res42
authored
Fix @typescript-eslint disable rules. (#1093)
* Fix @typescript-eslint disable rules. * Refactor meta test. * Add a missing rule to the typescript-eslint extension table. * Delete unneccessary test.
1 parent 853fe51 commit a4bdfb0

22 files changed

+209
-10
lines changed

‎src/converters/lintConfigs/rules/ruleConverters/align.ts

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ export const convertAlign: RuleConverter = (tslintRule) => {
2929

3030
return {
3131
rules: [
32+
{
33+
ruleName: "indent",
34+
ruleSeverity: "off",
35+
},
3236
{
3337
ruleName: "@typescript-eslint/indent",
3438
...{ ruleArguments },

‎src/converters/lintConfigs/rules/ruleConverters/indent.ts

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ export const convertIndent: RuleConverter = (tslintRule) => {
1111

1212
return {
1313
rules: [
14+
{
15+
ruleName: "indent",
16+
ruleSeverity: "off",
17+
},
1418
{
1519
ruleName: "@typescript-eslint/indent",
1620
...(indentSize !== 4 && { ruleArguments: [indentSize] }),

‎src/converters/lintConfigs/rules/ruleConverters/no-async-without-await.ts

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
33
export const convertNoAsyncWithoutAwait: RuleConverter = () => {
44
return {
55
rules: [
6+
{
7+
ruleName: "require-await",
8+
ruleSeverity: "off",
9+
},
610
{
711
ruleName: "@typescript-eslint/require-await",
812
},

‎src/converters/lintConfigs/rules/ruleConverters/no-empty.ts

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import { isDefined } from "../../../../utils";
2-
import { RuleConverter, RuleConverterOptions } from "../ruleConverter";
1+
import { ConvertedRuleChanges, RuleConverter, RuleConverterOptions } from "../ruleConverter";
32

43
export const convertNoEmpty: RuleConverter = (tslintRule) => {
54
return {
6-
rules: [convertNoEmptyRule(tslintRule), convertNoEmptyFunctionRule(tslintRule)].filter(
7-
isDefined,
8-
),
5+
rules: [convertNoEmptyRule(tslintRule), ...convertNoEmptyFunctionRule(tslintRule)],
96
};
107
};
118

@@ -22,10 +19,16 @@ const convertNoEmptyRule = (tslintRule: RuleConverterOptions) => {
2219
};
2320
};
2421

25-
const convertNoEmptyFunctionRule = (tslintRule: RuleConverterOptions) => {
22+
const convertNoEmptyFunctionRule = (tslintRule: RuleConverterOptions): ConvertedRuleChanges[] => {
2623
return tslintRule.ruleArguments.includes("allow-empty-functions")
27-
? undefined
28-
: {
29-
ruleName: "@typescript-eslint/no-empty-function",
30-
};
24+
? []
25+
: [
26+
{
27+
ruleName: "no-empty-function",
28+
ruleSeverity: "off",
29+
},
30+
{
31+
ruleName: "@typescript-eslint/no-empty-function",
32+
},
33+
];
3134
};

‎src/converters/lintConfigs/rules/ruleConverters/no-shadowed-variable.ts

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ export const convertNoShadowedVariable: RuleConverter = (tslintRule) => {
3737

3838
return {
3939
rules: [
40+
{
41+
ruleName: "no-shadow",
42+
ruleSeverity: "off",
43+
},
4044
{
4145
...(notices.length !== 0 && { notices }),
4246
...(ruleArguments.length !== 0 && { ruleArguments }),

‎src/converters/lintConfigs/rules/ruleConverters/no-string-literal.ts

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
33
export const convertNoStringLiteral: RuleConverter = () => {
44
return {
55
rules: [
6+
{
7+
ruleName: "dot-notation",
8+
ruleSeverity: "off",
9+
},
610
{
711
ruleName: "@typescript-eslint/dot-notation",
812
},

‎src/converters/lintConfigs/rules/ruleConverters/no-unused-expression.ts

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
33
export const convertNoUnusedExpression: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
6+
{
7+
ruleName: "no-unused-expressions",
8+
ruleSeverity: "off",
9+
},
610
{
711
ruleName: "@typescript-eslint/no-unused-expressions",
812
...collectNoticesAndArguments(tslintRule.ruleArguments),

‎src/converters/lintConfigs/rules/ruleConverters/no-unused-variable.ts

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ export const NO_UNUSED_VARIABLE_NOTICE =
77
export const convertNoUnusedVariable: RuleConverter = () => {
88
return {
99
rules: [
10+
{
11+
ruleName: "no-unused-vars",
12+
ruleSeverity: "off",
13+
},
1014
{
1115
ruleName: "@typescript-eslint/no-unused-vars",
1216
notices: [NO_UNUSED_VARIABLE_NOTICE],

‎src/converters/lintConfigs/rules/ruleConverters/no-use-before-declare.ts

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
33
export const convertNoUseBeforeDeclare: RuleConverter = () => {
44
return {
55
rules: [
6+
{
7+
ruleName: "no-use-before-define",
8+
ruleSeverity: "off",
9+
},
610
{
711
ruleName: "@typescript-eslint/no-use-before-define",
812
},

‎src/converters/lintConfigs/rules/ruleConverters/quotemark.ts

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ export const convertQuotemark: RuleConverter = (tslintRule) => {
2424

2525
return {
2626
rules: [
27+
{
28+
ruleName: "quotes",
29+
ruleSeverity: "off",
30+
},
2731
{
2832
...(notices.length !== 0 && { notices }),
2933
...(ruleArguments.length !== 0 && { ruleArguments }),

‎src/converters/lintConfigs/rules/ruleConverters/semicolon.ts

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ export const convertSemicolon: RuleConverter = (tslintRule) => {
1515
],
1616
}),
1717
rules: [
18+
{
19+
ruleName: "semi",
20+
ruleSeverity: "off",
21+
},
1822
{
1923
ruleArguments: [tslintRule.ruleArguments[0]],
2024
ruleName: "@typescript-eslint/semi",

‎src/converters/lintConfigs/rules/ruleConverters/tests/align.test.ts

+24
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ describe(convertAlign, () => {
88

99
expect(result).toEqual({
1010
rules: [
11+
{
12+
ruleName: "indent",
13+
ruleSeverity: "off",
14+
},
1115
{
1216
ruleName: "@typescript-eslint/indent",
1317
},
@@ -22,6 +26,10 @@ describe(convertAlign, () => {
2226

2327
expect(result).toEqual({
2428
rules: [
29+
{
30+
ruleName: "indent",
31+
ruleSeverity: "off",
32+
},
2533
{
2634
ruleName: "@typescript-eslint/indent",
2735
ruleArguments: [
@@ -42,6 +50,10 @@ describe(convertAlign, () => {
4250

4351
expect(result).toEqual({
4452
rules: [
53+
{
54+
ruleName: "indent",
55+
ruleSeverity: "off",
56+
},
4557
{
4658
ruleName: "@typescript-eslint/indent",
4759
ruleArguments: [
@@ -62,6 +74,10 @@ describe(convertAlign, () => {
6274

6375
expect(result).toEqual({
6476
rules: [
77+
{
78+
ruleName: "indent",
79+
ruleSeverity: "off",
80+
},
6581
{
6682
ruleName: "@typescript-eslint/indent",
6783
ruleArguments: [
@@ -82,6 +98,10 @@ describe(convertAlign, () => {
8298

8399
expect(result).toEqual({
84100
rules: [
101+
{
102+
ruleName: "indent",
103+
ruleSeverity: "off",
104+
},
85105
{
86106
ruleName: "@typescript-eslint/indent",
87107
ruleArguments: [
@@ -103,6 +123,10 @@ describe(convertAlign, () => {
103123

104124
expect(result).toEqual({
105125
rules: [
126+
{
127+
ruleName: "indent",
128+
ruleSeverity: "off",
129+
},
106130
{
107131
ruleName: "@typescript-eslint/indent",
108132
ruleArguments: [

‎src/converters/lintConfigs/rules/ruleConverters/tests/indent.test.ts

+16
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ describe(convertIndent, () => {
88

99
expect(result).toEqual({
1010
rules: [
11+
{
12+
ruleName: "indent",
13+
ruleSeverity: "off",
14+
},
1115
{
1216
ruleName: "@typescript-eslint/indent",
1317
},
@@ -22,6 +26,10 @@ describe(convertIndent, () => {
2226

2327
expect(result).toEqual({
2428
rules: [
29+
{
30+
ruleName: "indent",
31+
ruleSeverity: "off",
32+
},
2533
{
2634
ruleName: "@typescript-eslint/indent",
2735
ruleArguments: [2],
@@ -37,6 +45,10 @@ describe(convertIndent, () => {
3745

3846
expect(result).toEqual({
3947
rules: [
48+
{
49+
ruleName: "indent",
50+
ruleSeverity: "off",
51+
},
4052
{
4153
ruleName: "@typescript-eslint/indent",
4254
},
@@ -51,6 +63,10 @@ describe(convertIndent, () => {
5163

5264
expect(result).toEqual({
5365
rules: [
66+
{
67+
ruleName: "indent",
68+
ruleSeverity: "off",
69+
},
5470
{
5571
ruleName: "@typescript-eslint/indent",
5672
ruleArguments: ["tab"],

‎src/converters/lintConfigs/rules/ruleConverters/tests/no-async-without-await.test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ describe(convertNoAsyncWithoutAwait, () => {
88

99
expect(result).toEqual({
1010
rules: [
11+
{
12+
ruleName: "require-await",
13+
ruleSeverity: "off",
14+
},
1115
{
1216
ruleName: "@typescript-eslint/require-await",
1317
},

‎src/converters/lintConfigs/rules/ruleConverters/tests/no-empty.test.ts

+8
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ describe(convertNoEmpty, () => {
1111
{
1212
ruleName: "no-empty",
1313
},
14+
{
15+
ruleName: "no-empty-function",
16+
ruleSeverity: "off",
17+
},
1418
{
1519
ruleName: "@typescript-eslint/no-empty-function",
1620
},
@@ -29,6 +33,10 @@ describe(convertNoEmpty, () => {
2933
ruleArguments: [{ allowEmptyCatch: true }],
3034
ruleName: "no-empty",
3135
},
36+
{
37+
ruleName: "no-empty-function",
38+
ruleSeverity: "off",
39+
},
3240
{
3341
ruleName: "@typescript-eslint/no-empty-function",
3442
},

‎src/converters/lintConfigs/rules/ruleConverters/tests/no-shadowed-variable.test.ts

+20
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ describe(convertNoShadowedVariable, () => {
88

99
expect(result).toEqual({
1010
rules: [
11+
{
12+
ruleName: "no-shadow",
13+
ruleSeverity: "off",
14+
},
1115
{
1216
ruleArguments: [{ hoist: "all" }],
1317
ruleName: "@typescript-eslint/no-shadow",
@@ -23,6 +27,10 @@ describe(convertNoShadowedVariable, () => {
2327

2428
expect(result).toEqual({
2529
rules: [
30+
{
31+
ruleName: "no-shadow",
32+
ruleSeverity: "off",
33+
},
2634
{
2735
ruleArguments: [{ hoist: "all" }],
2836
ruleName: "@typescript-eslint/no-shadow",
@@ -38,6 +46,10 @@ describe(convertNoShadowedVariable, () => {
3846

3947
expect(result).toEqual({
4048
rules: [
49+
{
50+
ruleName: "no-shadow",
51+
ruleSeverity: "off",
52+
},
4153
{
4254
ruleArguments: [{ hoist: "all" }],
4355
ruleName: "@typescript-eslint/no-shadow",
@@ -53,6 +65,10 @@ describe(convertNoShadowedVariable, () => {
5365

5466
expect(result).toEqual({
5567
rules: [
68+
{
69+
ruleName: "no-shadow",
70+
ruleSeverity: "off",
71+
},
5672
{
5773
ruleArguments: [{ hoist: "never" }],
5874
ruleName: "@typescript-eslint/no-shadow",
@@ -68,6 +84,10 @@ describe(convertNoShadowedVariable, () => {
6884

6985
expect(result).toEqual({
7086
rules: [
87+
{
88+
ruleName: "no-shadow",
89+
ruleSeverity: "off",
90+
},
7191
{
7292
notices: [
7393
"ESLint does not support disabling shadowed variable checks based on " +

‎src/converters/lintConfigs/rules/ruleConverters/tests/no-string-literal.test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ describe(convertNoStringLiteral, () => {
88

99
expect(result).toEqual({
1010
rules: [
11+
{
12+
ruleName: "dot-notation",
13+
ruleSeverity: "off",
14+
},
1115
{
1216
ruleName: "@typescript-eslint/dot-notation",
1317
},

0 commit comments

Comments
 (0)