FavourBasicControlFlow: rename to RecommendIfElseConstructOverMatch

Author: webwarrior-ws

docs/content/how-tos/rule-configuration.md

@@ -134,4 +134,4 @@ The following rules can be specified for linting.
 - [FavourNestedFunctions (FL0091)](rules/FL0091.html)
 - [DisallowShadowing (FL0092)](rules/FL0092.html)
 - [DiscourageStringInterpolationWithStringFormat (FL0093)](rules/FL0093.html)
-- [FavourBasicControlFlow (FL0094)](rules/FL0094.html)
+- [RecommendIfElseConstructOverMatch (FL0094)](rules/FL0094.html)

docs/content/how-tos/rules/FL0094.md

@@ -4,7 +4,7 @@ category: how-to
 hide_menu: true
 ---
 
-# FavourBasicControlFlow (FL0094)
+# RecommendIfElseConstructOverMatch (FL0094)
 
 *Introduced in `0.26.12`*
 
@@ -24,7 +24,7 @@ Use if-else construct instead of match clause.
 ## Rule Settings
 
     {
-        "favourBasicControlFlow": {
+        "recommendIfElseConstructOverMatch": {
             "enabled": false
         }
     }

src/FSharpLint.Core/Application/Configuration.fs

@@ -388,7 +388,7 @@ type ConventionsConfig =
       favourNestedFunctions:EnabledConfig option
       disallowShadowing:EnabledConfig option
       discourageStringInterpolationWithStringFormat:EnabledConfig option
-      favourBasicControlFlow:EnabledConfig option }
+      recommendIfElseConstructOverMatch:EnabledConfig option }
 with
     member this.Flatten() =
         Array.concat
@@ -419,7 +419,7 @@ with
                 this.favourNestedFunctions |> Option.bind (constructRuleIfEnabled FavourNestedFunctions.rule) |> Option.toArray
                 this.disallowShadowing |> Option.bind (constructRuleIfEnabled DisallowShadowing.rule) |> Option.toArray
                 this.discourageStringInterpolationWithStringFormat |> Option.bind (constructRuleIfEnabled DiscourageStringInterpolationWithStringFormat.rule) |> Option.toArray
-                this.favourBasicControlFlow |> Option.bind (constructRuleIfEnabled FavourBasicControlFlow.rule) |> Option.toArray
+                this.recommendIfElseConstructOverMatch |> Option.bind (constructRuleIfEnabled RecommendIfElseConstructOverMatch.rule) |> Option.toArray
             |]
 
 [<Obsolete(ObsoleteMsg, ObsoleteWarnTreatAsError)>]
@@ -490,7 +490,7 @@ type Configuration =
       RedundantNewKeyword:EnabledConfig option
       FavourNonMutablePropertyInitialization:EnabledConfig option
       FavourReRaise:EnabledConfig option
-      FavourBasicControlFlow:EnabledConfig option
+      RecommendIfElseConstructOverMatch:EnabledConfig option
       FavourStaticEmptyFields:EnabledConfig option
       AsyncExceptionWithoutReturn:EnabledConfig option
       UnneededRecKeyword:EnabledConfig option
@@ -596,7 +596,7 @@ with
         RedundantNewKeyword = None
         FavourNonMutablePropertyInitialization = None
         FavourReRaise = None
-        FavourBasicControlFlow = None
+        RecommendIfElseConstructOverMatch = None
         FavourStaticEmptyFields = None
         AsyncExceptionWithoutReturn = None
         UnneededRecKeyword = None
@@ -880,7 +880,7 @@ let flattenConfig (config:Configuration) =
                 config.FavourNestedFunctions |> Option.bind (constructRuleIfEnabled FavourNestedFunctions.rule)
                 config.DisallowShadowing |> Option.bind (constructRuleIfEnabled DisallowShadowing.rule)
                 config.DiscourageStringInterpolationWithStringFormat |> Option.bind (constructRuleIfEnabled DiscourageStringInterpolationWithStringFormat.rule)
-                config.FavourBasicControlFlow |> Option.bind (constructRuleIfEnabled FavourBasicControlFlow.rule)
+                config.RecommendIfElseConstructOverMatch |> Option.bind (constructRuleIfEnabled RecommendIfElseConstructOverMatch.rule)
             |]
 
     findDeprecation config deprecatedAllRules allRules

src/FSharpLint.Core/FSharpLint.Core.fsproj

@@ -63,7 +63,7 @@
     <Compile Include="Rules\Conventions\FavourNestedFunctions.fs" />
     <Compile Include="Rules\Conventions\DisallowShadowing.fs" />
     <Compile Include="Rules\Conventions\DiscourageStringInterpolationWithStringFormat.fs" />
-    <Compile Include="Rules\Conventions\FavourBasicControlFlow.fs" />
+    <Compile Include="Rules\Conventions\RecommendIfElseConstructOverMatch.fs" />
     <Compile Include="Rules\Conventions\SourceLength\SourceLengthHelper.fs" />
     <Compile Include="Rules\Conventions\SourceLength\MaxLinesInLambdaFunction.fs" />
     <Compile Include="Rules\Conventions\SourceLength\MaxLinesInMatchLambdaFunction.fs" />

…es/Conventions/FavourBasicControlFlow.fs …ons/RecommendIfElseConstructOverMatch.fssrc/FSharpLint.Core/Rules/Conventions/FavourBasicControlFlow.fs renamed to src/FSharpLint.Core/Rules/Conventions/RecommendIfElseConstructOverMatch.fs src/FSharpLint.Core/Rules/Conventions/FavourBasicControlFlow.fs renamed to src/FSharpLint.Core/Rules/Conventions/RecommendIfElseConstructOverMatch.fs

@@ -1,4 +1,4 @@
-module FSharpLint.Rules.FavourBasicControlFlow
+module FSharpLint.Rules.RecommendIfElseConstructOverMatch
 
 open FSharpLint.Framework
 open FSharpLint.Framework.Suggestion
@@ -26,14 +26,14 @@ let runner args =
     match args.AstNode with
     | AstNode.Expression(SynExpr.Match (_, _, synMatchClauses, range, _)) when isBasicControlFlow synMatchClauses ->
         { Range = range
-          Message = Resources.GetString "FavourBasicControlFlow"
+          Message = Resources.GetString "RecommendIfElseConstructOverMatch"
           SuggestedFix = None
           TypeChecks = List.empty }
         |> Array.singleton
     | _ -> Array.empty
 
 let rule =
-    { Name = "FavourBasicControlFlow"
-      Identifier = Identifiers.FavourBasicControlFlow
+    { Name = "RecommendIfElseConstructOverMatch"
+      Identifier = Identifiers.RecommendIfElseConstructOverMatch
       RuleConfig = { AstNodeRuleConfig.Runner = runner; Cleanup = ignore } }
     |> AstNodeRule

src/FSharpLint.Core/Rules/Identifiers.fs

@@ -98,4 +98,4 @@ let NoAsyncRunSynchronouslyInLibrary = identifier 90
 let FavourNestedFunctions = identifier 91
 let DisallowShadowing = identifier 92
 let DiscourageStringInterpolationWithStringFormat = identifier 93
-let FavourBasicControlFlow = identifier 94
+let RecommendIfElseConstructOverMatch = identifier 94

src/FSharpLint.Core/Text.resx

@@ -405,7 +405,7 @@
   <data name="RulesDiscourageStringInterpolationWithStringFormat" xml:space="preserve">
     <value>Use sprintf instead of String.Format.</value>
   </data>
-  <data name="FavourBasicControlFlow" xml:space="preserve">
+  <data name="RecommendIfElseConstructOverMatch" xml:space="preserve">
     <value>Rather use simpler if-else construct instead of match clause.</value>
   </data>
 </root>

src/FSharpLint.Core/fsharplint.json

@@ -299,7 +299,7 @@
     "avoidTooShortNames": { "enabled": false },
     "asyncExceptionWithoutReturn": { "enabled": false },
     "unneededRecKeyword": { "enabled": true },
-    "favourBasicControlFlow": { "enabled": false },
+    "recommendIfElseConstructOverMatch": { "enabled": false },
     "indentation": {
         "enabled": false
     },

tests/FSharpLint.Core.Tests/FSharpLint.Core.Tests.fsproj

@@ -43,7 +43,7 @@
     <Compile Include="Rules\Conventions\FavourReRaise.fs" />
     <Compile Include="Rules\Conventions\DiscourageStringInterpolationWithStringFormat.fs" />
     <Compile Include="Rules\Conventions\FavourConsistentThis.fs" />
-    <Compile Include="Rules\Conventions\FavourBasicControlFlow.fs" />
+    <Compile Include="Rules\Conventions\RecommendIfElseConstructOverMatch.fs" />
     <Compile Include="Rules\Conventions\AvoidTooShortNames.fs" />
     <Compile Include="Rules\Conventions\AvoidSinglePipeOperator.fs" />
     <Compile Include="Rules\Conventions\SuggestUseAutoProperty.fs" />

…es/Conventions/FavourBasicControlFlow.fs …ons/RecommendIfElseConstructOverMatch.fstests/FSharpLint.Core.Tests/Rules/Conventions/FavourBasicControlFlow.fs renamed to tests/FSharpLint.Core.Tests/Rules/Conventions/RecommendIfElseConstructOverMatch.fs tests/FSharpLint.Core.Tests/Rules/Conventions/FavourBasicControlFlow.fs renamed to tests/FSharpLint.Core.Tests/Rules/Conventions/RecommendIfElseConstructOverMatch.fs

@@ -1,12 +1,12 @@
-module FSharpLint.Core.Tests.Rules.Conventions.FavourBasicControlFlow
+module FSharpLint.Core.Tests.Rules.Conventions.RecommendIfElseConstructOverMatch
 
 open NUnit.Framework
 open FSharpLint.Rules
 open FSharpLint.Core.Tests
 
 [<TestFixture>]
-type TestConventionsFavourFavourBasicControlFlow() =
-    inherit TestAstNodeRuleBase.TestAstNodeRuleBase(FavourBasicControlFlow.rule)
+type TestConventionsRecommendIfElseConstructOverMatch() =
+    inherit TestAstNodeRuleBase.TestAstNodeRuleBase(RecommendIfElseConstructOverMatch.rule)
 
 
     [<Test>]