IndexerAccesorStyleConsistency: less "stringly" typing

Author: knocte

src/FSharpLint.Core/Rules/Conventions/IndexerAccessorStyleConsistency.fs

@@ -8,48 +8,50 @@ open FSharpLint.Framework.Suggestion
 open FSharpLint.Framework
 open System
 
+type IndexerAccessorStyle =
+    | OCaml
+    | CSharp
+
 [<RequireQualifiedAccess>]
 type Config = {
-    Style: string
+    Style: IndexerAccessorStyle
 }
 
-let generateOutput (range: FSharp.Compiler.Text.Range) msg =
+let generateOutput (range: FSharp.Compiler.Text.Range) (style: IndexerAccessorStyle) =
     Array.singleton
         {
             Range = range
-            Message = Resources.GetString msg
+            Message = String.Format(Resources.GetString "RulesIndexerAccessorStyleConsistency", style.ToString())
             SuggestedFix = None
             TypeChecks = List.Empty
         }
 
 let runner (config: Config) (args: AstNodeRuleParams) =
-    let styleType = config.Style
-    if String.Equals (styleType, "ocaml", StringComparison.InvariantCultureIgnoreCase) then
+    match config.Style with
+    | IndexerAccessorStyle.OCaml ->
         match args.AstNode with
         | AstNode.Binding binding ->
             match binding with
             | SynBinding (_, _, _, _, _, _, _, SynPat.Named _, _,
                  SynExpr.App (ExprAtomicFlag.Atomic, _, SynExpr.Ident _, SynExpr.ArrayOrListComputed (_, expr, range), _), 
                  _, _, _)
                 ->
-                generateOutput range "RulesIndexerAccessorStyleConsistencyToOCaml"
+                generateOutput range IndexerAccessorStyle.OCaml
             | _ ->
                 Array.empty
         | _ -> 
             Array.empty
-    elif String.Equals (styleType, "csharp", StringComparison.InvariantCultureIgnoreCase) then
+    | IndexerAccessorStyle.CSharp ->
         match args.AstNode with
         | AstNode.Binding binding ->
             match binding with
             | SynBinding (_, _, _, _, _, _, _, SynPat.Named _, _
                 , SynExpr.DotIndexedGet (_, _, _, range), _, _, _) ->
-                generateOutput range "RulesIndexerAccessorStyleConsistencyToCSharp"
+                generateOutput range IndexerAccessorStyle.CSharp
             | _ ->
                 Array.empty
         | _ -> 
             Array.empty
-    else
-        failwithf "Unknown style type %s" styleType
 
 let rule config =
     AstNodeRule

src/FSharpLint.Core/Text.resx

@@ -384,10 +384,7 @@
   <data name="InterpolatedStringWithNoSubstitution" xml:space="preserve">
     <value>Do not use interpolated string syntax (with $ prefix) or formatting functions (sprintf, failwithf) when not really performing any interpolation.</value>
   </data>
-  <data name="RulesIndexerAccessorStyleConsistencyToCSharp" xml:space="preserve">
-    <value>Consider switching the indexer accessor to CSharp style.</value>
-  </data>
-  <data name="RulesIndexerAccessorStyleConsistencyToOCaml" xml:space="preserve">
-    <value>Consider switching the indexer accessor to OCaml style.</value>
+  <data name="RulesIndexerAccessorStyleConsistency" xml:space="preserve">
+    <value>Consider switching the indexer accessor to {0} style.</value>
   </data>
 </root>

tests/FSharpLint.Core.Tests/Rules/Conventions/IndexerAccessorStyleConsistency.fs

@@ -3,10 +3,11 @@ module FSharpLint.Core.Tests.Rules.Conventions.IndexerAccessorStyleConsistency
 open NUnit.Framework
 open FSharpLint.Rules
 open FSharpLint.Core.Tests
+open FSharpLint.Rules.IndexerAccessorStyleConsistency
 
 [<TestFixture>]
 type TestConventionsIndexerAccessorStyleConsistencyCSharp() =
-    inherit TestAstNodeRuleBase.TestAstNodeRuleBase(IndexerAccessorStyleConsistency.rule { Style = "CSharp" })
+    inherit TestAstNodeRuleBase.TestAstNodeRuleBase(IndexerAccessorStyleConsistency.rule { Style = IndexerAccessorStyle.CSharp })
 
     [<Test>]
     member this.IndexerAccessorStyleConsistencyOCamlStyleWhenUsingCSharp() =
@@ -32,7 +33,7 @@ System.Console.WriteLine bar"""
 
 [<TestFixture>]
 type TestConventionsIndexerAccessorStyleConsistencyOCaml() =
-    inherit TestAstNodeRuleBase.TestAstNodeRuleBase(IndexerAccessorStyleConsistency.rule { Style = "OCaml" })
+    inherit TestAstNodeRuleBase.TestAstNodeRuleBase(IndexerAccessorStyleConsistency.rule { Style = IndexerAccessorStyle.OCaml })
 
     [<Test>]
     member this.IndexerAccessorStyleConsistencyCSharpStyleWhenUsingOCaml() =