Merge pull request #573 from Microsoft/JadeMefError

#530 Fix MEF errors on Jade files
microsoft · Oct 30, 2015 · 1b3c01f · 1b3c01f
2 parents fb5c884 + 94d84a6
commit 1b3c01f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Nodejs/Product/Nodejs/ClassifierProviderMetadata.cs b/Nodejs/Product/Nodejs/ClassifierProviderMetadata.cs
@@ -22,11 +22,7 @@ namespace Microsoft.NodejsTools {
     /// Just used for our MEF import to get the metadata in a strongly
     /// typed way.
     /// </summary>
-    sealed class ClassifierProviderMetadata {
-        public readonly IEnumerable<string> ContentTypes;
-
-        public ClassifierProviderMetadata(IDictionary<string, object> values) {
-            ContentTypes = (IEnumerable<string>)values["ContentTypes"];
-        }
+    public interface IClassifierProviderMetadata {
+        IEnumerable<string> ContentTypes { get; }
     }
 }
diff --git a/Nodejs/Product/Nodejs/Jade/Classifier/JadeClassifierProvider.cs b/Nodejs/Product/Nodejs/Jade/Classifier/JadeClassifierProvider.cs
@@ -38,7 +38,7 @@ internal sealed class JadeClassifierProvider : IClassifierProvider {
             ITextBufferFactoryService bufferFact,
             IContentTypeRegistryService contentTypeService,
             [ImportMany(typeof(ITaggerProvider))]Lazy<ITaggerProvider, TaggerProviderMetadata>[] taggerProviders,
-            [ImportMany(typeof(IClassifierProvider))]Lazy<IClassifierProvider, ClassifierProviderMetadata>[] classifierProviders) {
+            [ImportMany(typeof(IClassifierProvider))]Lazy<IClassifierProvider, IClassifierProviderMetadata>[] classifierProviders) {
             ClassificationRegistryService = registryService;
             BufferFactoryService = bufferFact;
             JsContentType = contentTypeService.GetContentType(NodejsConstants.JavaScript);