Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show arguments names in tooltips for local functions #13429

Merged
merged 2 commits into from
Jul 4, 2022
Merged

Show arguments names in tooltips for local functions #13429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbc336e
Show arguments names in tooltips for local functions
psfinaki Jul 1, 2022
2cece5f
Update
psfinaki Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Compiler/Checking/CheckDeclarations.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,9 @@ module IncrClassChecking =
let memberInfo = MakeMemberDataAndMangledNameForMemberVal(g, tcref, false, [], [], memberFlags, valSynInfo, mkSynId v.Range name, true)

let copyOfTyconTypars = ctorInfo.GetNormalizedInstanceCtorDeclaredTypars cenv env.DisplayEnv ctorInfo.TyconRef.Range

AdjustValToTopVal v (Parent tcref) topValInfo

// Add the 'this' pointer on to the function
let memberTauTy, topValInfo =
let tauTy = v.TauType
Expand Down
7 changes: 0 additions & 7 deletions vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,13 +1554,6 @@ We really need to rewrite some code paths here to use the real parse tree rather
bar(
""", "bar(", ["int"]

"""
type T() =
let foo x = x + 1
member this.Run() =
foo(
""", "foo(", ["int"]

"""
let f (Some x) = x + 1
f(
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.QuickInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ Full name: Microsoft.FSharp.Control.Async""".TrimStart().Replace("\r\n", "\n")
type A() =
let fff n = n + 1
"""
this.AssertQuickInfoContainsAtEndOfMarker(code, "let ff", "val fff: (int -> int)")
this.AssertQuickInfoContainsAtEndOfMarker(code, "let ff", "val fff: n: int -> int")

// Regression for 2494
[<Test>]
Expand Down
53 changes: 34 additions & 19 deletions vsintegration/tests/UnitTests/QuickInfoTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

namespace Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn

open System.IO
open FSharp.Compiler.CodeAnalysis
open Microsoft.CodeAnalysis
open Microsoft.CodeAnalysis.Text
open Microsoft.VisualStudio.FSharp.Editor
open NUnit.Framework
open UnitTests.TestLib.LanguageService
open VisualFSharp.UnitTests.Roslyn

[<Category "Roslyn Services">]
Expand Down Expand Up @@ -45,7 +43,6 @@ let GetQuickInfoTextFromCode (code:string) =

let expectedLines (lines:string list) = System.String.Join("\n", lines)

// migrated from legacy test
[<Test>]
let ``Automation.EnumDUInterfacefromFSBrowse.InsideComputationExpression`` () =
let code = """
Expand All @@ -70,7 +67,6 @@ module Test =
let expected = "MyColors.Red: MyColors = 0"
Assert.AreEqual(expected, quickInfo)

// migrated from legacy test
[<Test>]
let ``Automation.EnumDUInterfacefromFSBrowse.InsideMatch`` () =
let code = """
Expand Down Expand Up @@ -100,7 +96,6 @@ module Test =
"Full name: FsTest.MyDistance" ]
Assert.AreEqual(expected, quickInfo)

// migrated from legacy test
[<Test>]
let ``Automation.EnumDUInterfacefromFSBrowse.InsideLambda`` () =
let code = """
Expand Down Expand Up @@ -129,7 +124,6 @@ module Test =
let expected = "abstract IMyInterface.Represent: unit -> string"
Assert.AreEqual(expected, quickInfo)

// migrated from legacy test
[<Test>]
let ``Automation.RecordAndInterfaceFromFSProj.InsideComputationExpression``() =
let code = """
Expand Down Expand Up @@ -162,7 +156,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.RecordAndInterfaceFromFSProj.InsideQuotation``() =
let code = """
Expand All @@ -186,7 +179,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.RecordAndInterfaceFromFSProj.InsideLambda``() =
let code = """
Expand All @@ -212,7 +204,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.TupleRecordFromFSBrowse.InsideComputationExpression``() =
let code = """
Expand All @@ -237,7 +228,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.TupleRecordFromFSBrowse.SequenceOfMethods``() =
let code = """
Expand Down Expand Up @@ -266,7 +256,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.UnionAndStructFromFSProj.MatchExpression``() =
let code = """
Expand All @@ -289,7 +278,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.UnionAndStructFromFSProj.MatchPattern``() =
let code = """
Expand All @@ -312,7 +300,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.UnionAndStructFromFSProj.UnionIfPredicate``() =
let code = """
Expand All @@ -334,7 +321,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.UnionAndStructFromFSProj.UnionForPattern``() =
let code = """
Expand All @@ -356,7 +342,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.UnionAndStructFromFSProj.UnionMethodPatternMatch``() =
let code = """
Expand Down Expand Up @@ -386,7 +371,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.UnionAndStructFromFSProj.UnionMethodPatternMatchBody``() =
let code = """
Expand Down Expand Up @@ -414,7 +398,6 @@ module Test =
Assert.AreEqual(expected, quickInfo)
()

// migrated from legacy test
[<Test>]
let ``Automation.UnionAndStructFromFSProj.UnionPropertyInComputationExpression``() =
let code = """
Expand Down Expand Up @@ -444,3 +427,35 @@ module Test =
let expected = "property MyDistance.asNautical: MyDistance with get"
Assert.AreEqual(expected, quickInfo)
()

[<Test>]
let ``Automation.LetBindings.InsideModule``() =
let code = """
namespace FsTest

module Test =
let fu$$nc x = ()
psfinaki marked this conversation as resolved.
Show resolved Hide resolved
"""
let expectedSignature = "val func: x: 'a -> unit"

let tooltip = GetQuickInfoTextFromCode code

StringAssert.StartsWith(expectedSignature, tooltip)
()

[<Test>]
let ``Automation.LetBindings.InsideType``() =
let code = """
namespace FsTest

module Test =
type T() =
let fu$$nc x = ()
"""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also add a test for bindings that are local to other expressions, not types?

do
    let func x = ()
    ()

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually looks like this case is not working yet, hah. Looking into that


let expectedSignature = "val func: x: 'a -> unit"

let tooltip = GetQuickInfoTextFromCode code

StringAssert.StartsWith(expectedSignature, tooltip)
()