Skip to content

Reducing number if isAppTy calls in NameRes #8285

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
cartermp merged 1 commit into from
Jan 20, 2020
Merged

Reducing number if isAppTy calls in NameRes #8285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 23 additions & 12 deletions src/fsharp/NameResolution.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,11 +536,11 @@ let ExtensionPropInfosOfTypeInScope collectionSettings (infoReader:InfoReader) (
let extMemsFromHierarchy =
infoReader.GetEntireTypeHierarchy(AllowMultiIntfInstantiations.Yes, m, ty)
|> List.collect (fun ty ->
if isAppTy g ty then
let tcref = tcrefOfAppTy g ty
match tryDestAppTy g ty with
| ValueSome tcref ->
let extMemInfos = nenv.eIndexedExtensionMembers.Find tcref
SelectPropInfosFromExtMembers infoReader ad optFilter ty m extMemInfos
else [])
| _ -> [])

extMemsDangling @ extMemsFromHierarchy

Expand Down Expand Up @@ -606,11 +606,11 @@ let ExtensionMethInfosOfTypeInScope (collectionSettings: ResultCollectionSetting
infoReader.GetEntireTypeHierarchy(AllowMultiIntfInstantiations.Yes, m, ty)
|> List.collect (fun ty ->
let g = infoReader.g
if isAppTy g ty then
let tcref = tcrefOfAppTy g ty
match tryDestAppTy g ty with
| ValueSome tcref ->
let extValRefs = nenv.eIndexedExtensionMembers.Find tcref
SelectMethInfosFromExtMembers infoReader optFilter ty m extValRefs
else [])
| _ -> [])
extMemsDangling @ extMemsFromHierarchy

/// Get all the available methods of a type (both intrinsic and extension)
Expand Down Expand Up @@ -2352,18 +2352,24 @@ let rec ResolveLongIdentInTypePrim (ncenv: NameResolver) nenv lookupKind (resInf

match lookupKind with
| LookupKind.Expr | LookupKind.Pattern ->
if isAppTy g ty then
let tcref = tcrefOfAppTy g ty
match tryDestAppTy g ty with
| ValueSome tcref ->
for uc in tcref.UnionCasesArray do
addToBuffer uc.DisplayName
| _ -> ()
| _ -> ()

raze (UndefinedName (depth, FSComp.SR.undefinedNameFieldConstructorOrMember, id, suggestMembers))

and ResolveLongIdentInNestedTypes (ncenv: NameResolver) nenv lookupKind resInfo depth id m ad (id2: Ident) (rest: Ident list) findFlag typeNameResInfo tys =
tys
|> CollectAtMostOneResult (fun ty ->
let resInfo = if isAppTy ncenv.g ty then resInfo.AddEntity(id.idRange, tcrefOfAppTy ncenv.g ty) else resInfo
let resInfo =
match tryDestAppTy ncenv.g ty with
| ValueSome tcref ->
resInfo.AddEntity(id.idRange, tcref)
| _ ->
resInfo
ResolveLongIdentInTypePrim ncenv nenv lookupKind resInfo depth m ad id2 rest findFlag typeNameResInfo ty
|> AtMostOneResult m)

Expand Down Expand Up @@ -2878,8 +2884,10 @@ let ResolvePatternLongIdent sink (ncenv: NameResolver) warnOnUpper newDef m ad n
// X.ListEnumerator // does not resolve
//
let ResolveNestedTypeThroughAbbreviation (ncenv: NameResolver) (tcref: TyconRef) m =
if tcref.IsTypeAbbrev && tcref.Typars(m).IsEmpty && isAppTy ncenv.g tcref.TypeAbbrev.Value && isNil (argsOfAppTy ncenv.g tcref.TypeAbbrev.Value) then
tcrefOfAppTy ncenv.g tcref.TypeAbbrev.Value
if tcref.IsTypeAbbrev && tcref.Typars(m).IsEmpty then
match tryAppTy ncenv.g tcref.TypeAbbrev.Value with
| ValueSome (abbrevTcref, []) -> abbrevTcref
| _ -> tcref
else
tcref

Expand Down Expand Up @@ -3527,7 +3535,10 @@ let ItemOfTyconRef ncenv m (x: TyconRef) =
Item.Types (x.DisplayName, [FreshenTycon ncenv m x])

let ItemOfTy g x =
let nm = if isAppTy g x then (tcrefOfAppTy g x).DisplayName else "?"
let nm =
match tryDestAppTy g x with
| ValueSome tcref -> tcref.DisplayName
| _ -> "?"
Item.Types (nm, [x])

// Filter out 'PrivateImplementationDetail' classes
Expand Down