Skip to content

Symbols: create constructor symbols for class constructor items #13822

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
Sep 26, 2022
Merged

Symbols: create constructor symbols for class constructor items #13822

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4415ea6
Symbols API: do not provide vanilla symbols for class constructor
auduchinok Feb 19, 2018
7f3ebcf
Fix
auduchinok Sep 1, 2022
63cf17d
Merge branch 'main' into symbols-cctor
vzarytovskii Sep 5, 2022
6da430e
Merge branch 'main' into symbols-cctor
auduchinok Sep 12, 2022
eff4cfd
Merge branch 'main' into symbols-cctor
dsyme Sep 23, 2022
780042f
Formatting
auduchinok Sep 26, 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
11 changes: 8 additions & 3 deletions src/Compiler/Symbols/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,10 @@ type FSharpSymbol(cenv: SymbolEnv, item: unit -> Item, access: FSharpSymbol -> C

static member Create(cenv, item): FSharpSymbol =
let dflt() = FSharpSymbol(cenv, (fun () -> item), (fun _ _ _ -> true))
match item with
match item with
| Item.Value v when v.Deref.IsClassConstructor ->
FSharpMemberOrFunctionOrValue(cenv, C (FSMeth(cenv.g, generalizeTyconRef cenv.g v.DeclaringEntity |> snd, v, None)), item) :> _

| Item.Value v -> FSharpMemberOrFunctionOrValue(cenv, V v, item) :> _
| Item.UnionCase (uinfo, _) -> FSharpUnionCase(cenv, uinfo.UnionCaseRef) :> _
| Item.ExnCase tcref -> FSharpEntity(cenv, tcref) :>_
Expand Down Expand Up @@ -632,8 +635,10 @@ type FSharpEntity(cenv: SymbolEnv, entity: EntityRef) =
protect <| fun () ->
([ let entityTy = generalizedTyconRef cenv.g entity
let createMember (minfo: MethInfo) =
if minfo.IsConstructor then FSharpMemberOrFunctionOrValue(cenv, C minfo, Item.CtorGroup (minfo.DisplayName, [minfo]))
else FSharpMemberOrFunctionOrValue(cenv, M minfo, Item.MethodGroup (minfo.DisplayName, [minfo], None))
if minfo.IsConstructor || minfo.IsClassConstructor then
FSharpMemberOrFunctionOrValue(cenv, C minfo, Item.CtorGroup (minfo.DisplayName, [minfo]))
else
FSharpMemberOrFunctionOrValue(cenv, M minfo, Item.MethodGroup (minfo.DisplayName, [minfo], None))
if x.IsFSharpAbbreviation then
()
elif x.IsFSharp then
Expand Down