33namespace Microsoft.VisualStudio.FSharp.Editor
44
55open System
6- open System.Composition
76open System.ComponentModel .Composition
87open System.Windows .Media
98
@@ -46,11 +45,9 @@ module internal FSharpClassificationTypes =
4645| SemanticClassificationType.Property-> Property
4746| SemanticClassificationType.Interface-> Interface
4847
49-
50-
5148module internal ClassificationDefinitions =
5249
53- [<Export; Shared >]
50+ [<Export>]
5451type internal ThemeColors
5552[<ImportingConstructor>]
5653(
@@ -99,7 +96,7 @@ module internal ClassificationDefinitions =
9996do VSColorTheme.add_ ThemeChanged handler
10097interface IDisposablewith member __.Dispose () = VSColorTheme.remove_ ThemeChanged handler
10198
102- member __.getColor ( ctype ) =
99+ member __.GetColor ( ctype ) =
103100let light , dark = colorData|> Map.ofList|> Map.find ctype
104101match getCurrentThemeId() with
105102| LighTheme-> Nullable light
@@ -127,7 +124,7 @@ module internal ClassificationDefinitions =
127124inherit ClassificationFormatDefinition()
128125
129126do self.DisplayName<- SR.FSharpFunctionsOrMethodsClassificationType.Value
130- self.ForegroundColor<- theme.getColor FSharpClassificationTypes.Function
127+ self.ForegroundColor<- theme.GetColor FSharpClassificationTypes.Function
131128
132129[<Export( typeof< EditorFormatDefinition>) >]
133130[<ClassificationType( ClassificationTypeNames= FSharpClassificationTypes.MutableVar) >]
@@ -138,7 +135,7 @@ module internal ClassificationDefinitions =
138135inherit ClassificationFormatDefinition()
139136
140137do self.DisplayName<- SR.FSharpMutableVarsClassificationType.Value
141- self.ForegroundColor<- theme.getColor FSharpClassificationTypes.MutableVar
138+ self.ForegroundColor<- theme.GetColor FSharpClassificationTypes.MutableVar
142139
143140[<Export( typeof< EditorFormatDefinition>) >]
144141[<ClassificationType( ClassificationTypeNames= FSharpClassificationTypes.Printf) >]
@@ -149,7 +146,7 @@ module internal ClassificationDefinitions =
149146inherit ClassificationFormatDefinition()
150147
151148do self.DisplayName<- SR.FSharpPrintfFormatClassificationType.Value
152- self.ForegroundColor<- theme.getColor FSharpClassificationTypes.Printf
149+ self.ForegroundColor<- theme.GetColor FSharpClassificationTypes.Printf
153150
154151[<Export( typeof< EditorFormatDefinition>) >]
155152[<ClassificationType( ClassificationTypeNames= FSharpClassificationTypes.Property) >]
@@ -160,4 +157,4 @@ module internal ClassificationDefinitions =
160157inherit ClassificationFormatDefinition()
161158
162159do self.DisplayName<- SR.FSharpPropertiesClassificationType.Value
163- self.ForegroundColor<- theme.getColor FSharpClassificationTypes.Property
160+ self.ForegroundColor<- theme.GetColor FSharpClassificationTypes.Property