Skip to content

Include range of parameter names and attributes in topTupleType SynType.Tuple #13850

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

Merged
merged 6 commits into from
Oct 7, 2022
Merged

Include range of parameter names and attributes in topTupleType SynType.Tuple #13850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e735e4
Include range of parameter names and attributes in topTupleType SynTy…
nojaf Sep 6, 2022
402a338
Update AST in unit tests
nojaf Sep 30, 2022
3bee6c1
Correct fsproj.
nojaf Oct 2, 2022
33b4b2d
Merge branch 'main' into syntype-tuple-parameter-name
nojaf Oct 6, 2022
a63a947
Merge branch 'main' into syntype-tuple-parameter-name
T-Gro Oct 7, 2022
c6fa498
Fix FSharp.Compiler.Service.Tests.fsproj
nojaf Oct 7, 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 tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@
<Compile Include="..\service\SyntaxTreeTests\SynIdentTests.fs">
<Link>SyntaxTree\SynIdentTests.fs</Link>
</Compile>
<Compile Include="..\service\SyntaxTreeTests\SynTypeTests.fs">
<Link>SyntaxTree\SynTypeTests.fs</Link>
</Compile>
<Compile Include="..\service\SyntaxTreeTests\AttributeTests.fs">
<Link>SyntaxTree\AttributeTests.fs</Link>
</Compile>
Expand Down
51 changes: 51 additions & 0 deletions tests/service/SyntaxTreeTests/SynTypeTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
module FSharp.Compiler.Service.Tests.SyntaxTreeTests.SynTypeTests

open FSharp.Compiler.Service.Tests.Common
open FSharp.Compiler.Syntax
open NUnit.Framework

[<Test>]
let ``SynType.Tuple does include leading parameter name`` () =
let parseResults =
getParseResultsOfSignatureFile
"""
type T =
member M: p1: a * p2: b -> int
"""

match parseResults with
| ParsedInput.SigFile(ParsedSigFileInput(contents = [
SynModuleOrNamespaceSig(decls = [
SynModuleSigDecl.Types(types = [
SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
SynMemberSig.Member(memberSig = SynValSig(synType =
SynType.Fun(argType = SynType.Tuple(_, _, mTuple))))
]))
])
])
])) ->
assertRange (3, 14) (3, 27) mTuple
| _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"

[<Test>]
let ``SynType.Tuple does include leading parameter attributes`` () =
let parseResults =
getParseResultsOfSignatureFile
"""
type T =
member M: [<SomeAttribute>] a * [<OtherAttribute>] b -> int
"""

match parseResults with
| ParsedInput.SigFile(ParsedSigFileInput(contents = [
SynModuleOrNamespaceSig(decls = [
SynModuleSigDecl.Types(types = [
SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
SynMemberSig.Member(memberSig = SynValSig(synType =
SynType.Fun(argType = SynType.Tuple(_, _, mTuple))))
]))
])
])
])) ->
assertRange (3, 14) (3, 56) mTuple
| _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"