Skip to content

highlight DU cases and Active Patterns as "Enum" Roslyn classification #1810

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

Closed
vasily-kirichenko wants to merge 2 commits into from
Closed

highlight DU cases and Active Patterns as "Enum" Roslyn classification #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
227132b
highlight DU cases and Active Patterns as "Enum" Roslyn classificatio…
vasily-kirichenko Nov 22, 2016
4b83070
highlight modules and constructors
vasily-kirichenko Nov 23, 2016
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
2 changes: 2 additions & 0 deletions src/fsharp/vs/ServiceLexing.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ type FSharpTokenColorKind =
| Number = 9
| Operator = 10
| TypeName = 11
| Pattern = 12
| Module = 13

/// Categorize an action the editor should take in response to a token, e.g. brace matching
///
Expand Down
2 changes: 2 additions & 0 deletions src/fsharp/vs/ServiceLexing.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ type internal FSharpTokenColorKind =
| Number = 9
| Operator = 10
| TypeName = 11
| Pattern = 12
| Module = 13

/// Gives an indication of what should happen when the token is typed in an IDE
type internal FSharpTokenTriggerClass =
Expand Down
17 changes: 15 additions & 2 deletions src/fsharp/vs/service.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,12 +1365,25 @@ type TypeCheckInfo
| CNR(_, (Item.Value vref), ItemOccurence.Use, _, _, _, m) when valRefEq g g.seq_vref vref ->
yield (m, FSharpTokenColorKind.Keyword)
// custom builders, custom operations get colored as keywords
| CNR(_, (Item.CustomBuilder _ | Item.CustomOperation _), ItemOccurence.Use, _, _, _, m) ->
| CNR(_, Item.CustomBuilder(_, valRef), ItemOccurence.Use, _, _, _, _) ->
yield (valRef.Range, FSharpTokenColorKind.Keyword)
| CNR(_, Item.CustomOperation _, ItemOccurence.Use, _, _, _, m) ->
yield (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 _) , (ItemOccurence.UseInType | ItemOccurence.UseInAttribute), _, _, _, m) ->
| CNR(_, (Item.TypeVar _ | Item.Types _ | Item.UnqualifiedType _),
(ItemOccurence.UseInType | ItemOccurence.UseInAttribute | ItemOccurence.Binding _), _, _, _, m) ->
yield (m, FSharpTokenColorKind.TypeName)
| CNR(_, Item.CtorGroup _, ItemOccurence.Use, _, _, _, m) ->
yield (m, FSharpTokenColorKind.TypeName)
| CNR(_, Item.ModuleOrNamespaces _, ItemOccurence.Binding, _, _, _, m) ->
yield (m, FSharpTokenColorKind.Module)
| CNR(_, Item.UnionCase (UnionCaseInfo (_, r), _),
(ItemOccurence.Binding | ItemOccurence.Implemented | ItemOccurence.Pattern | ItemOccurence.Use | ItemOccurence.UseInType), _, _, _, _) ->
yield (r.Range, FSharpTokenColorKind.Pattern)
| CNR(_, Item.ActivePatternCase _,
(ItemOccurence.Binding | ItemOccurence.Implemented | ItemOccurence.Pattern | ItemOccurence.Use | ItemOccurence.UseInType), _, _, _, m) ->
yield (m, FSharpTokenColorKind.Pattern)
| _ -> ()
|]
member x.ScopeResolutions = sResolutions
Expand Down
5 changes: 4 additions & 1 deletion vsintegration/src/FSharp.Editor/ColorizationService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ type internal FSharpColorizationService() =
| FSharpTokenColorKind.PreprocessorKeyword -> ClassificationTypeNames.PreprocessorKeyword
| FSharpTokenColorKind.Operator -> ClassificationTypeNames.Operator
| FSharpTokenColorKind.TypeName -> ClassificationTypeNames.ClassName
| FSharpTokenColorKind.Default | _ -> ClassificationTypeNames.Text
| FSharpTokenColorKind.Pattern -> ClassificationTypeNames.EnumName
| FSharpTokenColorKind.Module -> ClassificationTypeNames.ModuleName
| FSharpTokenColorKind.Default
| _ -> ClassificationTypeNames.Text

static let scanSourceLine(sourceTokenizer: FSharpSourceTokenizer, textLine: TextLine, lineContents: string, lexState: FSharpTokenizerLexState) : SourceLineData =

Expand Down