Skip to content

Commit

Permalink
Fix #249 (3)
Browse files Browse the repository at this point in the history
  • Loading branch information
fsgit committed Nov 5, 2014
1 parent 7c38e33 commit 4dba34e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions src/assemblyinfo/assemblyinfo.shared.fs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
namespace System
open System.Reflection

[<assembly: AssemblyVersionAttribute("0.0.75")>]
[<assembly: AssemblyFileVersionAttribute("0.0.75")>]
[<assembly: AssemblyVersionAttribute("0.0.76")>]
[<assembly: AssemblyFileVersionAttribute("0.0.76")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.0.75"
let [<Literal>] Version = "0.0.76"
13 changes: 6 additions & 7 deletions src/fsharp/vs/Symbols.fs
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,14 @@ and FSharpEntity(cenv:cenv, entity:EntityRef) =

member x.FullName =
checkIsResolved()
let fail() = invalidOp (sprintf "the type '%s' does not have a qualified name" x.LogicalName)
if entity.IsTypeAbbrev || entity.IsProvidedErasedTycon || entity.IsNamespace then fail()
match entity.CompiledRepresentation with
| CompiledTypeRepr.ILAsmNamed(tref,_,_) -> tref.FullName
| CompiledTypeRepr.ILAsmOpen _ -> fail()
match x.TryFullName with
| None -> invalidOp (sprintf "the type '%s' does not have a qualified name" x.LogicalName)
| Some nm -> nm

member x.TryFullName =
if isUnresolved() then None
elif entity.IsTypeAbbrev || entity.IsProvidedErasedTycon || entity.IsNamespace then None
elif entity.IsTypeAbbrev || entity.IsProvidedErasedTycon then None
elif entity.IsNamespace then Some entity.DemangledModuleOrNamespaceName
else
match entity.CompiledRepresentation with
| CompiledTypeRepr.ILAsmNamed(tref,_,_) -> Some tref.FullName
Expand Down Expand Up @@ -257,7 +256,7 @@ and FSharpEntity(cenv:cenv, entity:EntityRef) =

member __.IsProvidedAndGenerated =
isResolved() &&
entity.IsProvidedErasedTycon
entity.IsProvidedGeneratedTycon

member __.IsClass =
isResolved() &&
Expand Down

0 comments on commit 4dba34e

Please sign in to comment.