Skip to content

Merge master to dev16.1 #6283

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
1 commit merged into from
Feb 26, 2019
Merged

Merge master to dev16.1 #6283

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
5 changes: 4 additions & 1 deletion src/fsharp/symbols/SymbolHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,10 @@ module internal SymbolHelpers =
let mutable ToolTipFault = None

let GetXmlCommentForMethInfoItem infoReader m d (minfo: MethInfo) =
GetXmlCommentForItemAux (if minfo.HasDirectXmlComment || minfo.XmlDoc.NonEmpty then Some minfo.XmlDoc else None) infoReader m d
if minfo.HasDirectXmlComment || minfo.XmlDoc.NonEmpty then
GetXmlCommentForItemAux (Some minfo.XmlDoc) infoReader m d
else
mkXmlComment (GetXmlDocSigOfMethInfo infoReader m minfo)

let FormatTyparMapping denv (prettyTyparInst: TyparInst) =
[ for (tp, ty) in prettyTyparInst ->
Expand Down