Commite6565e6

forki

authored and

KevinRansom

committed

Move the name check up (dotnet#5665)

* Move the name check up* Cleanup propinfio filter* Move the name check up

1 parent709b459 commite6565e6Copy full SHA for e6565e6

File tree

1 file changed

+11

-17

lines changed

src/fsharp
- NameResolution.fs

1 file changed

+11

-17

lines changed

`‎src/fsharp/NameResolution.fs‎`

Lines changed: 11 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -3639,28 +3639,25 @@ let rec ResolvePartialLongIdentInType (ncenv: NameResolver) nenv isApplicableMet`
`3639`	`3639`	`\| id:: rest->`
`3640`	`3640`
`3641`	`3641`	`letrfinfos=`
`3642`		`- ncenv.InfoReader.GetRecordOrClassFieldsOfType(None,ad,m,ty)`
`3643`		`-\|> List.filter(fun fref-> IsRecdFieldAccessible ncenv.amap m ad fref.RecdFieldRef)`
`3644`		`-\|> List.filter(fun fref-> fref.RecdField.IsStatic= statics)`
	`3642`	`+ ncenv.InfoReader.GetRecordOrClassFieldsOfType(None,ad,m,ty)`
	`3643`	`+\|> List.filter(fun fref-> fref.Name= id&& IsRecdFieldAccessible ncenv.amap m ad fref.RecdFieldRef&& fref.RecdField.IsStatic= statics)`
`3645`	`3644`
`3646`	`3645`	`letnestedTypes=`
`3647`	`3646`	`ty`
`3648`	`3647`	`\|> GetNestedTypesOfType(ad, ncenv, Some id, TypeNameResolutionStaticArgsInfo.Indefinite,false, m)`
`3649`	`3648`
`3650`	`3649`	`// e.g. <val-id>.<recdfield-id>.<more>`
`3651`		`-(rfinfos\|> List.filter(fun x-> x.Name= id)`
`3652`		`-\|> List.collect(fun x-> x.FieldType\|> ResolvePartialLongIdentInType ncenv nenv isApplicableMeth m adfalse rest))@`
	`3650`	`+(rfinfos\|> List.collect(fun x-> x.FieldType\|> ResolvePartialLongIdentInType ncenv nenv isApplicableMeth m adfalse rest))@`
`3653`	`3651`
`3654`	`3652`	`// e.g. <val-id>.<property-id>.<more>`
`3655`	`3653`	`letFullTypeOfPinfo(pinfo:PropInfo)=`
`3656`		`-letrty= pinfo.GetPropertyType(amap,m)`
`3657`		`-letrty=if pinfo.IsIndexerthen mkRefTupledTy g(pinfo.GetParamTypes(amap, m))--> rtyelse rty`
`3658`		`- rty`
	`3654`	`+letrty= pinfo.GetPropertyType(amap,m)`
	`3655`	`+letrty=if pinfo.IsIndexerthen mkRefTupledTy g(pinfo.GetParamTypes(amap, m))--> rtyelse rty`
	`3656`	`+rty`
`3659`	`3657`
`3660`	`3658`	`(ty`
`3661`	`3659`	`\|> AllPropInfosOfTypeInScope ncenv.InfoReader nenv(Some id,ad) IgnoreOverrides m`
`3662`		`-\|> List.filter(fun x-> x.IsStatic= statics)`
`3663`		`-\|> List.filter(IsPropInfoAccessible g amap m ad)`
	`3660`	`+\|> List.filter(fun pinfo-> pinfo.IsStatic= statics&& IsPropInfoAccessible g amap m ad pinfo)`
`3664`	`3661`	`\|> List.collect(fun pinfo->(FullTypeOfPinfo pinfo)\|> ResolvePartialLongIdentInType ncenv nenv isApplicableMeth m adfalse rest))@`
`3665`	`3662`
`3666`	`3663`	`// e.g. <val-id>.<event-id>.<more>`
`@@ -4294,16 +4291,14 @@ let rec ResolvePartialLongIdentInTypeForItem (ncenv: NameResolver) nenv m ad sta`
`4294`	`4291`	`\| id:: rest->`
`4295`	`4292`
`4296`	`4293`	`letrfinfos=`
`4297`		`- ncenv.InfoReader.GetRecordOrClassFieldsOfType(None,ad,m,ty)`
`4298`		`-\|> List.filter(fun fref-> IsRecdFieldAccessible ncenv.amap m ad fref.RecdFieldRef)`
`4299`		`-\|> List.filter(fun fref-> fref.RecdField.IsStatic= statics)`
	`4294`	`+ ncenv.InfoReader.GetRecordOrClassFieldsOfType(None,ad,m,ty)`
	`4295`	`+\|> List.filter(fun fref-> fref.Name= id&& IsRecdFieldAccessible ncenv.amap m ad fref.RecdFieldRef&& fref.RecdField.IsStatic= statics)`
`4300`	`4296`
`4301`	`4297`	`letnestedTypes= ty\|> GetNestedTypesOfType(ad, ncenv, Some id, TypeNameResolutionStaticArgsInfo.Indefinite,false, m)`
`4302`	`4298`
`4303`	`4299`	`// e.g. <val-id>.<recdfield-id>.<more>`
`4304`	`4300`	`for rfinfoin rfinfosdo`
`4305`		`-if rfinfo.Name= idthen`
`4306`		`-yield! ResolvePartialLongIdentInTypeForItem ncenv nenv m adfalse rest item rfinfo.FieldType`
	`4301`	`+yield! ResolvePartialLongIdentInTypeForItem ncenv nenv m adfalse rest item rfinfo.FieldType`
`4307`	`4302`
`4308`	`4303`	`// e.g. <val-id>.<property-id>.<more>`
`4309`	`4304`	`letfullTypeOfPinfo(pinfo:PropInfo)=`
`@@ -4314,8 +4309,7 @@ let rec ResolvePartialLongIdentInTypeForItem (ncenv: NameResolver) nenv m ad sta`
`4314`	`4309`	`letpinfos=`
`4315`	`4310`	`ty`
`4316`	`4311`	`\|> AllPropInfosOfTypeInScope ncenv.InfoReader nenv(Some id,ad) IgnoreOverrides m`
`4317`		`-\|> List.filter(fun x-> x.IsStatic= statics)`
`4318`		`-\|> List.filter(IsPropInfoAccessible g amap m ad)`
	`4312`	`+\|> List.filter(fun pinfo-> pinfo.IsStatic= statics&& IsPropInfoAccessible g amap m ad pinfo)`
`4319`	`4313`
`4320`	`4314`	`for pinfoin pinfosdo`
`4321`	`4315`	`yield!(fullTypeOfPinfo pinfo)\|> ResolvePartialLongIdentInTypeForItem ncenv nenv m adfalse rest 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!

Commite6565e6

File tree

1 file changed

1 file changed

`‎src/fsharp/NameResolution.fs‎`

0 commit comments