Commitee938a7

vasily-kirichenko

authored and

KevinRansom

committed

provide signature help for type provider static parameters at ctor call site (dotnet#5017)

1 parent92948a2 commitee938a7Copy full SHA for ee938a7

File tree

2 files changed

+25

-15

lines changed

src/fsharp/service
- ServiceParamInfoLocations.fs
vsintegration/tests/UnitTests/LegacyLanguageService
- Tests.LanguageService.ParameterInfo.fs

2 files changed

+25

-15

lines changed

`‎src/fsharp/service/ServiceParamInfoLocations.fs‎`

Lines changed: 19 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,17 +144,27 @@ module internal NoteworthyParamInfoLocationsImpl =`
`144`	`144`	`NotFound, Some inner`
`145`	`145`	`\|_-> NotFound, Some inner`
`146`	`146`
`147`		`-`
	`147`	`+let(\|StaticParameters\|_\|)pos synType=`
	`148`	`+match synTypewith`
	`149`	`+\| SynType.App(SynType.LongIdent(LongIdentWithDots(lid,_)as lidwd), Some(openm), args, commas, closemOpt,_pf, wholem)->`
	`150`	`+letlidm= lidwd.Range`
	`151`	`+letbetweenTheBrackets= mkRange wholem.FileName openm.Start wholem.End`
	`152`	`+if AstTraversal.rangeContainsPosEdgesExclusive betweenTheBrackets pos&& args\|> List.forall isStaticArgthen`
	`153`	`+letcommasAndCloseParen=[for cin commas-> c.End]@[ wholem.End]`
	`154`	`+ Some(FSharpNoteworthyParamInfoLocations(pathOfLid lid, lidm, openm.Start, commasAndCloseParen, closemOpt.IsSome, args\|> List.map digOutIdentFromStaticArg))`
	`155`	`+else`
	`156`	`+ None`
	`157`	`+\|_->`
	`158`	`+ None`
`148`	`159`
`149`	`160`	`lettraverseInput(pos,parseTree)=`
`150`		`-`
`151`	`161`	`AstTraversal.Traverse(pos, parseTree,{new AstTraversal.AstVisitorBase<_>()with`
`152`	`162`	`member this.VisitExpr(_path, traverseSynExpr, defaultTraverse, expr)=`
`153`	`163`	`letexpr= expr// fix debug locals`
`154`	`164`	`match exprwith`
`155`	`165`
`156`	`166`	`// new LID<tyarg1, ...., tyargN>(...) and error recovery of these`
`157`		`-\| SynExpr.New(_, synType, synExpr,_range)->`
	`167`	`+\| SynExpr.New(_, synType, synExpr,_)->`
`158`	`168`	`letconstrArgsResult,cacheOpt= searchSynArgExpr traverseSynExpr pos synExpr`
`159`	`169`	`match constrArgsResult, cacheOptwith`
`160`	`170`	`\| Found(parenLoc, args, isThereACloseParen),_->`
`@@ -163,7 +173,9 @@ module internal NoteworthyParamInfoLocationsImpl =`
`163`	`173`	`\| NotFound, Some cache->`
`164`	`174`	`cache`
`165`	`175`	`\|_->`
`166`		`- traverseSynExpr synExpr`
	`176`	`+match synTypewith`
	`177`	`+\| StaticParameters pos loc-> Some loc`
	`178`	`+\|_-> traverseSynExpr synExpr`
`167`	`179`
`168`	`180`	`// EXPR< = error recovery of a form of half-written TypeApp`
`169`	`181`	`\| SynExpr.App(_,_, SynExpr.App(_,true, SynExpr.Ident op, synExpr, openm), SynExpr.ArbitraryAfterError_, wholem)when op.idText="op_LessThan"->`
`@@ -221,18 +233,10 @@ module internal NoteworthyParamInfoLocationsImpl =`
`221`	`233`
`222`	`234`	`\|_-> defaultTraverse expr`
`223`	`235`
`224`		`-member this.VisitTypeAbbrev(tyAbbrevRhs,_m)=`
	`236`	`+member this.VisitTypeAbbrev(tyAbbrevRhs,_m)=`
`225`	`237`	`match tyAbbrevRhswith`
`226`		`-\| SynType.App(SynType.LongIdent(LongIdentWithDots(lid,_)as lidwd), Some(openm), args, commas, closemOpt,_pf, wholem)->`
`227`		`-letlidm= lidwd.Range`
`228`		`-letbetweenTheBrackets= mkRange wholem.FileName openm.Start wholem.End`
`229`		`-if AstTraversal.rangeContainsPosEdgesExclusive betweenTheBrackets pos&& args\|> List.forall isStaticArgthen`
`230`		`-letcommasAndCloseParen=[for cin commas-> c.End]@[ wholem.End]`
`231`		`- Some(FSharpNoteworthyParamInfoLocations(pathOfLid lid, lidm, openm.Start, commasAndCloseParen, closemOpt.IsSome, args\|> List.map digOutIdentFromStaticArg))`
`232`		`-else`
`233`		`- None`
`234`		`-\|_->`
`235`		`- None`
	`238`	`+\| StaticParameters pos loc-> Some loc`
	`239`	`+\|_-> None`
`236`	`240`
`237`	`241`	`member this.VisitImplicitInherit(defaultTraverse, ty, expr, m)=`
`238`	`242`	`match defaultTraverse exprwith`

`‎vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1631,6 +1631,12 @@ We really need to rewrite some code paths here to use the real parse tree rather`
`1631`	`1631`	`type U = ^N1.T^<^ ,^$ ^>""",`
`1632`	`1632`	`additionalReferenceAssemblies=[PathRelativeToTestAssembly(@"UnitTests\MockTypeProviders\DummyProviderForLanguageServiceTesting.dll")])`
`1633`	`1633`
	`1634`	`+[<Test>]`
	`1635`	+memberpublicthis.``LocationOfParams.TypeProviders.StaticParametersAtConstructorCallSite``()=
	`1636`	`+ this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts("""`
	`1637`	`+ let x = new ^N1.T^<^ "fo$o",^ 42 ^>()""",`
	`1638`	`+ additionalReferenceAssemblies=[PathRelativeToTestAssembly(@"UnitTests\MockTypeProviders\DummyProviderForLanguageServiceTesting.dll")])`
	`1639`	`+`
`1634`	`1640`	`[<Test>]`
`1635`	`1641`	memberpublicthis.``TypeProvider.FormatOfNamesOfSystemTypes``()=
`1636`	`1642`	`letcode=["""type TTT = N1.T< "foo", ParamIgnored=42 >"""]`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitee938a7

File tree

2 files changed

2 files changed

`‎src/fsharp/service/ServiceParamInfoLocations.fs‎`

`‎vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs‎`

0 commit comments