Commit3060db7

forki

authored and

KevinRansom

committed

We can save a couple of lookups (dotnet#2197)

1 parent6b4d0a4 commit3060db7Copy full SHA for 3060db7

File tree

1 file changed

-5

lines changed

src/fsharp
- NameResolution.fs

1 file changed

-5

lines changed

`‎src/fsharp/NameResolution.fs‎`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2460,12 +2460,15 @@ let rec ResolvePatternLongIdentInModuleOrNamespace (ncenv:NameResolver) nenv num`
`2460`	`2460`	`\| Some vspecwhen IsValAccessible ad(mkNestedValRef modref vspec)->`
`2461`	`2461`	`success(resInfo,Item.Value(mkNestedValRef modref vspec),rest)`
`2462`	`2462`	`\|_->`
	`2463`	`+lettcrefs=lazy(`
	`2464`	`+ LookupTypeNameInEntityMaybeHaveArity(ncenv.amap, id.idRange, ad, id.idText, TypeNameResolutionStaticArgsInfo.Indefinite, modref)`
	`2465`	`+\|> List.map(fun tcref->(resInfo,tcref)))`
	`2466`	`+`
`2463`	`2467`	`// Something in a type? e.g. a literal field`
`2464`		`-lettcrefs= LookupTypeNameInEntityMaybeHaveArity(ncenv.amap, id.idRange, ad, id.idText, TypeNameResolutionStaticArgsInfo.Indefinite, modref)`
`2465`		`-lettcrefs= tcrefs\|> List.map(fun tcref->(resInfo,tcref))`
`2466`	`2468`	`lettyconSearch=`
`2467`	`2469`	`match lidwith`
`2468`		`-\|_tn:: restwhennot(isNil rest)->`
	`2470`	`+\|_:: restwhennot(isNil rest)->`
	`2471`	`+lettcrefs= tcrefs.Force()`
`2469`	`2472`	`ResolveLongIdentInTyconRefs ResultCollectionSettings.AtMostOneResult(ncenv:NameResolver) nenv LookupKind.Pattern(depth+1) m ad rest numTyArgsOpt id.idRange tcrefs`
`2470`	`2473`	`\|_->`
`2471`	`2474`	`NoResultsOrUsefulErrors`
`@@ -2476,8 +2479,8 @@ let rec ResolvePatternLongIdentInModuleOrNamespace (ncenv:NameResolver) nenv num`
`2476`	`2479`
`2477`	`2480`	`// Constructor of a type?`
`2478`	`2481`	`letctorSearch=`
`2479`		`-if isNil restthen`
`2480`		`- tcrefs`
	`2482`	`+if isNil restthen`
	`2483`	`+ tcrefs.Force()`
`2481`	`2484`	`\|> List.map(fun(resInfo,tcref)->(resInfo,FreshenTycon ncenv m tcref))`
`2482`	`2485`	`\|> CollectAtMostOneResult(fun(resInfo,typ)-> ResolveObjectConstructorPrim ncenv nenv.eDisplayEnv resInfo id.idRange ad typ)`
`2483`	`2486`	`\|> MapResults(fun(resInfo,item)->(resInfo,item,[]))`

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!

Commit3060db7

File tree

1 file changed

1 file changed

`‎src/fsharp/NameResolution.fs‎`

0 commit comments