From 2b470697419b5580d406d60d6af6b2911e25b7a1 Mon Sep 17 00:00:00 2001
From: Jason Malinowski <jason.malinowski@microsoft.com>
Date: Fri, 9 Mar 2018 14:56:15 -0800
Subject: [PATCH] Remove virtual method that we can now write directly

VisualStudioWorkspace had a virtual method to send a call over to
the code model logic. Since we now have the requisite interface callable
directly, we should just call it directly. It also saves us the trouble
of passing a DocumentId only to re-decompose the type again.
---
 .../ProjectSystem/DocumentProvider.cs         |  2 +-
 .../ProjectSystem/VisualStudioWorkspace.cs    |  2 --
 .../Core/Impl/RoslynVisualStudioWorkspace.cs  | 24 -------------------
 .../MockVisualStudioWorkspace.vb              |  4 ----
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.cs
index 81f79a41706..0b3810347c2 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.cs
@@ -635,7 +635,7 @@ private void RenameFileCodeModelInstances(uint docCookie, string oldMoniker, str
             {
                 if (document.Project.Workspace is VisualStudioWorkspace workspace)
                 {
-                    workspace.RenameFileCodeModelInstance(document.Id, newMoniker);
+                    document.Project.ProjectCodeModel?.OnSourceFileRenaming(document.FilePath, newMoniker);
                 }
             }
         }
diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspace.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspace.cs
index c46c0a8c987..e575017a2d6 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspace.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspace.cs
@@ -100,8 +100,6 @@ protected override void OnDocumentClosing(DocumentId documentId)
         /// </summary>
         public abstract EnvDTE.FileCodeModel GetFileCodeModel(DocumentId documentId);
 
-        internal abstract bool RenameFileCodeModelInstance(DocumentId documentId, string newFilePath);
-
         internal abstract object GetBrowseObject(SymbolListItem symbolListItem);
 
         public abstract bool TryGoToDefinition(ISymbol symbol, Project project, CancellationToken cancellationToken);
diff --git a/src/VisualStudio/Core/Impl/RoslynVisualStudioWorkspace.cs b/src/VisualStudio/Core/Impl/RoslynVisualStudioWorkspace.cs
index dc51b9aa552..655ab5475a1 100644
--- a/src/VisualStudio/Core/Impl/RoslynVisualStudioWorkspace.cs
+++ b/src/VisualStudio/Core/Impl/RoslynVisualStudioWorkspace.cs
@@ -75,30 +75,6 @@ public override EnvDTE.FileCodeModel GetFileCodeModel(DocumentId documentId)
             return null;
         }
 
-        internal override bool RenameFileCodeModelInstance(DocumentId documentId, string newFilePath)
-        {
-            if (documentId == null)
-            {
-                return false;
-            }
-
-            var project = DeferredState.ProjectTracker.GetProject(documentId.ProjectId);
-            if (project == null)
-            {
-                return false;
-            }
-
-            var document = project.GetDocumentOrAdditionalDocument(documentId);
-            if (document == null)
-            {
-                return false;
-            }
-
-            project.ProjectCodeModel?.OnSourceFileRenaming(document.FilePath, newFilePath);
-
-            return true;
-        }
-
         internal override IInvisibleEditor OpenInvisibleEditor(DocumentId documentId)
         {
             var hostDocument = GetHostDocument(documentId);
diff --git a/src/VisualStudio/TestUtilities2/MockVisualStudioWorkspace.vb b/src/VisualStudio/TestUtilities2/MockVisualStudioWorkspace.vb
index 105e339d74d..3cc42216925 100644
--- a/src/VisualStudio/TestUtilities2/MockVisualStudioWorkspace.vb
+++ b/src/VisualStudio/TestUtilities2/MockVisualStudioWorkspace.vb
@@ -85,10 +85,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
         Friend Function GetFileCodeModelComHandle(id As DocumentId) As ComHandle(Of EnvDTE80.FileCodeModel2, FileCodeModel)
             Return _fileCodeModels(id)
         End Function
-
-        Friend Overrides Function RenameFileCodeModelInstance(documentId As DocumentId, newFilePath As String) As Boolean
-            Throw New NotImplementedException()
-        End Function
     End Class
 
     Public Class MockInvisibleEditor
-- 
GitLab