Fixing hints for custom ops (#15119)

dotnet · Apr 20, 2023 · ef89c69 · ef89c69
1 parent a766f25
commit ef89c69
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/vsintegration/src/FSharp.Editor/Hints/InlineParameterNameHints.fs b/vsintegration/src/FSharp.Editor/Hints/InlineParameterNameHints.fs
@@ -54,6 +54,9 @@ type InlineParameterNameHints(parseResults: FSharpParseFileResults) =
         >> Seq.map (fun location -> location.ArgumentRange)
         >> Seq.contains range
 
+    let isCustomOperation (symbol: FSharpMemberOrFunctionOrValue) =
+        symbol.HasAttribute<CustomOperationAttribute>()
+
     let getSourceTextAtRange (sourceText: SourceText) (range: range) =
         (RoslynHelpers.FSharpRangeToTextSpan(sourceText, range) |> sourceText.GetSubText)
             .ToString()
@@ -65,11 +68,9 @@ type InlineParameterNameHints(parseResults: FSharpParseFileResults) =
                 symbol.DeclaringEntity
                 |> Option.exists (fun entity -> entity.CompiledName <> "Operators")
 
-            let isNotCustomOperation = not <| symbol.HasAttribute<CustomOperationAttribute>()
-
             (symbol.IsFunction && isNotBuiltInOperator) // arguably, hints for those would be rather useless
             || symbol.IsConstructor
-            || (symbol.IsMethod && isNotCustomOperation)
+            || symbol.IsMethod
         else
             false
 
@@ -100,8 +101,10 @@ type InlineParameterNameHints(parseResults: FSharpParseFileResults) =
                 |> Seq.filter (fun range -> argumentLocations |> (not << isNamedArgument range))
 
             let argumentNames = Seq.map (getSourceTextAtRange sourceText) ranges
+            let skipped = if symbol |> isCustomOperation then 1 else 0
 
             parameters
+            |> Seq.skip skipped
             |> Seq.zip ranges // Seq.zip is important as List.zip requires equal lengths
             |> Seq.where (snd >> parameterNameExists)
             |> Seq.zip argumentNames

diff --git a/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineParameterNameHintTests.fs b/vsintegration/tests/FSharp.Editor.Tests/Hints/InlineParameterNameHintTests.fs
@@ -481,17 +481,38 @@ let test sequences =
         Assert.Equal(expected, actual)
 
     [<Fact>]
-    let ``Hints are not shown when CustomOperation attribute is detected`` () =
+    let ``Hints are shown correctly for custom operations`` () =
         let code =
             """
 let q = query { for x in { 1 .. 10 } do select x }
 """
 
         let document = getFsDocument code
 
+        let expected =
+            [
+                {
+                    Content = "projection = "
+                    Location = (1, 48)
+                }
+            ]
+
+        let actual = getParameterNameHints document
+
+        Assert.Equal(expected, actual)
+
+    [<Fact>]
+    let ``Hints are not shown for custom operations with only 1 parameter`` () =
+        let code =
+            """
+let q = query { for _ in { 1 .. 10 } do count }
+"""
+
+        let document = getFsDocument code
+
         let actual = getParameterNameHints document
 
-        Assert.Empty actual
+        Assert.Empty(actual)
 
     [<Fact>]
     let ``Hints are not shown when parameter names coincide with variable names`` () =