Revert "Implement Go To Definition for Razor"

This reverts commit d0ec479.

It broke some normal usage of Go To Definition for C# files.

Author: sandyarmstrong

main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs

@@ -54,8 +54,6 @@ public class MonoDevelopContainedDocument : IMonoDevelopHostDocument
 		public IMonoDevelopContainedLanguageHost ContainedLanguageHost { get; private set; }
 		private readonly HostType _hostType;
 
-		public IProjectionBuffer TopBuffer => DataBuffer;
-
 		// _workspace will only be set once the Workspace is available
 		private Workspace _workspace;
 

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.RoslynServices/MonoDevelopDocumentNavigationService.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Composition;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
@@ -10,10 +9,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Projection;
 using MonoDevelop.Core;
-using MonoDevelop.Ide.Composition;
-using MonoDevelop.Ide.Editor.Projection;
 using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.Ide.RoslynServices
@@ -23,14 +19,11 @@ internal sealed class VisualStudioDocumentNavigationServiceFactory : IWorkspaceS
 	{
 		private readonly IDocumentNavigationService _singleton;
 
-		[Import]
-		public IBufferGraphFactoryService BufferGraphFactoryService { get; set; }
-
 		[ImportingConstructor]
 		[Obsolete (MefConstruction.ImportingConstructorMessage, error: true)]
 		private VisualStudioDocumentNavigationServiceFactory ()
 		{
-			_singleton = new MonoDevelopDocumentNavigationService (this);
+			_singleton = new MonoDevelopDocumentNavigationService ();
 		}
 
 		public IWorkspaceService CreateService (HostWorkspaceServices workspaceServices)
@@ -41,13 +34,6 @@ public IWorkspaceService CreateService (HostWorkspaceServices workspaceServices)
 
 	class MonoDevelopDocumentNavigationService : IDocumentNavigationService
 	{
-		private VisualStudioDocumentNavigationServiceFactory factory;
-
-		public MonoDevelopDocumentNavigationService (VisualStudioDocumentNavigationServiceFactory visualStudioDocumentNavigationServiceFactory)
-		{
-			this.factory = visualStudioDocumentNavigationServiceFactory;
-		}
-
 		public bool CanNavigateToSpan (Workspace workspace, DocumentId documentId, TextSpan textSpan)
 		{
 			// Navigation should not change the context of linked files and Shared Projects.
@@ -113,7 +99,7 @@ public bool TryNavigateToSpan (Workspace workspace, DocumentId documentId, TextS
 
 			Runtime.AssertMainThread ();
 
-			var document = workspace.CurrentSolution.GetDocument (documentId);
+			var document = OpenDocument (workspace, documentId, options);
 			if (document == null) {
 				return false;
 			}
@@ -141,7 +127,7 @@ public bool TryNavigateToLineAndOffset (Workspace workspace, DocumentId document
 
 			Runtime.AssertMainThread ();
 
-			var document = workspace.CurrentSolution.GetDocument (documentId);
+			var document = OpenDocument (workspace, documentId, options);
 			if (document == null) {
 				return false;
 			}
@@ -163,7 +149,7 @@ public bool TryNavigateToPosition (Workspace workspace, DocumentId documentId, i
 
 			Runtime.AssertMainThread ();
 
-			var document = workspace.CurrentSolution.GetDocument (documentId);
+			var document = OpenDocument (workspace, documentId, options);
 			if (document == null) {
 				return false;
 			}
@@ -236,41 +222,13 @@ private static Document OpenDocument (Workspace workspace, DocumentId documentId
 
 		private bool NavigateTo (Document document, TextSpan span)
 		{
-			string filePath = document.FilePath;
-			filePath = GetActualFilePathToOpen (filePath);
 			var proj = (document.Project.Solution.Workspace as MonoDevelopWorkspace)?.GetMonoProject (document.Project);
-			var task = IdeApp.Workbench.OpenDocument (new Gui.FileOpenInformation (filePath, proj) {
+			var task = IdeApp.Workbench.OpenDocument (new Gui.FileOpenInformation (document.FilePath, proj) {
 				Offset = span.Start
 			});
 			return true;
 		}
 
-		/// <summary>
-		/// Razor: Strip the .g.cs since we want to open the corresponding .cshtml or .razor document.
-		///
-		/// In Visual Studio for Windows the underlying C# buffer is added to the workspace with the
-		/// .cshtml or .razor extension (without the .g.cs) part, so they don't have to worry about
-		/// this. In our case we have an assumption somewhere that all C# documents in the workspace
-		/// have the .cs extension, so we're adding the .g.cs part that we need to strip here.
-		/// 
-		/// This is not great to hardcode application-specific logic here, but we don't anticipate
-		/// more scenarios where we want to open a different file than requested, so it doesn't
-		/// warrant an extension point at this time.
-		/// </summary>
-		string GetActualFilePathToOpen (string filePath)
-		{
-			if (filePath == null) {
-				return null;
-			}
-
-			if (filePath.EndsWith (".cshtml.g.cs", StringComparison.OrdinalIgnoreCase) ||
-				filePath.EndsWith (".razor.g.cs", StringComparison.OrdinalIgnoreCase)) {
-				filePath = filePath.Substring (0, filePath.Length - ".g.cs".Length);
-			}
-
-			return filePath;
-		}
-
 		private bool IsSecondaryBuffer (Workspace workspace, Document document)
 		{
 			var containedDocument = MonoDevelopHostDocumentRegistration.FromDocument (document);
@@ -281,33 +239,23 @@ private bool IsSecondaryBuffer (Workspace workspace, Document document)
 			return true;
 		}
 
-		public bool TryMapSpanFromSecondaryBufferToPrimaryBuffer (TextSpan spanInSecondaryBuffer, Microsoft.CodeAnalysis.Workspace workspace, Document document, out TextSpan spanInPrimaryBuffer)
+		public static bool TryMapSpanFromSecondaryBufferToPrimaryBuffer (TextSpan spanInSecondaryBuffer, Microsoft.CodeAnalysis.Workspace workspace, Document document, out TextSpan spanInPrimaryBuffer)
 		{
 			spanInPrimaryBuffer = default;
 
 			var containedDocument = MonoDevelopHostDocumentRegistration.FromDocument (document);
 			if (containedDocument == null) {
 				return false;
 			}
+			throw new NotImplementedException ();
+			//var bufferCoordinator = containedDocument.BufferCoordinator;
 
-			var projectionBuffer = containedDocument.TopBuffer;
-
-			var bufferGraph = factory.BufferGraphFactoryService.CreateBufferGraph (projectionBuffer);
+			//var primary = new VsTextSpan [1];
+			//var hresult = bufferCoordinator.MapSecondaryToPrimarySpan (spanInSecondaryBuffer, primary);
 
-			if (document.TryGetText(out var sourceText) && sourceText.Container.TryGetTextBuffer() is ITextBuffer languageBuffer) {
-				var secondarySnapshot = languageBuffer.CurrentSnapshot;
-				var snapshotSpanInSecondaryBuffer = new SnapshotSpan (secondarySnapshot, new Span (spanInSecondaryBuffer.Start, spanInSecondaryBuffer.Length));
-				var topBufferSnapshotSpan = bufferGraph.MapUpToSnapshot (
-					snapshotSpanInSecondaryBuffer,
-					SpanTrackingMode.EdgeExclusive,
-					projectionBuffer.CurrentSnapshot).FirstOrDefault();
-				if (topBufferSnapshotSpan != default) {
-					spanInPrimaryBuffer = new TextSpan (topBufferSnapshotSpan.Start, topBufferSnapshotSpan.Length);
-					return true;
-				}
-			}
+			//spanInPrimaryBuffer = primary [0];
 
-			return false;
+			//return ErrorHandler.Succeeded (hresult);
 		}
 
 		private bool CanMapFromSecondaryBufferToPrimaryBuffer (Workspace workspace, Document document, TextSpan spanInSecondaryBuffer)

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/IMonoDevelopHostDocument.cs

@@ -6,7 +6,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Projection;
 
 namespace MonoDevelop.Ide.TypeSystem
 {
@@ -16,8 +15,6 @@ interface IMonoDevelopHostDocument
 		/// Updates the text of the document.
 		/// </summary>
 		void UpdateText (SourceText newText);
-
-		IProjectionBuffer TopBuffer { get; }
 	}
 
 	static class MonoDevelopHostDocumentRegistration