Skip to content

Commit

Permalink
Fix @typescript-eslint disable rules. (#1093)
Browse files Browse the repository at this point in the history 
* Fix @typescript-eslint disable rules.

* Refactor meta test.

* Add a missing rule to the typescript-eslint extension table.

* Delete unneccessary test.
  • Loading branch information
@Res42
Res42 committed May 27, 2021
1 parent 853fe51 commit a4bdfb0
Show file tree
Hide file tree
Showing 22 changed files with 209 additions and 10 deletions.
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/align.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ export const convertAlign: RuleConverter = (tslintRule) => {

return {
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
...{ ruleArguments },
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/indent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ export const convertIndent: RuleConverter = (tslintRule) => {

return {
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
...(indentSize !== 4 && { ruleArguments: [indentSize] }),
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/no-async-without-await.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
export const convertNoAsyncWithoutAwait: RuleConverter = () => {
return {
rules: [
{
ruleName: "require-await",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/require-await",
},
Expand Down
23 changes: 13 additions & 10 deletions src/converters/lintConfigs/rules/ruleConverters/no-empty.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { isDefined } from "../../../../utils";
import { RuleConverter, RuleConverterOptions } from "../ruleConverter";
import { ConvertedRuleChanges, RuleConverter, RuleConverterOptions } from "../ruleConverter";

export const convertNoEmpty: RuleConverter = (tslintRule) => {
return {
rules: [convertNoEmptyRule(tslintRule), convertNoEmptyFunctionRule(tslintRule)].filter(
isDefined,
),
rules: [convertNoEmptyRule(tslintRule), ...convertNoEmptyFunctionRule(tslintRule)],
};
};

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

const convertNoEmptyFunctionRule = (tslintRule: RuleConverterOptions) => {
const convertNoEmptyFunctionRule = (tslintRule: RuleConverterOptions): ConvertedRuleChanges[] => {
return tslintRule.ruleArguments.includes("allow-empty-functions")
? undefined
: {
ruleName: "@typescript-eslint/no-empty-function",
};
? []
: [
{
ruleName: "no-empty-function",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/no-empty-function",
},
];
};
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/no-shadowed-variable.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ export const convertNoShadowedVariable: RuleConverter = (tslintRule) => {

return {
rules: [
{
ruleName: "no-shadow",
ruleSeverity: "off",
},
{
...(notices.length !== 0 && { notices }),
...(ruleArguments.length !== 0 && { ruleArguments }),
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/no-string-literal.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
export const convertNoStringLiteral: RuleConverter = () => {
return {
rules: [
{
ruleName: "dot-notation",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/dot-notation",
},
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/no-unused-expression.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
export const convertNoUnusedExpression: RuleConverter = (tslintRule) => {
return {
rules: [
{
ruleName: "no-unused-expressions",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/no-unused-expressions",
...collectNoticesAndArguments(tslintRule.ruleArguments),
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/no-unused-variable.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ export const NO_UNUSED_VARIABLE_NOTICE =
export const convertNoUnusedVariable: RuleConverter = () => {
return {
rules: [
{
ruleName: "no-unused-vars",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/no-unused-vars",
notices: [NO_UNUSED_VARIABLE_NOTICE],
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/no-use-before-declare.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import { RuleConverter } from "../ruleConverter";
export const convertNoUseBeforeDeclare: RuleConverter = () => {
return {
rules: [
{
ruleName: "no-use-before-define",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/no-use-before-define",
},
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/quotemark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ export const convertQuotemark: RuleConverter = (tslintRule) => {

return {
rules: [
{
ruleName: "quotes",
ruleSeverity: "off",
},
{
...(notices.length !== 0 && { notices }),
...(ruleArguments.length !== 0 && { ruleArguments }),
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/semicolon.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ export const convertSemicolon: RuleConverter = (tslintRule) => {
],
}),
rules: [
{
ruleName: "semi",
ruleSeverity: "off",
},
{
ruleArguments: [tslintRule.ruleArguments[0]],
ruleName: "@typescript-eslint/semi",
Expand Down
24 changes: 24 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/tests/align.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ describe(convertAlign, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
},
Expand All @@ -22,6 +26,10 @@ describe(convertAlign, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
ruleArguments: [
Expand All @@ -42,6 +50,10 @@ describe(convertAlign, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
ruleArguments: [
Expand All @@ -62,6 +74,10 @@ describe(convertAlign, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
ruleArguments: [
Expand All @@ -82,6 +98,10 @@ describe(convertAlign, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
ruleArguments: [
Expand All @@ -103,6 +123,10 @@ describe(convertAlign, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
ruleArguments: [
Expand Down
16 changes: 16 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/tests/indent.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ describe(convertIndent, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
},
Expand All @@ -22,6 +26,10 @@ describe(convertIndent, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
ruleArguments: [2],
Expand All @@ -37,6 +45,10 @@ describe(convertIndent, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
},
Expand All @@ -51,6 +63,10 @@ describe(convertIndent, () => {

expect(result).toEqual({
rules: [
{
ruleName: "indent",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/indent",
ruleArguments: ["tab"],
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/tests/no-async-without-await.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ describe(convertNoAsyncWithoutAwait, () => {

expect(result).toEqual({
rules: [
{
ruleName: "require-await",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/require-await",
},
Expand Down
8 changes: 8 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/tests/no-empty.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ describe(convertNoEmpty, () => {
{
ruleName: "no-empty",
},
{
ruleName: "no-empty-function",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/no-empty-function",
},
Expand All @@ -29,6 +33,10 @@ describe(convertNoEmpty, () => {
ruleArguments: [{ allowEmptyCatch: true }],
ruleName: "no-empty",
},
{
ruleName: "no-empty-function",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/no-empty-function",
},
Expand Down
20 changes: 20 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/tests/no-shadowed-variable.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ describe(convertNoShadowedVariable, () => {

expect(result).toEqual({
rules: [
{
ruleName: "no-shadow",
ruleSeverity: "off",
},
{
ruleArguments: [{ hoist: "all" }],
ruleName: "@typescript-eslint/no-shadow",
Expand All @@ -23,6 +27,10 @@ describe(convertNoShadowedVariable, () => {

expect(result).toEqual({
rules: [
{
ruleName: "no-shadow",
ruleSeverity: "off",
},
{
ruleArguments: [{ hoist: "all" }],
ruleName: "@typescript-eslint/no-shadow",
Expand All @@ -38,6 +46,10 @@ describe(convertNoShadowedVariable, () => {

expect(result).toEqual({
rules: [
{
ruleName: "no-shadow",
ruleSeverity: "off",
},
{
ruleArguments: [{ hoist: "all" }],
ruleName: "@typescript-eslint/no-shadow",
Expand All @@ -53,6 +65,10 @@ describe(convertNoShadowedVariable, () => {

expect(result).toEqual({
rules: [
{
ruleName: "no-shadow",
ruleSeverity: "off",
},
{
ruleArguments: [{ hoist: "never" }],
ruleName: "@typescript-eslint/no-shadow",
Expand All @@ -68,6 +84,10 @@ describe(convertNoShadowedVariable, () => {

expect(result).toEqual({
rules: [
{
ruleName: "no-shadow",
ruleSeverity: "off",
},
{
notices: [
"ESLint does not support disabling shadowed variable checks based on " +
Expand Down
4 changes: 4 additions & 0 deletions src/converters/lintConfigs/rules/ruleConverters/tests/no-string-literal.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ describe(convertNoStringLiteral, () => {

expect(result).toEqual({
rules: [
{
ruleName: "dot-notation",
ruleSeverity: "off",
},
{
ruleName: "@typescript-eslint/dot-notation",
},
Expand Down
Loading

0 comments on commit a4bdfb0

Please sign in to comment.