Merge pull request #134 from nojaf/fix-128

Exclude type with generic arguments for StructDiscriminatedUnionAnalyzer allTypesArePrimitive check
ionide · Jan 8, 2025 · 250cea2 · 250cea2
2 parents a67edf1 + 6c818e6
commit 250cea2
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.13.1 - 2024-01-08
+
+### Fixed
+
+* InvalidOperationException on some DUs. [#128](https://github.com/ionide/ionide-analyzers/issues/128)
+
 ## 0.13.0 - 2024-11-19
 
 ### Added

diff --git a/src/Ionide.Analyzers/Suggestion/StructDiscriminatedUnionAnalyzer.fs b/src/Ionide.Analyzers/Suggestion/StructDiscriminatedUnionAnalyzer.fs
@@ -110,6 +110,8 @@ let private analyze
 
                     if ff.FieldType.IsFunctionType || ff.FieldType.IsAnonRecordType then
                         false
+                    elif not (Seq.isEmpty ff.FieldType.GenericArguments) then
+                        false
                     else
 
                     primitives.Contains ff.FieldType.BasicQualifiedName

diff --git a/tests/Ionide.Analyzers.Tests/Performance/CombinePipedModuleFunctionsAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Performance/CombinePipedModuleFunctionsAnalyzerTests.fs
@@ -10,7 +10,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
         projectOptions <- opts
     }
 

diff --git a/tests/Ionide.Analyzers.Tests/Performance/EqualsNullAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Performance/EqualsNullAnalyzerTests.fs
@@ -12,7 +12,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
         projectOptions <- opts
     }
 

diff --git a/tests/Ionide.Analyzers.Tests/Performance/ListEqualsEmptyListAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Performance/ListEqualsEmptyListAnalyzerTests.fs
@@ -10,7 +10,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
         projectOptions <- opts
     }
 

diff --git a/tests/Ionide.Analyzers.Tests/Performance/ReturnStructPartialActivePatternAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Performance/ReturnStructPartialActivePatternAnalyzerTests.fs
@@ -13,7 +13,7 @@ let Setup () =
     task {
         let! opts =
             mkOptionsFromProject
-                "net7.0"
+                "net8.0"
                 [
                     {
                         Name = "FSharp.Compiler.Service"

diff --git a/tests/Ionide.Analyzers.Tests/Style/PostfixGenericsAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Style/PostfixGenericsAnalyzerTests.fs
@@ -10,7 +10,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
 
         projectOptions <- opts
     }

diff --git a/tests/Ionide.Analyzers.Tests/Suggestion/CopyAndUpdateRecordChangesAllFieldsAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Suggestion/CopyAndUpdateRecordChangesAllFieldsAnalyzerTests.fs
@@ -12,7 +12,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
 
         projectOptions <- opts
     }

diff --git a/tests/Ionide.Analyzers.Tests/Suggestion/EmptyStringAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Suggestion/EmptyStringAnalyzerTests.fs
@@ -10,7 +10,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
 
         projectOptions <- opts
     }

diff --git a/tests/Ionide.Analyzers.Tests/Suggestion/HandleOptionGracefullyAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Suggestion/HandleOptionGracefullyAnalyzerTests.fs
@@ -13,7 +13,7 @@ let messageString =
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
         projectOptions <- opts
     }
 

diff --git a/tests/Ionide.Analyzers.Tests/Suggestion/HeadConsEmptyListPatternAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Suggestion/HeadConsEmptyListPatternAnalyzerTests.fs
@@ -10,7 +10,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
         projectOptions <- opts
     }
 

diff --git a/tests/Ionide.Analyzers.Tests/Suggestion/IgnoreFunctionAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Suggestion/IgnoreFunctionAnalyzerTests.fs
@@ -10,7 +10,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
 
         projectOptions <- opts
     }

diff --git a/tests/Ionide.Analyzers.Tests/Suggestion/StructDiscriminatedUnionAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Suggestion/StructDiscriminatedUnionAnalyzerTests.fs
@@ -12,7 +12,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
         projectOptions <- opts
     }
 
@@ -235,3 +235,18 @@ type Foo =
         let! msgs = structDiscriminatedUnionCliAnalyzer ctx
         Assert.That(msgs, Is.Empty)
     }
+
+[<Test>]
+let ``negative: int array`` () =
+    async {
+        let source =
+            """module Foo
+
+type SingleCaseDU = | One of int[]
+type TwoCaseDU = | Empty | Full of int[]
+    """
+
+        let ctx = getContext projectOptions source
+        let! msgs = structDiscriminatedUnionCliAnalyzer ctx
+        Assert.That(msgs, Is.Empty)
+    }
diff --git a/tests/Ionide.Analyzers.Tests/Suggestion/UnnamedDiscriminatedUnionFieldAnalyzerTests.fs b/tests/Ionide.Analyzers.Tests/Suggestion/UnnamedDiscriminatedUnionFieldAnalyzerTests.fs
@@ -10,7 +10,7 @@ let mutable projectOptions: FSharpProjectOptions = FSharpProjectOptions.zero
 [<SetUp>]
 let Setup () =
     task {
-        let! opts = mkOptionsFromProject "net7.0" []
+        let! opts = mkOptionsFromProject "net8.0" []
         projectOptions <- opts
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,6 +110,8 @@ let private analyze @@
                         if ff.FieldType.IsFunctionType || ff.FieldType.IsAnonRecordType then
                             false
+                        elif not (Seq.isEmpty ff.FieldType.GenericArguments) then
+                            false
                         else
                         primitives.Contains ff.FieldType.BasicQualifiedName
@@ Expand Down @@