Skip to content

Commit a4bdfb0

Browse files
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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
},
Lines changed: 13 additions & 10 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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 }),

0 commit comments

Comments
 (0)