Npgsql.FSharp.Analyzer v3.23.0 fixe parser issue that wasn't able to …

…pick up explicitly typed functions
Zaid-Ajaj · Mar 26, 2021 · 025b5de · 025b5de
1 parent bc8bff1
commit 025b5de
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 74 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 3.23.0 - 2021-03-26
+* Detect typed let bindings 
+
 ### 3.22.1 - 2021-02-09
 * Let the analyzer continue its work when it comes across enum types 
 

diff --git a/src/FParsec/AssemblyInfo.fs b/src/FParsec/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("FParsec")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.22.1")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-02-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.22.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.22.1")>]
+[<assembly: AssemblyVersionAttribute("3.23.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-03-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.23.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.23.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","959f00c74c33e6cb5064595bf6107bcb11b215b3")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","bc8bff18abbd6b4cfd14b67738c9ec22a5412c90")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FParsec"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.22.1"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-02-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.22.1"
-    let [<Literal>] AssemblyInformationalVersion = "3.22.1"
+    let [<Literal>] AssemblyVersion = "3.23.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-03-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.23.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.23.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "959f00c74c33e6cb5064595bf6107bcb11b215b3"
+    let [<Literal>] AssemblyMetadata_GitHash = "bc8bff18abbd6b4cfd14b67738c9ec22a5412c90"
diff --git a/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Core")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.22.1")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-02-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.22.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.22.1")>]
+[<assembly: AssemblyVersionAttribute("3.23.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-03-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.23.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.23.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","959f00c74c33e6cb5064595bf6107bcb11b215b3")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","bc8bff18abbd6b4cfd14b67738c9ec22a5412c90")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Core"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.22.1"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-02-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.22.1"
-    let [<Literal>] AssemblyInformationalVersion = "3.22.1"
+    let [<Literal>] AssemblyVersion = "3.23.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-03-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.23.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.23.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "959f00c74c33e6cb5064595bf6107bcb11b215b3"
+    let [<Literal>] AssemblyMetadata_GitHash = "bc8bff18abbd6b4cfd14b67738c9ec22a5412c90"
diff --git a/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs
@@ -513,6 +513,8 @@ module SyntacticAnalysis =
         match expr with
         | SynExpr.CompExpr(isArrayOrList, _, innerExpr, range) ->
             visitSyntacticExpression innerExpr range
+        | SynExpr.Typed(innerExpr, returnType, range) ->
+            visitSyntacticExpression innerExpr range
         | SynExpr.YieldOrReturn(_, innerExpr, innerRange) ->
             visitSyntacticExpression innerExpr innerRange
         | SynExpr.YieldOrReturnFrom(_, innerExpr, innerRange) ->

diff --git a/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.22.1")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-02-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.22.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.22.1")>]
+[<assembly: AssemblyVersionAttribute("3.23.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-03-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.23.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.23.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","959f00c74c33e6cb5064595bf6107bcb11b215b3")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","bc8bff18abbd6b4cfd14b67738c9ec22a5412c90")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.22.1"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-02-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.22.1"
-    let [<Literal>] AssemblyInformationalVersion = "3.22.1"
+    let [<Literal>] AssemblyVersion = "3.23.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-03-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.23.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.23.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "959f00c74c33e6cb5064595bf6107bcb11b215b3"
+    let [<Literal>] AssemblyMetadata_GitHash = "bc8bff18abbd6b4cfd14b67738c9ec22a5412c90"
diff --git a/src/NpgsqlFSharpParser/AssemblyInfo.fs b/src/NpgsqlFSharpParser/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpParser")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.22.1")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-02-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.22.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.22.1")>]
+[<assembly: AssemblyVersionAttribute("3.23.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-03-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.23.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.23.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","959f00c74c33e6cb5064595bf6107bcb11b215b3")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","bc8bff18abbd6b4cfd14b67738c9ec22a5412c90")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpParser"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.22.1"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-02-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.22.1"
-    let [<Literal>] AssemblyInformationalVersion = "3.22.1"
+    let [<Literal>] AssemblyVersion = "3.23.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-03-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.23.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.23.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "959f00c74c33e6cb5064595bf6107bcb11b215b3"
+    let [<Literal>] AssemblyMetadata_GitHash = "bc8bff18abbd6b4cfd14b67738c9ec22a5412c90"
diff --git a/src/NpgsqlFSharpVs/source.extension.vsixmanifest b/src/NpgsqlFSharpVs/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
     xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.22.1" Language="en-US" Publisher="Zaid Ajaj" />
+        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.23.0" Language="en-US" Publisher="Zaid Ajaj" />
         <DisplayName>NpgsqlFSharpVs</DisplayName>
         <Description xml:space="preserve">F# Analyzer for embedded SQL syntax analysis, type-checking for parameters and result sets and nullable column detection when writing queries using Npgsql.FSharp.</Description>
         <MoreInfo>https://github.com/Zaid-Ajaj/Npgsql.FSharp.Analyzer</MoreInfo>

diff --git a/src/Ubik/AssemblyInfo.fs b/src/Ubik/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("Ubik")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.22.1")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-02-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.22.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.22.1")>]
+[<assembly: AssemblyVersionAttribute("3.23.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-03-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.23.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.23.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","959f00c74c33e6cb5064595bf6107bcb11b215b3")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","bc8bff18abbd6b4cfd14b67738c9ec22a5412c90")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Ubik"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.22.1"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-02-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.22.1"
-    let [<Literal>] AssemblyInformationalVersion = "3.22.1"
+    let [<Literal>] AssemblyVersion = "3.23.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-03-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.23.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.23.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "959f00c74c33e6cb5064595bf6107bcb11b215b3"
+    let [<Literal>] AssemblyMetadata_GitHash = "bc8bff18abbd6b4cfd14b67738c9ec22a5412c90"
diff --git a/src/Ubik/Ubik.fsproj b/src/Ubik/Ubik.fsproj
@@ -7,8 +7,8 @@
     <PackAsTool>true</PackAsTool>
     <IsPackable>true</IsPackable>
     <RollForward>Major</RollForward>
-    <Version>3.22.1</Version>
-    <PackageReleaseNotes>Let the analyzer continue its work when it comes across enum types</PackageReleaseNotes>
+    <Version>3.23.0</Version>
+    <PackageReleaseNotes>Detect typed let bindings</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs b/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Tests")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.22.1")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-02-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.22.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.22.1")>]
+[<assembly: AssemblyVersionAttribute("3.23.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-03-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.23.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.23.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","959f00c74c33e6cb5064595bf6107bcb11b215b3")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","bc8bff18abbd6b4cfd14b67738c9ec22a5412c90")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Tests"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.22.1"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-02-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.22.1"
-    let [<Literal>] AssemblyInformationalVersion = "3.22.1"
+    let [<Literal>] AssemblyVersion = "3.23.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-03-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.23.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.23.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "959f00c74c33e6cb5064595bf6107bcb11b215b3"
+    let [<Literal>] AssemblyMetadata_GitHash = "bc8bff18abbd6b4cfd14b67738c9ec22a5412c90"
diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs
@@ -38,7 +38,7 @@ let tests =
             | None -> failwith "Could not crack project"
             | Some context ->
                 let operationBlocks = SyntacticAnalysis.findSqlOperations context
-                Expect.equal 11 (List.length operationBlocks) "Found 11 operation blocks"
+                Expect.equal (List.length operationBlocks) 12 "Found 12 operation blocks"
         }
 
         test "Syntactic analysis: no SQL blocks should be found using sprintf" {

diff --git a/tests/examples/hashing/AssemblyInfo.fs b/tests/examples/hashing/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("examples")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.22.1")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-02-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.22.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.22.1")>]
+[<assembly: AssemblyVersionAttribute("3.23.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-03-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.23.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.23.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","959f00c74c33e6cb5064595bf6107bcb11b215b3")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","bc8bff18abbd6b4cfd14b67738c9ec22a5412c90")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "examples"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.22.1"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-02-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.22.1"
-    let [<Literal>] AssemblyInformationalVersion = "3.22.1"
+    let [<Literal>] AssemblyVersion = "3.23.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-03-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.23.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.23.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "959f00c74c33e6cb5064595bf6107bcb11b215b3"
+    let [<Literal>] AssemblyMetadata_GitHash = "bc8bff18abbd6b4cfd14b67738c9ec22a5412c90"
diff --git a/tests/examples/hashing/syntacticAnalysis.fs b/tests/examples/hashing/syntacticAnalysis.fs
@@ -92,6 +92,12 @@ module InsidePostgres =
         |> Sql.query "SELECT COUNT(*) as count FROM users"
         |> Sql.execute (fun read -> read.int64 "count")
 
+    let nextedDeclaretionWithExplicitReturnType() : Result<int64 list, exn>= 
+        Sql.host "localhost"
+        |> Sql.connectFromConfig
+        |> Sql.query "SELECT COUNT(*) as count FROM users"
+        |> Sql.execute (fun read -> read.int64 "count")
+
     type NestedWhatever() =
         member this.Hello =
             let whateverSql() =