Skip to content

Filter out OptionalArgumentAttribute from type highlighting #2148

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 1 commit into from
Jan 3, 2017
Merged

Filter out OptionalArgumentAttribute from type highlighting #2148

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
34 changes: 19 additions & 15 deletions src/fsharp/vs/service.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,6 +1407,19 @@ type TypeCheckInfo

// Not, this does not have to be a SyncOp, it can be called from any thread
member scope.GetExtraColorizations() =
let (|LegitTypeOccurence|_|) = function
| ItemOccurence.UseInType
| ItemOccurence.UseInAttribute
| ItemOccurence.Use _
| ItemOccurence.Binding _
| ItemOccurence.Pattern _ -> Some()
| _ -> None

let inline (|OptionalArgumentAttribute|_|) ttype =
match ttype with
| TType.TType_app(tref, _) when tref.Stamp = g.attrib_OptionalArgumentAttribute.TyconRef.Stamp -> Some()
| _ -> None

sResolutions.CapturedNameResolutions
|> Seq.choose (fun cnr ->
match cnr with
Expand All @@ -1421,22 +1434,13 @@ type TypeCheckInfo
Some (m, FSharpTokenColorKind.Keyword)
// types get colored as types when they occur in syntactic types or custom attributes
// typevariables get colored as types when they occur in syntactic types custom builders, custom operations get colored as keywords
| CNR(_, ( Item.TypeVar _
| Item.Types _
| Item.UnqualifiedType _
| Item.CtorGroup _),
( ItemOccurence.UseInType
| ItemOccurence.UseInAttribute
| ItemOccurence.Use _
| ItemOccurence.Binding _
| ItemOccurence.Pattern _), _, _, _, m) ->
| CNR(_, Item.Types (_, [OptionalArgumentAttribute]), LegitTypeOccurence, _, _, _, _) -> None
| CNR(_, Item.CtorGroup(_, [MethInfo.FSMeth(_, OptionalArgumentAttribute, _, _)]), LegitTypeOccurence, _, _, _, _) -> None
| CNR(_, Item.Types _, LegitTypeOccurence, _, _, _, m) ->
Some (m, FSharpTokenColorKind.TypeName)
| CNR(_, (Item.TypeVar _ | Item.UnqualifiedType _ | Item.CtorGroup _), LegitTypeOccurence, _, _, _, m) ->
Some (m, FSharpTokenColorKind.TypeName)
| CNR(_, Item.ModuleOrNamespaces refs,
( ItemOccurence.UseInType
| ItemOccurence.UseInAttribute
| ItemOccurence.Use _
| ItemOccurence.Binding _
| ItemOccurence.Pattern _), _, _, _, m) when refs |> List.exists (fun x -> x.IsModule) ->
| CNR(_, Item.ModuleOrNamespaces refs, LegitTypeOccurence, _, _, _, m) when refs |> List.exists (fun x -> x.IsModule) ->
Some (m, FSharpTokenColorKind.TypeName)
| _ -> None)
|> Seq.toArray
Expand Down