Merge PR #759 from webwarrior-ws/fix-rule-80-and-81

NestedFunctionNames,UnnestedFunctionNames: fix rules' false positives
on non-functions (members with no params).

Author: knocte

src/FSharpLint.Core/Rules/Conventions/Naming/NestedFunctionNames.fs

@@ -8,10 +8,13 @@ open FSharpLint.Rules.Helper.Naming
 
 let private getIdentifiers (args: AstNodeRuleParams) =
     match args.AstNode with
-    | AstNode.Binding (SynBinding (_, _, _, _, _attributes, _, _, pattern, _, _, _, _, _)) ->
+    | AstNode.Binding (SynBinding (_, _, _, _, _attributes, _, valData, pattern, _, _, _, _, _)) ->
         if isNested args args.NodeIndex then
             let maxAccessibility = AccessControlLevel.Public
-            getPatternIdents maxAccessibility (fun _a11y innerPattern -> getFunctionIdents innerPattern) true pattern
+            match identifierTypeFromValData valData with
+            | Function | Member ->
+                getPatternIdents maxAccessibility (fun _a11y innerPattern -> getFunctionIdents innerPattern) true pattern
+            | _ -> Array.empty
         else
             Array.empty
     | _ -> Array.empty

src/FSharpLint.Core/Rules/Conventions/Naming/UnnestedFunctionNames.fs

@@ -8,12 +8,15 @@ open FSharpLint.Rules.Helper.Naming
 
 let private getIdentifiers (args: AstNodeRuleParams) =
     match args.AstNode with
-    | AstNode.Binding (SynBinding (_, _, _, _, _attributes, _, _, pattern, _, _, _, _,_)) ->
+    | AstNode.Binding (SynBinding (_, _, _, _, _attributes, _, valData, pattern, _, _, _, _,_)) ->
         if isNested args args.NodeIndex then
             Array.empty
         else
             let maxAccessibility = AccessControlLevel.Public
-            getPatternIdents maxAccessibility (fun _a11y innerPattern -> getFunctionIdents innerPattern) true pattern
+            match identifierTypeFromValData valData with
+            | Function | Member ->
+                getPatternIdents maxAccessibility (fun _a11y innerPattern -> getFunctionIdents innerPattern) true pattern
+            | _ -> Array.empty
     | _ -> Array.empty
 
 let rule config =

tests/FSharpLint.Core.Tests/Rules/Conventions/Naming/NestedFunctionNames.fs

@@ -54,6 +54,20 @@ module Program =
 
         Assert.IsTrue(this.ErrorExistsAt(4, 12))
 
+    [<Test>]
+    member this.NestedFunctionNameWithNoParametersIsPascalCase() =
+        this.Parse """
+module Program =
+    let CylinderVolume () =
+        let NestedFunction () =
+            1
+
+        let pi = 3.14159
+        pi * 2
+"""
+
+        Assert.IsTrue(this.ErrorExistsAt(4, 12))
+
     [<Test>]
     member this.NestedFunctionNameInTypeIsPascalCase() =
         this.Parse """
@@ -108,3 +122,14 @@ module Program =
 """
 
         this.AssertNoWarnings()
+
+    [<Test>]
+    member this.``Bindings that are not functions should not cause errors``() =
+        this.Parse """
+module Program =
+    let OuterFunction () =
+        let BLUE_STATE = "blue"
+        ()
+"""
+
+        this.AssertNoWarnings()

tests/FSharpLint.Core.Tests/Rules/Conventions/Naming/UnnestedFunctionNames.fs

@@ -199,3 +199,12 @@ module Program =
 """
 
         Assert.IsTrue(this.ErrorExistsAt(8, 8))
+
+    [<Test>]
+    member this.``Bindings that are not functions should not cause errors``() =
+        this.Parse """
+module Program =
+    let BLUE_STATE = "blue"
+"""
+
+        this.AssertNoWarnings()