Merge pull request #743 from xamarin/backport-pr-734-to-master-vnext

[master-vnext] Fix content type from mime type calculations.

Author: slluis

main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs

@@ -660,8 +660,7 @@ private void HandleTextBufferChanged (object sender, TextContentChangedEventArgs
 		static readonly string[] textContentType = { "text" };
 
 		IContentType GetContentTypeFromMimeType (string filePath, string mimeType)
-			=> Ide.MimeTypeCatalog.Instance.GetContentTypeForMimeType (mimeType)
-				?? (FilePath != null ? Ide.Composition.CompositionManager.Instance.GetExportedValue<IFileToContentTypeService> ().GetContentTypeForFilePath (FilePath) : null)
+			=> Ide.MimeTypeCatalog.Instance.GetContentTypeForMimeType (mimeType, filePath)
 				?? Microsoft.VisualStudio.Platform.PlatformCatalog.Instance.ContentTypeRegistryService.UnknownContentType;
 
 		protected internal override ProjectReloadCapability OnGetProjectReloadCapability () => ProjectReloadCapability.Full;

main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/TextDocument.cs

@@ -78,7 +78,7 @@ public string MimeType {
 				}
 
 				mimeType = value;
-				var newContentType = MimeTypeCatalog.Instance.GetContentTypeForMimeType (value) ?? PlatformCatalog.Instance.ContentTypeRegistryService.UnknownContentType;
+				var newContentType = MimeTypeCatalog.Instance.GetContentTypeForMimeType (value, FileName) ?? PlatformCatalog.Instance.ContentTypeRegistryService.UnknownContentType;
 				if (TextBuffer != null && TextBuffer.CurrentSnapshot.ContentType != newContentType) {
 					TextBuffer.ChangeContentType (newContentType, null);
 				}
@@ -362,8 +362,7 @@ void TextBufferFileModel_TextBufferInstanceChanged (object sender, EventArgs e)
 		}
 
 		IContentType GetContentTypeFromMimeType (string fileName, string mimeType)
-			=> MimeTypeCatalog.Instance.GetContentTypeForMimeType (mimeType)
-				?? (fileName != null ? MonoDevelop.Ide.Composition.CompositionManager.Instance.GetExportedValue<IFileToContentTypeService> ().GetContentTypeForFilePath (fileName) : null)
+			=> MimeTypeCatalog.Instance.GetContentTypeForMimeType (mimeType, fileName)
 				?? PlatformCatalog.Instance.ContentTypeRegistryService.UnknownContentType;
 
 		public static TextDocument CreateImmutableDocument (string text, bool suppressHighlighting = true)

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Documents/TextBufferFileModel.cs

@@ -125,34 +125,18 @@ protected override Task OnSave ()
 
 			ITextDocument CreateTextDocument (string text)
 			{
-				var contentType = (MimeType == null) ? PlatformCatalog.Instance.TextBufferFactoryService.InertContentType : GetContentTypeFromMimeType (FilePath, MimeType);
+				var contentType = (MimeType == null)
+					? PlatformCatalog.Instance.TextBufferFactoryService.InertContentType
+					: GetContentTypeFromMimeType (FilePath, MimeType);
 				var buffer = PlatformCatalog.Instance.TextBufferFactoryService.CreateTextBuffer (text, contentType);
 				var doc = PlatformCatalog.Instance.TextDocumentFactoryService.CreateTextDocument (buffer, FilePath.ToString () ?? "");
 				return doc;
 			}
 
 			protected static IContentType GetContentTypeFromMimeType (string filePath, string mimeType)
 			{
-				if (filePath != null) {
-					var fileToContentTypeService = CompositionManager.Instance.GetExportedValue<IFileToContentTypeService> ();
-					var contentTypeFromPath = fileToContentTypeService.GetContentTypeForFilePath (filePath);
-					if (contentTypeFromPath != null &&
-						contentTypeFromPath != PlatformCatalog.Instance.ContentTypeRegistryService.UnknownContentType) {
-						return contentTypeFromPath;
-					}
-				}
-				var contentType = MimeTypeCatalog.Instance.GetContentTypeForMimeType (mimeType);
-				if (contentType == null) {
-					// fallback 1: see if there is a content tyhpe with the same name
-					contentType = PlatformCatalog.Instance.ContentTypeRegistryService.GetContentType (mimeType);
-					if (contentType == null) {
-						// No joy, create a content type that, by default, derives from text. This is strictly an error
-						// (there should be mappings between any mime type and any content type).
-						contentType = PlatformCatalog.Instance.ContentTypeRegistryService.AddContentType (mimeType, new string [] { "text" });
-					}
-				}
-
-				return contentType;
+				return MimeTypeCatalog.Instance.GetContentTypeForMimeType (mimeType, filePath)
+					?? PlatformCatalog.Instance.ContentTypeRegistryService.GetContentType ("text");
 			}
 
 			void SetTextDocument (ITextDocument doc)

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MimeTypeCatalog.cs

@@ -191,8 +191,15 @@ public string GetMimeTypeForContentType (IContentType contentType)
 		public IEnumerable<string> GetMimeTypeInheritanceChainForContentType (IContentType contentType)
 			=> GetMimeTypeInheritanceChain (GetMimeTypeNodeForContentType (contentType.TypeName));
 
-		public IContentType GetContentTypeForMimeType (string mimeType)
+		public IContentType GetContentTypeForMimeType (string mimeType, string filePath = null)
 		{
+			if (filePath != null) {
+				var contentType = Ide.Composition.CompositionManager.Instance.GetExportedValue<IFileToContentTypeService> ().GetContentTypeForFilePath (filePath);
+				if (contentType != null && contentType != PlatformCatalog.Instance.ContentTypeRegistryService.UnknownContentType) {
+					return contentType;
+				}
+			}
+
 			if (mimeType != null) {
 				var node = FindMimeType (mimeType);
 				foreach (var mt in GetMimeTypeNodeInheritanceChain (node)) {