Renames

src/VisualStudio/Core/Def/Implementation/DesignerAttribute/IDesignerAttributeService.cs → src/VisualStudio/Core/Def/Implementation/DesignerAttribute/IVisualStudioDesignerAttributeService.cs

@@ -11,7 +11,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.DesignerAttribu
     /// In process service responsible for listening to OOP notifications whether or not a file is
     /// designable  and then notifying the respective project systems about that information.
     /// </summary>
-    internal interface IDesignerAttributeService : IWorkspaceService
+    internal interface IVisualStudioDesignerAttributeService : IWorkspaceService
     {
         /// <summary>
         /// Called by a host to let this service know that it should start background

src/VisualStudio/Core/Def/Implementation/DesignerAttribute/VisualStudioDesignerAttributeService.cs

@@ -28,7 +28,7 @@
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.DesignerAttribute
 {
     internal class VisualStudioDesignerAttributeService
-        : ForegroundThreadAffinitizedObject, IDesignerAttributeService, IDesignerAttributeListener
+        : ForegroundThreadAffinitizedObject, IVisualStudioDesignerAttributeService, IDesignerAttributeListener
     {
         private readonly VisualStudioWorkspaceImpl _workspace;
 
@@ -85,7 +85,7 @@ private void OnWorkspaceChanged(object sender, WorkspaceChangeEventArgs e)
                 _cpsProjects.TryRemove(e.ProjectId, out _);
         }
 
-        void IDesignerAttributeService.Start(CancellationToken cancellationToken)
+        void IVisualStudioDesignerAttributeService.Start(CancellationToken cancellationToken)
             => _ = StartAsync(cancellationToken);
 
         private async Task StartAsync(CancellationToken cancellationToken)

src/VisualStudio/Core/Def/Implementation/DesignerAttribute/VisualStudioDesignerAttributeServiceFactory.cs

@@ -11,7 +11,7 @@
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.DesignerAttribute
 {
-    [ExportWorkspaceServiceFactory(typeof(IDesignerAttributeService), ServiceLayer.Host), Shared]
+    [ExportWorkspaceServiceFactory(typeof(IVisualStudioDesignerAttributeService), ServiceLayer.Host), Shared]
     internal class VisualStudioDesignerAttributeServiceFactory : IWorkspaceServiceFactory
     {
         private readonly IThreadingContext _threadingContext;

src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/IProjectTelemetryService.cs → src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/IVisualStudioProjectTelemetryService.cs

@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectTelemetr
     /// <summary>
     /// In process service responsible for listening to OOP telemetry notifications.
     /// </summary>
-    internal interface IProjectTelemetryService : IWorkspaceService
+    internal interface IVisualStudioProjectTelemetryService : IWorkspaceService
     {
         /// <summary>
         /// Called by a host to let this service know that it should start background

src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/VisualStudioProjectTelemetryService.cs

@@ -22,7 +22,7 @@
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectTelemetry
 {
     internal class VisualStudioProjectTelemetryService
-        : ForegroundThreadAffinitizedObject, IProjectTelemetryService, IProjectTelemetryListener
+        : ForegroundThreadAffinitizedObject, IVisualStudioProjectTelemetryService, IProjectTelemetryListener
     {
         private const string EventPrefix = "VS/Compilers/Compilation/";
         private const string PropertyPrefix = "VS.Compilers.Compilation.Inputs.";
@@ -55,7 +55,7 @@ internal class VisualStudioProjectTelemetryService
         public VisualStudioProjectTelemetryService(VisualStudioWorkspaceImpl workspace, IThreadingContext threadingContext) : base(threadingContext)
             => _workspace = workspace;
 
-        void IProjectTelemetryService.Start(CancellationToken cancellationToken)
+        void IVisualStudioProjectTelemetryService.Start(CancellationToken cancellationToken)
             => _ = StartAsync(cancellationToken);
 
         private async Task StartAsync(CancellationToken cancellationToken)

src/VisualStudio/Core/Def/Implementation/ProjectTelemetry/VisualStudioProjectTelemetryServiceFactory.cs

@@ -13,7 +13,7 @@
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectTelemetry
 {
-    [ExportWorkspaceServiceFactory(typeof(IProjectTelemetryService), ServiceLayer.Host), Shared]
+    [ExportWorkspaceServiceFactory(typeof(IVisualStudioProjectTelemetryService), ServiceLayer.Host), Shared]
     internal class VisualStudioProjectTelemetryServiceFactory : IWorkspaceServiceFactory
     {
         private readonly IThreadingContext _threadingContext;

src/VisualStudio/Core/Def/Implementation/TodoComments/ITodoCommentsService.cs → src/VisualStudio/Core/Def/Implementation/TodoComments/IVisualStudioTodoCommentsService.cs

@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.TodoComments
     /// <summary>
     /// In process service responsible for listening to OOP todo comment notifications.
     /// </summary>
-    internal interface ITodoCommentsService : IWorkspaceService
+    internal interface IVisualStudioTodoCommentsService : IWorkspaceService
     {
         /// <summary>
         /// Called by a host to let this service know that it should start background

src/VisualStudio/Core/Def/Implementation/TodoComments/VisualStudioTodoCommentsService.cs

@@ -26,7 +26,7 @@
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.TodoComments
 {
     internal class VisualStudioTodoCommentsService
-        : ForegroundThreadAffinitizedObject, ITodoCommentsService, ITodoCommentsListener, ITodoListProvider
+        : ForegroundThreadAffinitizedObject, IVisualStudioTodoCommentsService, ITodoCommentsListener, ITodoListProvider
     {
         private readonly VisualStudioWorkspaceImpl _workspace;
         private readonly EventListenerTracker<ITodoListProvider> _eventListenerTracker;
@@ -65,7 +65,7 @@ private void OnWorkspaceChanged(object sender, WorkspaceChangeEventArgs e)
                 _documentToInfos.TryRemove(e.DocumentId, out _);
         }
 
-        void ITodoCommentsService.Start(CancellationToken cancellationToken)
+        void IVisualStudioTodoCommentsService.Start(CancellationToken cancellationToken)
             => _ = StartAsync(cancellationToken);
 
         private async Task StartAsync(CancellationToken cancellationToken)
@@ -120,7 +120,7 @@ private async Task StartWorkerAsync(CancellationToken cancellationToken)
         /// <summary>
         /// Callback from the OOP service back into us.
         /// </summary>
-        public Task ReportTodoCommentsAsync(DocumentId documentId, List<TodoCommentData> infos, CancellationToken cancellationToken)
+        public Task ReportTodoCommentDataAsync(DocumentId documentId, List<TodoCommentData> infos, CancellationToken cancellationToken)
         {
             _workQueue.AddWork(new DocumentAndComments(documentId, infos.ToImmutableArray()));
             return Task.CompletedTask;

src/VisualStudio/Core/Def/Implementation/TodoComments/VisualStudioTodoCommentsServiceFactory.cs

@@ -16,7 +16,7 @@
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.TodoComments
 {
     [Export(typeof(ITodoListProvider))]
-    [ExportWorkspaceServiceFactory(typeof(ITodoCommentsService), ServiceLayer.Host), Shared]
+    [ExportWorkspaceServiceFactory(typeof(IVisualStudioTodoCommentsService), ServiceLayer.Host), Shared]
     internal class VisualStudioTodoCommentsServiceFactory : IWorkspaceServiceFactory
     {
         private readonly IThreadingContext _threadingContext;

src/VisualStudio/Core/Def/RoslynPackage.cs

@@ -159,15 +159,15 @@ private async Task LoadComponentsBackgroundAsync(CancellationToken cancellationT
 
             // Load the designer attribute service and tell it to start watching the solution for
             // designable files.
-            var designerAttributeService = _workspace.Services.GetRequiredService<IDesignerAttributeService>();
+            var designerAttributeService = _workspace.Services.GetRequiredService<IVisualStudioDesignerAttributeService>();
             designerAttributeService.Start(this.DisposalToken);
 
             // Load the telemetry service and tell it to start watching the solution for project info.
-            var projectTelemetryService = _workspace.Services.GetRequiredService<IProjectTelemetryService>();
+            var projectTelemetryService = _workspace.Services.GetRequiredService<IVisualStudioProjectTelemetryService>();
             projectTelemetryService.Start(this.DisposalToken);
 
             // Load the todo comments service and tell it to start watching the solution for new comments
-            var todoCommentsService = _workspace.Services.GetRequiredService<ITodoCommentsService>();
+            var todoCommentsService = _workspace.Services.GetRequiredService<IVisualStudioTodoCommentsService>();
             todoCommentsService.Start(this.DisposalToken);
         }
 

src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs

@@ -220,7 +220,7 @@ private class DesignerListener : IDesignerAttributeListener
             private readonly TaskCompletionSource<IList<DesignerAttributeData>> _infosSource = new TaskCompletionSource<IList<DesignerAttributeData>>();
             public Task<IList<DesignerAttributeData>> Infos => _infosSource.Task;
 
-            public Task RegisterDesignerAttributesAsync(IList<DesignerAttributeData> infos, CancellationToken cancellationToken)
+            public Task ReportDesignerAttributeDataAsync(IList<DesignerAttributeData> infos, CancellationToken cancellationToken)
             {
                 _infosSource.SetResult(infos);
                 return Task.CompletedTask;