Fix AP signatures for APs with names which are substrings of other APs (

#1211)
ionide · Nov 28, 2023 · 79ee428 · 79ee428
1 parent 3d96eda
commit 79ee428
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/src/FsAutoComplete.Core/SignatureFormatter.fs b/src/FsAutoComplete.Core/SignatureFormatter.fs
@@ -552,10 +552,12 @@ module SignatureFormatter =
 
   let getAPCaseSignature displayContext (apc: FSharpActivePatternCase) =
     let findVal =
+      let apcSearchString = $"|{apc.DisplayName}|"
+
       apc.Group.DeclaringEntity
       |> Option.bind (fun ent ->
         ent.MembersFunctionsAndValues
-        |> Seq.tryFind (fun func -> func.DisplayName.Contains apc.DisplayName)
+        |> Seq.tryFind (fun func -> func.DisplayName.Contains(apcSearchString, StringComparison.OrdinalIgnoreCase))
         |> Option.map (getFuncSignature displayContext))
       |> Option.bind (fun n ->
         try

diff --git a/test/FsAutoComplete.Tests.Lsp/CoreTests.fs b/test/FsAutoComplete.Tests.Lsp/CoreTests.fs
@@ -379,7 +379,28 @@ let tooltipTests state =
                 "   body             : (MailboxProcessor<string> -> Async<unit>) *"
                 "   cancellationToken: option<System.Threading.CancellationToken>"
                 "                   -> MailboxProcessor<string>" ])
-          verifySignature 54 9 "Case2 of string * newlineBefore: bool * newlineAfter: bool" ] ]
+          verifySignature 54 9 "Case2 of string * newlineBefore: bool * newlineAfter: bool"
+          verifySignature
+            60
+            7
+            (concatLines
+              [ "active pattern Value: "
+                "   input: Expr"
+                "       -> option<obj * System.Type>" ])
+          verifySignature
+            65
+            7
+            (concatLines
+              [ "active pattern DefaultValue: "
+                "   input: Expr"
+                "       -> option<System.Type>" ])
+          verifySignature
+            70
+            7
+            (concatLines
+              [ "active pattern ValueWithName: "
+                "   input: Expr"
+                "       -> option<obj * System.Type * string>" ]) ] ]
 
 let closeTests state =
   // Note: clear diagnostics also implies clear caches (-> remove file & project options from State).

diff --git a/test/FsAutoComplete.Tests.Lsp/TestCases/Tooltips/Script.fsx b/test/FsAutoComplete.Tests.Lsp/TestCases/Tooltips/Script.fsx
@@ -53,3 +53,20 @@ let mailbox =
 type DiscUnionWithCaseOfLabeledTuple =
     | Case1
     | Case2 of string * newlineBefore: bool * newlineAfter: bool
+
+open FSharp.Quotations.Patterns
+
+let testActivePatternSignatureWithSubStringName (expr: Quotations.Expr) =
+  match expr with
+  | Value (o, t) -> (o, t)
+  | _ -> failwith "no value match"
+  |> ignore
+
+  match expr with
+  | DefaultValue t -> t
+  | _ -> failwith "no value match"
+  |> ignore
+
+  match expr with
+  | ValueWithName t -> t
+  | _ -> failwith "no value match"