diff --git a/src/rules/converters/comment-format.ts b/src/rules/converters/comment-format.ts index 265a5fbb0..d5d24f62f 100644 --- a/src/rules/converters/comment-format.ts +++ b/src/rules/converters/comment-format.ts @@ -9,12 +9,8 @@ export const CapitalizedIgnoreMessage = "Only accepts a single string pattern to export const convertCommentFormat: RuleConverter = tslintRule => { const capitalizedRuleArguments: string[] = []; - const spaceCommentRuleArguments: string[] = []; const capitalizedNotices: string[] = []; - - if (!tslintRule.ruleArguments.includes("check-space")) { - spaceCommentRuleArguments.push("never"); - } + const checkSpace = tslintRule.ruleArguments.includes("check-space"); if (tslintRule.ruleArguments.includes("check-uppercase")) { capitalizedRuleArguments.push("always"); @@ -44,12 +40,19 @@ export const convertCommentFormat: RuleConverter = tslintRule => { ...(capitalizedNotices.length !== 0 && { notices: capitalizedNotices }), }, ]), - { - ruleName: "spaced-comment", - ...(spaceCommentRuleArguments.length !== 0 && { - ruleArguments: spaceCommentRuleArguments, - }), - }, + ...(checkSpace + ? [ + { + ruleName: "spaced-comment", + ruleArguments: [ + "always", + { + markers: ["/"], + }, + ], + }, + ] + : []), ], }; }; diff --git a/src/rules/converters/tests/comment-format.test.ts b/src/rules/converters/tests/comment-format.test.ts index 45c4cb040..8db2a15c8 100644 --- a/src/rules/converters/tests/comment-format.test.ts +++ b/src/rules/converters/tests/comment-format.test.ts @@ -7,12 +7,7 @@ describe(convertCommentFormat, () => { }); expect(result).toEqual({ - rules: [ - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, - ], + rules: [], }); }); @@ -24,6 +19,12 @@ describe(convertCommentFormat, () => { expect(result).toEqual({ rules: [ { + ruleArguments: [ + "always", + { + markers: ["/"], + }, + ], ruleName: "spaced-comment", }, ], @@ -41,10 +42,6 @@ describe(convertCommentFormat, () => { ruleArguments: ["never"], ruleName: "capitalized-comments", }, - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, ], }); }); @@ -61,10 +58,6 @@ describe(convertCommentFormat, () => { ruleArguments: ["always"], ruleName: "capitalized-comments", }, - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, ], }); }); @@ -75,12 +68,7 @@ describe(convertCommentFormat, () => { }); expect(result).toEqual({ - rules: [ - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, - ], + rules: [], }); }); @@ -95,10 +83,6 @@ describe(convertCommentFormat, () => { ruleArguments: ["always"], ruleName: "capitalized-comments", }, - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, ], }); }); @@ -109,12 +93,7 @@ describe(convertCommentFormat, () => { }); expect(result).toEqual({ - rules: [ - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, - ], + rules: [], }); }); @@ -130,10 +109,6 @@ describe(convertCommentFormat, () => { ruleArguments: ["always"], ruleName: "capitalized-comments", }, - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, ], }); }); @@ -144,12 +119,7 @@ describe(convertCommentFormat, () => { }); expect(result).toEqual({ - rules: [ - { - ruleArguments: ["never"], - ruleName: "spaced-comment", - }, - ], + rules: [], }); }); @@ -172,6 +142,12 @@ describe(convertCommentFormat, () => { ruleName: "capitalized-comments", }, { + ruleArguments: [ + "always", + { + markers: ["/"], + }, + ], ruleName: "spaced-comment", }, ],