fix no-underscore-dangle (#291)

typescript-eslint · Dec 21, 2019 · b7c0868 · b7c0868
1 parent 82646aa
commit b7c0868
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/rules/converters/tests/variable-name.test.ts b/src/rules/converters/tests/variable-name.test.ts
@@ -198,8 +198,8 @@ describe(convertVariableName, () => {
                 },
                 {
                     notices: [IgnoreLeadingTrailingIdentifierMsg],
-                    ruleArguments: ["off"],
                     ruleName: "no-underscore-dangle",
+                    ruleSeverity: "off",
                 },
                 {
                     ruleName: "id-blacklist",
@@ -224,8 +224,8 @@ describe(convertVariableName, () => {
                 },
                 {
                     notices: [IgnoreLeadingTrailingIdentifierMsg],
-                    ruleArguments: ["off"],
                     ruleName: "no-underscore-dangle",
+                    ruleSeverity: "off",
                 },
                 {
                     ruleName: "id-blacklist",
@@ -254,8 +254,8 @@ describe(convertVariableName, () => {
                 },
                 {
                     notices: [IgnoreLeadingTrailingIdentifierMsg],
-                    ruleArguments: ["off"],
                     ruleName: "no-underscore-dangle",
+                    ruleSeverity: "off",
                 },
                 {
                     ruleName: "id-blacklist",
@@ -288,8 +288,8 @@ describe(convertVariableName, () => {
                 },
                 {
                     ruleName: "no-underscore-dangle",
-                    ruleArguments: ["off"],
                     notices: [IgnoreLeadingTrailingIdentifierMsg],
+                    ruleSeverity: "off",
                 },
                 {
                     ruleName: "id-blacklist",

diff --git a/src/rules/converters/variable-name.ts b/src/rules/converters/variable-name.ts
@@ -56,20 +56,20 @@ export const convertVariableName: RuleConverter = tslintRule => {
     };
 
     const getUnderscoreDangleRuleOptions = () => {
-        const underscoreDangleOptionArguments: string[] = [];
+        let underscoreDangleOptionSeverity: string | null = null;
         const underscoreDangleOptionNotice: string[] = [];
 
         if (hasCheckFormat && (allowedLeadingUnderscore || allowedTrailingUnderscore)) {
-            underscoreDangleOptionArguments.push("off");
+            underscoreDangleOptionSeverity = "off";
             underscoreDangleOptionNotice.push(IgnoreLeadingTrailingIdentifierMsg);
         } else {
             underscoreDangleOptionNotice.push(ForbiddenLeadingTrailingIdentifierMsg);
         }
 
         return {
             notices: underscoreDangleOptionNotice,
-            ...(underscoreDangleOptionArguments.length !== 0 && {
-                ruleArguments: underscoreDangleOptionArguments,
+            ...(underscoreDangleOptionSeverity !== null && {
+                ruleSeverity: underscoreDangleOptionSeverity,
             }),
             ruleName: "no-underscore-dangle",
         };