Skip to content

Remove duplicated navigation bar items for properties with getters and setters #2146

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
KevinRansom merged 4 commits into from
Jan 3, 2017
Merged

Remove duplicated navigation bar items for properties with getters and setters #2146

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb7edbb
remove duplicated navigation bar items for properties with getters an…
vasily-kirichenko Jan 2, 2017
ff21be5
fix glyphs for class let bindings
vasily-kirichenko Jan 2, 2017
7f0770f
better navigation bar glyphs
vasily-kirichenko Jan 2, 2017
0bd5068
fix accessibility for members and let bindings
vasily-kirichenko Jan 2, 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
Next Next commit
remove duplicated navigation bar items for properties with getters an… 
…d setters
  • Loading branch information
@vasily-kirichenko
vasily-kirichenko committed Jan 2, 2017
commit eb7edbbfa5a5e1e6ac5b8c9f2bb424235ca4d0cf
53 changes: 36 additions & 17 deletions src/fsharp/vs/ServiceNavigation.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,23 +191,42 @@ module NavigationImpl =

// Returns class-members for the right dropdown
and processMembers members: (range * list<FSharpNavigationDeclarationItem * int>) =
let members = members |> List.map (fun memb ->
(memb.Range,
match memb with
| SynMemberDefn.LetBindings(binds, _, _, _) -> List.collect (processBinding false) binds
| SynMemberDefn.Member(bind, _) -> processBinding true bind
| SynMemberDefn.ValField(Field(_, _, Some(rcid), ty, _, _, _, _), _) ->
[ createMember(rcid, FieldDecl, GlyphMajor.FieldBlue, ty.Range) ]
| SynMemberDefn.AutoProperty(_attribs,_isStatic,id,_tyOpt,_propKind,_,_xmlDoc,_access,_synExpr, _, _) ->
[ createMember(id, FieldDecl, GlyphMajor.FieldBlue, id.idRange) ]
| SynMemberDefn.AbstractSlot(ValSpfn(_, id, _, ty, _, _, _, _, _, _, _), _, _) ->
[ createMember(id, MethodDecl, GlyphMajor.Method2, ty.Range) ]
| SynMemberDefn.NestedType _ -> failwith "tycon as member????" //processTycon tycon
| SynMemberDefn.Interface(_, Some(membs), _) ->
processMembers membs |> snd
| _ -> [] ))
((members |> Seq.map fst |> Seq.fold unionRangesChecked range.Zero),
(members |> List.map snd |> List.concat))
let members =
members
|> List.groupBy (fun x -> x.Range)
|> List.map (fun (range, members) ->
range,
(match members with
| [memb] ->
match memb with
| SynMemberDefn.LetBindings(binds, _, _, _) -> List.collect (processBinding false) binds
| SynMemberDefn.Member(bind, _) -> processBinding true bind
| SynMemberDefn.ValField(Field(_, _, Some(rcid), ty, _, _, _, _), _) ->
[ createMember(rcid, FieldDecl, GlyphMajor.FieldBlue, ty.Range) ]
| SynMemberDefn.AutoProperty(_attribs,_isStatic,id,_tyOpt,_propKind,_,_xmlDoc,_access,_synExpr, _, _) ->
[ createMember(id, FieldDecl, GlyphMajor.FieldBlue, id.idRange) ]
| SynMemberDefn.AbstractSlot(ValSpfn(_, id, _, ty, _, _, _, _, _, _, _), _, _) ->
[ createMember(id, MethodDecl, GlyphMajor.Method2, ty.Range) ]
| SynMemberDefn.NestedType _ -> failwith "tycon as member????" //processTycon tycon
| SynMemberDefn.Interface(_, Some(membs), _) ->
processMembers membs |> snd
| _ -> []
// can happen if one is a getter and one is a setter
| [SynMemberDefn.Member(memberDefn=Binding(headPat=SynPat.LongIdent(lid1, Some(info1),_,_,_,_)) as binding1)
SynMemberDefn.Member(memberDefn=Binding(headPat=SynPat.LongIdent(lid2, Some(info2),_,_,_,_)) as binding2)] ->
// ensure same long id
assert((lid1.Lid,lid2.Lid) ||> List.forall2 (fun x y -> x.idText = y.idText))
Copy link
Contributor

@forki forki Jan 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the assert doing here? Are we just throwing if this is not fulfilled?

Copy link
Contributor Author

@vasily-kirichenko vasily-kirichenko Jan 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've ported this code from here https://github.com/Microsoft/visualfsharp/blob/master/src/fsharp/vs/ServiceParseTreeWalk.fs#L418-L454 I think that if this assertion violated, it means that something very wrong happened with the parser and we must see it in debug configuration.

Copy link
Contributor

@forki forki Jan 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

// ensure one is getter, other is setter
assert((info1.idText = "set" && info2.idText = "get") ||
(info2.idText = "set" && info1.idText = "get"))
// both binding1 and binding2 have same range, so just try the first one, else try the second one
match processBinding true binding1 with
| [] -> processBinding true binding2
| x -> x
| _ -> []))

(members |> Seq.map fst |> Seq.fold unionRangesChecked range.Zero),
(members |> List.map snd |> List.concat)

// Process declarations in a module that belong to the right drop-down (let bindings)
let processNestedDeclarations decls = decls |> List.collect (function
Expand Down