Skip to content

Add static members to the extended completion #3949

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 2 commits into from
Nov 20, 2017
Merged

Add static members to the extended completion #3949

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6e8a3c
add static members to the extended completion
Nov 15, 2017
27f50c4
provide static method in completion for any type
vasily-kirichenko Nov 15, 2017
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
48 changes: 26 additions & 22 deletions src/fsharp/vs/ServiceAssemblyContent.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,18 @@ type AssemblyContentType = Public | Full

type Parent =
{ Namespace: Idents option
ThisRequiresQualifiedAccess: Idents option
TopRequiresQualifiedAccess: Idents option
ThisRequiresQualifiedAccess: (* isForMemberOrValue *) bool -> Idents option
TopRequiresQualifiedAccess: (* isForMemberOrValue *) bool -> Idents option
AutoOpen: Idents option
WithModuleSuffix: Idents option }
WithModuleSuffix: Idents option
IsModule: bool }
static member Empty =
{ Namespace = None
ThisRequiresQualifiedAccess = None
TopRequiresQualifiedAccess = None
ThisRequiresQualifiedAccess = fun _ -> None
TopRequiresQualifiedAccess = fun _ -> None
AutoOpen = None
WithModuleSuffix = None }
WithModuleSuffix = None
IsModule = true }
static member RewriteParentIdents (parentIdents: Idents option) (idents: Idents) =
match parentIdents with
| Some p when p.Length <= idents.Length ->
Expand Down Expand Up @@ -190,8 +192,8 @@ module AssemblyContentProvider =
{ FullName = fullName
CleanedIdents = cleanIdents
Namespace = ns
NearestRequireQualifiedAccessParent = parent.ThisRequiresQualifiedAccess |> Option.map parent.FixParentModuleSuffix
TopRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess |> Option.map parent.FixParentModuleSuffix
NearestRequireQualifiedAccessParent = parent.ThisRequiresQualifiedAccess false |> Option.map parent.FixParentModuleSuffix
TopRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess false |> Option.map parent.FixParentModuleSuffix
AutoOpenParent = parent.AutoOpen |> Option.map parent.FixParentModuleSuffix
Symbol = entity
Kind = fun lookupType ->
Expand All @@ -210,13 +212,14 @@ module AssemblyContentProvider =

let private traverseMemberFunctionAndValues ns (parent: Parent) (membersFunctionsAndValues: seq<FSharpMemberOrFunctionOrValue>) =
membersFunctionsAndValues
|> Seq.filter (fun x -> not x.IsInstanceMember)
|> Seq.collect (fun func ->
let processIdents fullName idents =
{ FullName = fullName
CleanedIdents = parent.FixParentModuleSuffix idents
Namespace = ns
NearestRequireQualifiedAccessParent = parent.ThisRequiresQualifiedAccess |> Option.map parent.FixParentModuleSuffix
TopRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess |> Option.map parent.FixParentModuleSuffix
NearestRequireQualifiedAccessParent = parent.ThisRequiresQualifiedAccess true |> Option.map parent.FixParentModuleSuffix
TopRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess true |> Option.map parent.FixParentModuleSuffix
AutoOpenParent = parent.AutoOpen |> Option.map parent.FixParentModuleSuffix
Symbol = func
Kind = fun _ -> EntityKind.FunctionOrValue func.IsActivePattern }
Expand Down Expand Up @@ -253,14 +256,14 @@ module AssemblyContentProvider =
| Some x -> yield x
| None -> ()

let thisRequiresQualifierAccess =
if entity.IsFSharp && Symbol.hasAttribute<RequireQualifiedAccessAttribute> entity.Attributes then
parent.FormatEntityFullName entity |> Option.map snd
else None
let rqa = parent.FormatEntityFullName entity |> Option.map snd
let rqaForType = if entity.IsFSharp && Symbol.hasAttribute<RequireQualifiedAccessAttribute> entity.Attributes then rqa else None
let thisRequiresQualifierAccess (isForMethodOrValue: bool) = if isForMethodOrValue then rqa else rqaForType

let currentParent =
{ ThisRequiresQualifiedAccess = thisRequiresQualifierAccess |> Option.orElse parent.ThisRequiresQualifiedAccess
TopRequiresQualifiedAccess = parent.TopRequiresQualifiedAccess |> Option.orElse thisRequiresQualifierAccess
{ ThisRequiresQualifiedAccess = thisRequiresQualifierAccess >> Option.orElse (parent.ThisRequiresQualifiedAccess false)
TopRequiresQualifiedAccess = fun forMV -> (parent.TopRequiresQualifiedAccess false) |> Option.orElse (thisRequiresQualifierAccess forMV)

AutoOpen =
let isAutoOpen = entity.IsFSharpModule && Symbol.hasAttribute<AutoOpenAttribute> entity.Attributes
match isAutoOpen, parent.AutoOpen with
Expand All @@ -275,13 +278,14 @@ module AssemblyContentProvider =
if entity.IsFSharpModule && Symbol.hasModuleSuffixAttribute entity then
currentEntity |> Option.map (fun e -> e.CleanedIdents)
else parent.WithModuleSuffix
Namespace = ns }

if entity.IsFSharpModule then
match entity.TryGetMembersFunctionsAndValues with
| xs when xs.Count > 0 ->
yield! traverseMemberFunctionAndValues ns currentParent xs
| _ -> ()
Namespace = ns
IsModule = entity.IsFSharpModule }

match entity.TryGetMembersFunctionsAndValues with
| xs when xs.Count > 0 ->
yield! traverseMemberFunctionAndValues ns currentParent xs
| _ -> ()

for e in (try entity.NestedEntities :> _ seq with _ -> Seq.empty) do
yield! traverseEntity contentType currentParent e
Expand Down