Configuration,Tests.Console: re-enabled regression test

Re-enabled regression test for TypePrefixing rule with old config format and made it pass.
fsprojects · Jan 2, 2024 · e3ea85b · e3ea85b
1 parent 5e68892
commit e3ea85b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/FSharpLint.Core/Application/Configuration.fs b/src/FSharpLint.Core/Application/Configuration.fs
@@ -137,6 +137,13 @@ let constructRuleWithConfig rule ruleConfig =
     else
         None
 
+let constructTypePrefixingRuleWithConfig rule (ruleConfig: RuleConfig<TypePrefixing.Config>) =
+    if ruleConfig.Enabled then
+        let config = ruleConfig.Config |> Option.defaultValue { Mode = TypePrefixing.Mode.Hybrid }
+        Some(rule config)
+    else
+        None
+
 type TupleFormattingConfig =
     { tupleCommaSpacing:EnabledConfig option
       tupleIndentation:EnabledConfig option
@@ -175,7 +182,7 @@ with
     member this.Flatten() =
         [|
             this.typedItemSpacing |> Option.bind (constructRuleWithConfig TypedItemSpacing.rule) |> Option.toArray
-            this.typePrefixing |> Option.bind (constructRuleWithConfig TypePrefixing.rule) |> Option.toArray
+            this.typePrefixing |> Option.bind (constructTypePrefixingRuleWithConfig TypePrefixing.rule) |> Option.toArray
             this.unionDefinitionIndentation |> Option.bind (constructRuleIfEnabled UnionDefinitionIndentation.rule) |> Option.toArray
             this.moduleDeclSpacing |> Option.bind (constructRuleIfEnabled ModuleDeclSpacing.rule) |> Option.toArray
             this.classMemberSpacing |> Option.bind (constructRuleIfEnabled ClassMemberSpacing.rule) |> Option.toArray
@@ -628,7 +635,7 @@ let flattenConfig (config:Configuration) =
     let allRules =
         [|
             config.TypedItemSpacing |> Option.bind (constructRuleWithConfig TypedItemSpacing.rule)
-            config.TypePrefixing |> Option.bind (constructRuleWithConfig TypePrefixing.rule)
+            config.TypePrefixing |> Option.bind (constructTypePrefixingRuleWithConfig TypePrefixing.rule)
             config.UnionDefinitionIndentation |> Option.bind (constructRuleIfEnabled UnionDefinitionIndentation.rule)
             config.ModuleDeclSpacing |> Option.bind (constructRuleIfEnabled ModuleDeclSpacing.rule)
             config.ClassMemberSpacing |> Option.bind (constructRuleIfEnabled ClassMemberSpacing.rule)

diff --git a/tests/FSharpLint.Console.Tests/TestApp.fs b/tests/FSharpLint.Console.Tests/TestApp.fs
@@ -96,9 +96,7 @@ type TestConsoleApplication() =
         Assert.AreEqual(0, returnCode)
         Assert.AreEqual(Set.empty, errors)
 
-(* disabling regression test for now until I finish the development of new config
     [<Test>]
-*)
     member __.``Regression test: typePrefixing rule with old config format should still work``() =
         let fileContent = """
         {