Parameter info: disable for binary apps

JetBrains · Jul 1, 2022 · 4c6e9bc · 4c6e9bc
1 parent 856b085
commit 4c6e9bc
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 0 deletions.
diff --git a/ReSharper.FSharp/src/FSharp.Psi.Features/src/ParameterInfo/FSharpParameterInfo.fs b/ReSharper.FSharp/src/FSharp.Psi.Features/src/ParameterInfo/FSharpParameterInfo.fs
@@ -606,6 +606,10 @@ type FSharpParameterInfoContextFactory() =
             | context -> context
 
         | :? IReferenceExpr as refExpr ->
+            // todo: enable for non-predefined operators?
+            let binaryAppExpr = BinaryAppExprNavigator.GetByOperator(refExpr)
+            if isNotNull binaryAppExpr then null else
+
             match PrefixAppExprNavigator.GetByArgumentExpression(refExpr.IgnoreParentParens()) with
             | null ->
                 let context = createFromExpression isAutoPopup caretOffset refExpr.Reference refExpr

diff --git a/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 01.fs b/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 01.fs
@@ -0,0 +1 @@
+true &&{caret} true
diff --git a/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 01.fs.gold b/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 01.fs.gold
@@ -0,0 +1 @@
+No ParameterInfo is available here
diff --git a/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 02.fs b/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 02.fs
@@ -0,0 +1 @@
+(&&) {caret}
diff --git a/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 02.fs.gold b/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 02.fs.gold
@@ -0,0 +1,7 @@
+ParameterInfo is available
+--- All invocables: ----
+(e1: bool) (e2: bool) : bool
+Parameter: 0 'e1: bool'
+
+--- Accepted invocables: ---
+(e1: bool) (e2: bool) : bool
diff --git a/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 03.fs b/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 03.fs
@@ -0,0 +1 @@
+(&&) true {caret}
diff --git a/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 03.fs.gold b/ReSharper.FSharp/test/data/features/parameterInfo/App - Operator 03.fs.gold
@@ -0,0 +1,7 @@
+ParameterInfo is available
+--- All invocables: ----
+(e1: bool) (e2: bool) : bool
+Parameter: 1 'e2: bool'
+
+--- Accepted invocables: ---
+(e1: bool) (e2: bool) : bool
diff --git a/ReSharper.FSharp/test/src/FSharp.Tests/FSharpParameterInfoTest.fs b/ReSharper.FSharp/test/src/FSharp.Tests/FSharpParameterInfoTest.fs
@@ -102,6 +102,10 @@ type FSharpParameterInfoTest() =
     [<Test>] member x.``App - Method 14 - Empty``() = x.DoNamedTest()
     [<Test>] member x.``App - Method 15 - Empty``() = x.DoNamedTest()
 
+    [<Test>] member x.``App - Operator 01``() = x.DoNamedTest()
+    [<Test>] member x.``App - Operator 02``() = x.DoNamedTest()
+    [<Test>] member x.``App - Operator 03``() = x.DoNamedTest()
+
     [<Test>] member x.``Exception 01``() = x.DoNamedTest()
     [<Test>] member x.``Exception 02``() = x.DoNamedTest()
     [<Test>] member x.``Exception 03``() = x.DoNamedTest()