Skip to content

Remove tokenizer cache from CommonHelpers.getColorizationData #1859

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
dsyme merged 1 commit into from
Nov 27, 2016
Merged

Remove tokenizer cache from CommonHelpers.getColorizationData #1859

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
3 changes: 1 addition & 2 deletions vsintegration/src/FSharp.Editor/CommonHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ module CommonHelpers =
i <- i + 1

let private dataCache = ConditionalWeakTable<DocumentId, SourceTextData>()
let private tokenizers = ConditionalWeakTable<(string list * string option), FSharpSourceTokenizer>()

let internal compilerTokenToRoslynToken(colorKind: FSharpTokenColorKind) : string =
match colorKind with
Expand Down Expand Up @@ -98,7 +97,7 @@ module CommonHelpers =

let getColorizationData(documentKey: DocumentId, sourceText: SourceText, textSpan: TextSpan, fileName: string option, defines: string list, cancellationToken: CancellationToken) : List<ClassifiedSpan> =
try
let sourceTokenizer = tokenizers.GetValue ((defines, fileName), fun _ -> FSharpSourceTokenizer(defines, fileName))
let sourceTokenizer = FSharpSourceTokenizer(defines, fileName)
let lines = sourceText.Lines
// We keep incremental data per-document. When text changes we correlate text line-by-line (by hash codes of lines)
let sourceTextData = dataCache.GetValue(documentKey, fun key -> SourceTextData(lines.Count))
Expand Down