Organize namespaces

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ActivityLogRazorLogger.cs

@@ -9,7 +9,7 @@ using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(RazorLogger))]
 internal class ActivityLogRazorLogger : RazorLogger

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/AggregateProjectCapabilityResolver.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(AggregateProjectCapabilityResolver))]
 internal class AggregateProjectCapabilityResolver : ProjectCapabilityResolver

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DocumentInteractionManager.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal abstract class DocumentInteractionManager
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/EditorDocument.cs

@@ -5,7 +5,7 @@ using System;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;
 

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/EditorDocumentManager.cs

@@ -7,7 +7,7 @@ using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;
 

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioEditorDocumentManager.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTracker.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Extensions/IUIThreadOperationExecutorExtensions.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.VisualStudio.Threading;
 using Microsoft.VisualStudio.Utilities;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Extensions;
+namespace Microsoft.VisualStudio.Razor.Extensions;
 
 internal static class IUIThreadOperationExecutorExtensions
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Extensions/IVsHierarchyExtensions.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor.Extensions;
 
 internal static class IVsHierarchyExtensions
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Extensions/JoinableTaskContextExtensions.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor.Extensions;
 
 internal static class JoinableTaskContextExtensions
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Extensions/TextBufferExtensions.cs

@@ -4,11 +4,11 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Shell.Interop;
+using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.Text;
+namespace Microsoft.VisualStudio.Razor.Extensions;
 
 internal static class TextBufferExtensions
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ILiveShareProjectPathProvider.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.VisualStudio.Text;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal interface ILiveShareProjectPathProvider
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/IProjectWorkspaceStateGenerator.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal interface IProjectWorkspaceStateGenerator
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/CSharpVirtualDocumentAddListener.cs

@@ -6,7 +6,6 @@ using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.Utilities;
 

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/CSharpVirtualDocumentFactory.cs

@@ -12,7 +12,6 @@ using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.Client;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.Razor.DynamicFiles;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/CSharpVirtualDocumentPublisher.cs

@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.Razor.DynamicFiles;
 using Microsoft.VisualStudio.Razor.LanguageClient.DocumentMapping;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/HtmlVirtualDocumentFactory.cs

@@ -5,7 +5,6 @@ using System;
 using System.ComponentModel.Composition;
 using Microsoft.AspNetCore.Razor.Telemetry;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Utilities;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorContentTypeChangeListener.cs

@@ -4,7 +4,6 @@
 using System;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorFilePathToContentTypeProviderBase.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorLSPContentTypeDefinition.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.Client;
 using Microsoft.VisualStudio.Utilities;
 

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/RazorLanguageServerClient.cs

@@ -17,7 +17,6 @@ using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Razor.Workspaces.Protocol.ProjectSystem;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.Client;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/ViewCodeCommandHandler.cs

@@ -10,7 +10,6 @@ using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
 using Microsoft.VisualStudio.Commanding;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 using Microsoft.VisualStudio.Threading;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/GuestProjectPathProvider.cs

@@ -6,11 +6,10 @@ using System.ComponentModel.Composition;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Threading;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 [Export(typeof(ILiveShareProjectPathProvider))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/ILiveShareSessionAccessor.cs

@@ -1,7 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+using Microsoft.VisualStudio.LiveShare;
+
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 internal interface ILiveShareSessionAccessor
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/IProxyAccessor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 internal interface IProxyAccessor
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/LiveShareSessionAccessor.cs

@@ -2,8 +2,9 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
+using Microsoft.VisualStudio.LiveShare;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 [Export(typeof(ILiveShareSessionAccessor))]
 internal class LiveShareSessionAccessor : ILiveShareSessionAccessor
@@ -12,7 +13,7 @@ internal class LiveShareSessionAccessor : ILiveShareSessionAccessor
     private bool _guestSessionIsActive;
 
     // We have a separate IsGuestSessionActive to avoid loading LiveShare dlls unnecessarily.
-    public  bool IsGuestSessionActive => _guestSessionIsActive;
+    public bool IsGuestSessionActive => _guestSessionIsActive;
     public CollaborationSession? Session => _currentSession;
 
     public void SetSession(CollaborationSession? session)

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/ProjectSnapshotSynchronizationService.cs

@@ -7,10 +7,11 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Threading;
 using IAsyncDisposable = Microsoft.VisualStudio.Threading.IAsyncDisposable;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 internal class ProjectSnapshotSynchronizationService(
     CollaborationSession sessionContext,

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/ProjectSnapshotSynchronizationServiceFactory.cs

@@ -6,11 +6,12 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.LiveShare.Razor.Serialization;
+using Microsoft.VisualStudio.LiveShare;
+using Microsoft.VisualStudio.Razor.LiveShare.Serialization;
 using Microsoft.VisualStudio.Threading;
 using Newtonsoft.Json;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 [ExportCollaborationService(typeof(ProjectSnapshotSynchronizationService), Scope = SessionScope.Guest)]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/ProxyAccessor.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.Composition;
 using System.Threading;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 [Export(typeof(IProxyAccessor))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Guest/RazorGuestInitializationService.cs

@@ -8,13 +8,14 @@ using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor;
+using Microsoft.VisualStudio.LiveShare;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Guest;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Guest;
 
 [ExportCollaborationService(typeof(SessionActiveDetector), Scope = SessionScope.Guest)]
 [method: ImportingConstructor]
 internal class RazorGuestInitializationService(
-    [Import(typeof(ILiveShareSessionAccessor))] LiveShareSessionAccessor sessionAccessor) : ICollaborationServiceFactory
+[Import(typeof(ILiveShareSessionAccessor))] LiveShareSessionAccessor sessionAccessor) : ICollaborationServiceFactory
 {
     private const string ViewImportsFileName = "_ViewImports.cshtml";
     private readonly LiveShareSessionAccessor _sessionAccessor = sessionAccessor;
@@ -95,11 +96,11 @@ internal class RazorGuestInitializationService(
 
 internal class SessionActiveDetector(Action onDispose) : ICollaborationService, IDisposable
 {
-    private readonly Action _onDispose = onDispose ?? throw new ArgumentNullException(nameof(onDispose));
+private readonly Action _onDispose = onDispose ?? throw new ArgumentNullException(nameof(onDispose));
 
-    [SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize", Justification = "https://github.com/dotnet/roslyn-analyzers/issues/4801")]
-    public virtual void Dispose()
-    {
-        _onDispose();
-    }
+[SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize", Justification = "https://github.com/dotnet/roslyn-analyzers/issues/4801")]
+public virtual void Dispose()
+{
+    _onDispose();
+}
 }

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Host/ProjectHierarchyProxy.cs

@@ -4,11 +4,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Host;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Host;
 
 internal class ProjectHierarchyProxy(
     CollaborationSession session,

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Host/ProjectHierarchyProxyFactory.cs

@@ -5,10 +5,11 @@ using System;
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Host;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Host;
 
 [ExportCollaborationService(
     typeof(IProjectHierarchyProxy),

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Host/ProjectSnapshotManagerProxy.cs

@@ -8,9 +8,10 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Host;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Host;
 
 internal class ProjectSnapshotManagerProxy : IProjectSnapshotManagerProxy, ICollaborationService, IDisposable
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Host/ProjectSnapshotManagerProxyFactory.cs

@@ -5,11 +5,12 @@ using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.LiveShare.Razor.Serialization;
+using Microsoft.VisualStudio.LiveShare;
+using Microsoft.VisualStudio.Razor.LiveShare.Serialization;
 using Microsoft.VisualStudio.Threading;
 using Newtonsoft.Json;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Host;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Host;
 
 [ExportCollaborationService(
     typeof(IProjectSnapshotManagerProxy),

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/IProjectHierarchyProxy.cs

@@ -5,7 +5,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 // This type must be a public interface in order to to be implemented as an RPC proxy by live share.
 public interface IProjectHierarchyProxy

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/IProjectSnapshotManagerProxy.cs

@@ -5,7 +5,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 // This type must be a public interface in order to to be implemented as an RPC proxy by live share.
 public interface IProjectSnapshotManagerProxy

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/IRemoteHierarchyService.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.LiveShare;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 // This type must be a public interface in order to to be implemented as an RPC proxy by live share.
 public interface IRemoteHierarchyService : ICollaborationService

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/LiveShareProjectCapabilityResolver.cs

@@ -3,11 +3,10 @@
 
 using System.ComponentModel.Composition;
 using System.Threading;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.LiveShare.Razor.Guest;
+using Microsoft.VisualStudio.Razor.LiveShare.Guest;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 [Export(typeof(ProjectCapabilityResolver))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/ProjectChangeEventProxyArgs.cs

@@ -4,7 +4,7 @@
 using System;
 using Microsoft.AspNetCore.Razor;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 // This type must be public because it is exposed by a public interface that is implemented as
 // an RPC proxy by live share.

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/ProjectProxyChangeKind.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 // This type must be public because it is exposed by a public interface that is implemented as
 // an RPC proxy by live share.

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/ProjectSnapshotHandleProxy.cs

@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 // This type must be public because it is exposed by a public interface that is implemented as
 // an RPC proxy by live share. However, its properties and constructor are intentionally internal

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/ProjectSnapshotManagerProxyState.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 // This type must be public because it is exposed by a public interface that is implemented as
 // an RPC proxy by live share.

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/RemoteHierarchyService.cs

@@ -4,11 +4,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 internal class RemoteHierarchyService(CollaborationSession session, JoinableTaskFactory jtf) : IRemoteHierarchyService
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/RemoteHierarchyServiceFactory.cs

@@ -4,10 +4,11 @@
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.LiveShare;
 using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor;
+namespace Microsoft.VisualStudio.Razor.LiveShare;
 
 /// <summary>
 /// In cloud scenarios a client will not have a project system which means any code running on the client needs to have the ability to

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Serialization/LiveShareJsonConverterCollectionExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Serialization;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Serialization;
 
 internal static class LiveShareJsonConverterCollectionExtensions
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LiveShare/Serialization/ProjectSnapshotHandleProxyJsonConverter.cs

@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Razor.ProjectSystem;
 using Microsoft.AspNetCore.Razor.Serialization.Json;
 
-namespace Microsoft.VisualStudio.LiveShare.Razor.Serialization;
+namespace Microsoft.VisualStudio.Razor.LiveShare.Serialization;
 
 internal class ProjectSnapshotHandleProxyJsonConverter : ObjectJsonConverter<ProjectSnapshotHandleProxy>
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Logging/OutputWindowLoggerProvider.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Razor.Settings;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LspServerActivationTracker.cs

@@ -4,7 +4,7 @@
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(ILspServerActivationTracker))]
 internal class LspServerActivationTracker : ILspServerActivationTracker
@@ -13,11 +13,11 @@ internal class LspServerActivationTracker : ILspServerActivationTracker
 
     public void Activated()
     {
-        this.IsActive = true;
+        IsActive = true;
     }
 
     public void Deactivated()
     {
-        this.IsActive = false;
+        IsActive = false;
     }
 }

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectCapabilityResolver.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal abstract class ProjectCapabilityResolver
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackProjectManager.cs

@@ -11,7 +11,6 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/VisualStudioProjectEngineFactoryProvider.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.Composition;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor.ProjectSystem;
 
 [Export(typeof(IProjectEngineFactoryProvider))]
 internal sealed class VisualStudioProjectEngineFactoryProvider : IProjectEngineFactoryProvider

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/VisualStudioProjectSnapshotManager.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor.ProjectSystem;
 
 [Export(typeof(IProjectSnapshotManager))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/WindowsRazorProjectHostBase.cs

@@ -12,7 +12,6 @@ using System.Threading.Tasks.Dataflow;
 using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.ProjectSystem;
 using Microsoft.VisualStudio.ProjectSystem.Properties;
 using Microsoft.VisualStudio.Threading;

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectWorkspaceStateGenerator.cs

@@ -16,7 +16,7 @@ using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(IProjectWorkspaceStateGenerator))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/PublicAPI/PublicAPI.Shipped.txt

@@ -1,23 +1,23 @@
 #nullable enable
-Microsoft.VisualStudio.LiveShare.Razor.IProjectHierarchyProxy
-Microsoft.VisualStudio.LiveShare.Razor.IProjectHierarchyProxy.GetProjectPathAsync(System.Uri! documentFilePath, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Uri?>!
-Microsoft.VisualStudio.LiveShare.Razor.IProjectSnapshotManagerProxy
-Microsoft.VisualStudio.LiveShare.Razor.IProjectSnapshotManagerProxy.Changed -> System.EventHandler<Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs!>!
-Microsoft.VisualStudio.LiveShare.Razor.IProjectSnapshotManagerProxy.GetProjectManagerStateAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotManagerProxyState!>!
-Microsoft.VisualStudio.LiveShare.Razor.IRemoteHierarchyService
-Microsoft.VisualStudio.LiveShare.Razor.IRemoteHierarchyService.HasCapabilityAsync(System.Uri! pathOfFileInProject, string! capability, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<bool>!
-Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs
-Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs.IntermediateOutputPath.get -> System.Uri!
-Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs.Kind.get -> Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind
-Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs.Newer.get -> Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotHandleProxy?
-Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs.Older.get -> Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotHandleProxy?
-Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs.ProjectChangeEventProxyArgs(Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotHandleProxy? older, Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotHandleProxy? newer, Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind kind) -> void
-Microsoft.VisualStudio.LiveShare.Razor.ProjectChangeEventProxyArgs.ProjectFilePath.get -> System.Uri!
-Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind
-Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind.ProjectAdded = 0 -> Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind
-Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind.ProjectChanged = 2 -> Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind
-Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind.ProjectRemoved = 1 -> Microsoft.VisualStudio.LiveShare.Razor.ProjectProxyChangeKind
-Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotHandleProxy
-Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotManagerProxyState
-Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotManagerProxyState.ProjectHandles.get -> System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotHandleProxy!>!
-Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotManagerProxyState.ProjectSnapshotManagerProxyState(System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.LiveShare.Razor.ProjectSnapshotHandleProxy!>! projectHandles) -> void
+Microsoft.VisualStudio.Razor.LiveShare.IProjectHierarchyProxy
+Microsoft.VisualStudio.Razor.LiveShare.IProjectHierarchyProxy.GetProjectPathAsync(System.Uri! documentFilePath, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Uri?>!
+Microsoft.VisualStudio.Razor.LiveShare.IProjectSnapshotManagerProxy
+Microsoft.VisualStudio.Razor.LiveShare.IProjectSnapshotManagerProxy.Changed -> System.EventHandler<Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs!>!
+Microsoft.VisualStudio.Razor.LiveShare.IProjectSnapshotManagerProxy.GetProjectManagerStateAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotManagerProxyState!>!
+Microsoft.VisualStudio.Razor.LiveShare.IRemoteHierarchyService
+Microsoft.VisualStudio.Razor.LiveShare.IRemoteHierarchyService.HasCapabilityAsync(System.Uri! pathOfFileInProject, string! capability, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<bool>!
+Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs
+Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs.IntermediateOutputPath.get -> System.Uri!
+Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs.Kind.get -> Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind
+Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs.Newer.get -> Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotHandleProxy?
+Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs.Older.get -> Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotHandleProxy?
+Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs.ProjectChangeEventProxyArgs(Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotHandleProxy? older, Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotHandleProxy? newer, Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind kind) -> void
+Microsoft.VisualStudio.Razor.LiveShare.ProjectChangeEventProxyArgs.ProjectFilePath.get -> System.Uri!
+Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind
+Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind.ProjectAdded = 0 -> Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind
+Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind.ProjectChanged = 2 -> Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind
+Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind.ProjectRemoved = 1 -> Microsoft.VisualStudio.Razor.LiveShare.ProjectProxyChangeKind
+Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotHandleProxy
+Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotManagerProxyState
+Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotManagerProxyState.ProjectHandles.get -> System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotHandleProxy!>!
+Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotManagerProxyState.ProjectSnapshotManagerProxyState(System.Collections.Generic.IReadOnlyList<Microsoft.VisualStudio.Razor.LiveShare.ProjectSnapshotHandleProxy!>! projectHandles) -> void

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorConstants.cs

@@ -1,7 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+using System;
+
+namespace Microsoft.VisualStudio.Razor;
 
 internal static class RazorConstants
 {
@@ -10,4 +12,10 @@ internal static class RazorConstants
     public const string LegacyCoreContentType = "LegacyRazorCoreCSharp";
 
     public const string RazorLSPContentTypeName = "Razor";
+
+    public const string RazorLanguageServiceString = "4513FA64-5B72-4B58-9D4C-1D3C81996C2C";
+
+    public static readonly Guid RazorLanguageServiceGuid = new(RazorLanguageServiceString);
+
+    public const string VSProjectItemsIdentifier = "CF_VSSTGPROJECTITEMS";
 }

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorDisableDropHandlerProvider.cs

@@ -2,19 +2,18 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Editor.DragDrop;
 using Microsoft.VisualStudio.Utilities;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 // The intention of this class is to disable dropping random files into the Razor language service content type without throwing. Ultimately
 // this class serves as a workaround to a limitation in the core editor APIs where without it you get an error dialog. This class allows us
 // to silently "do nothing" when a drop occurs on one of our documents.
 [Export(typeof(IDropHandlerProvider))]
 [ContentType(RazorConstants.RazorLSPContentTypeName)]
-[DropFormat(RazorVisualStudioWindowsConstants.VSProjectItemsIdentifier)]
+[DropFormat(RazorConstants.VSProjectItemsIdentifier)]
 [Name(nameof(RazorDisableDropHandlerProvider))]
 [Order(Before = "LanguageServiceTextDropHandler")]
 internal sealed class RazorDisableDropHandlerProvider : IDropHandlerProvider

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorLSPTextViewConnectionListener.cs

@@ -7,9 +7,9 @@ using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor.Settings;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.OLE.Interop;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Razor.Settings;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;
@@ -18,7 +18,7 @@ using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Utilities;
 using IServiceProvider = System.IServiceProvider;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 // The entire purpose of this class is to workaround quirks in Visual Studio's core editor handling. In Razor scenarios
 // we can have a multitude of content types that represents a Razor file:
@@ -95,7 +95,7 @@ internal class RazorLSPTextViewConnectionListener : ITextViewConnectionListener
         if (!_editorFeatureDetector.IsRemoteClient())
         {
             vsTextView.GetBuffer(out var vsBuffer);
-            vsBuffer.SetLanguageServiceID(RazorVisualStudioWindowsConstants.RazorLanguageServiceGuid);
+            vsBuffer.SetLanguageServiceID(RazorConstants.RazorLanguageServiceGuid);
         }
 
         RazorLSPTextViewFilter.CreateAndRegister(vsTextView);
@@ -212,7 +212,7 @@ internal class RazorLSPTextViewConnectionListener : ITextViewConnectionListener
 
     private static void InitializeRazorTextViewOptions(IVsTextManager4 textManager, RazorEditorOptionsTracker optionsTracker)
     {
-        var langPrefs3 = new LANGPREFERENCES3[] { new LANGPREFERENCES3() { guidLang = RazorVisualStudioWindowsConstants.RazorLanguageServiceGuid } };
+        var langPrefs3 = new LANGPREFERENCES3[] { new LANGPREFERENCES3() { guidLang = RazorConstants.RazorLanguageServiceGuid } };
         if (VSConstants.S_OK != textManager.GetUserPreferences4(null, langPrefs3, null))
         {
             return;
@@ -258,7 +258,7 @@ internal class RazorLSPTextViewConnectionListener : ITextViewConnectionListener
         var insertSpaces = true;
         var tabSize = 4;
 
-        var langPrefs3 = new LANGPREFERENCES3[] { new LANGPREFERENCES3() { guidLang = RazorVisualStudioWindowsConstants.RazorLanguageServiceGuid } };
+        var langPrefs3 = new LANGPREFERENCES3[] { new LANGPREFERENCES3() { guidLang = RazorConstants.RazorLanguageServiceGuid } };
         if (VSConstants.S_OK != textManager.GetUserPreferences4(null, langPrefs3, null))
         {
             return (new ClientSpaceSettings(IndentWithTabs: !insertSpaces, tabSize), ClientCompletionSettings.Default);

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorLanguageService_IVsLangaugeInfo.cs

@@ -5,9 +5,9 @@ using System;
 using System.Runtime.InteropServices;
 using Microsoft.VisualStudio.TextManager.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
-[Guid(RazorVisualStudioWindowsConstants.RazorLanguageServiceString)]
+[Guid(RazorConstants.RazorLanguageServiceString)]
 internal partial class RazorLanguageService : IVsLanguageInfo
 {
     public int GetLanguageName(out string bstrName)

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorLanguageService_IVsLanguageDebugInfo.cs

@@ -4,15 +4,15 @@
 using System;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.LanguageServices.Razor.Extensions;
 using Microsoft.VisualStudio.Razor.Debugging;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Threading;
 using Microsoft.VisualStudio.Utilities;
 using TextSpan = Microsoft.VisualStudio.TextManager.Interop.TextSpan;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal partial class RazorLanguageService : IVsLanguageDebugInfo
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorStartupInitializer.cs

@@ -8,7 +8,7 @@ using System.Threading;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.ComponentModelHost;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(RazorStartupInitializer))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorVisualStudioWindowsConstants.cs

@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT license. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
-
-internal class RazorVisualStudioWindowsConstants
-{
-    public const string RazorLanguageServiceString = "4513FA64-5B72-4B58-9D4C-1D3C81996C2C";
-
-    public static readonly Guid RazorLanguageServiceGuid = new(RazorLanguageServiceString);
-
-    public const string VSProjectItemsIdentifier = "CF_VSSTGPROJECTITEMS";
-}

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Remote/OutOfProcSemanticTokensService.cs

@@ -5,13 +5,14 @@ using System;
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Razor.Settings;
 
-namespace Microsoft.CodeAnalysis.Remote.Razor;
+namespace Microsoft.VisualStudio.Razor.Remote;
 
 [Export(typeof(IOutOfProcSemanticTokensService))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Remote/OutOfProcTagHelperResolver.cs

@@ -12,12 +12,13 @@ using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.Serialization;
 using Microsoft.AspNetCore.Razor.Telemetry;
 using Microsoft.AspNetCore.Razor.Utilities;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
-namespace Microsoft.CodeAnalysis.Remote.Razor;
+namespace Microsoft.VisualStudio.Razor.Remote;
 
 [Export(typeof(ITagHelperResolver))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Remote/RemoteClientProvider.cs

@@ -10,7 +10,7 @@ using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.SemanticTokens;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Remote;
+namespace Microsoft.VisualStudio.Razor.Remote;
 
 [Export(typeof(IRemoteClientProvider))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioDocumentInteractionManager.cs

@@ -4,13 +4,12 @@
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Shell;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(DocumentInteractionManager))]
-internal class VisualStudioWindowsDocumentInteractionManager : DocumentInteractionManager
+internal class VisualStudioDocumentInteractionManager : DocumentInteractionManager
 {
     public override Task OpenDocumentAsync(string filePath, CancellationToken cancellationToken)
     {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioErrorReporter.cs

@@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(IErrorReporter))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioFilePathService.cs

@@ -4,7 +4,7 @@
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(IFilePathService))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioHostServicesProvider.cs

@@ -1,9 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal abstract class VisualStudioHostServicesProvider
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioLSPEditorFeatureDetector.cs

@@ -6,14 +6,14 @@ using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.Internal.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Settings;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(LSPEditorFeatureDetector))]
-internal class VisualStudioWindowsLSPEditorFeatureDetector : LSPEditorFeatureDetector
+internal class VisualStudioLSPEditorFeatureDetector : LSPEditorFeatureDetector
 {
     private const string LegacyRazorEditorFeatureFlag = "Razor.LSP.LegacyEditor";
     private const string DotNetCoreCSharpCapability = "CSharp&CPS";
@@ -30,7 +30,7 @@ internal class VisualStudioWindowsLSPEditorFeatureDetector : LSPEditorFeatureDet
     private readonly RazorLogger _logger;
 
     [ImportingConstructor]
-    public VisualStudioWindowsLSPEditorFeatureDetector(AggregateProjectCapabilityResolver projectCapabilityResolver, RazorLogger logger)
+    public VisualStudioLSPEditorFeatureDetector(AggregateProjectCapabilityResolver projectCapabilityResolver, RazorLogger logger)
     {
         _projectCapabilityResolver = projectCapabilityResolver;
         _vsUIShellOpenDocument = new Lazy<IVsUIShellOpenDocument>(() =>
@@ -43,14 +43,14 @@ internal class VisualStudioWindowsLSPEditorFeatureDetector : LSPEditorFeatureDet
 
         _useLegacyEditor = new Lazy<bool>(() =>
         {
-            var featureFlags = (IVsFeatureFlags)AsyncPackage.GetGlobalService(typeof(SVsFeatureFlags));
+            var featureFlags = (IVsFeatureFlags)Package.GetGlobalService(typeof(SVsFeatureFlags));
             var legacyEditorFeatureFlagEnabled = featureFlags.IsFeatureEnabled(LegacyRazorEditorFeatureFlag, defaultValue: false);
             if (legacyEditorFeatureFlagEnabled)
             {
                 return true;
             }
 
-            var settingsManager = (Settings.ISettingsManager)ServiceProvider.GlobalProvider.GetService(typeof(SVsSettingsPersistenceManager));
+            var settingsManager = (ISettingsManager)ServiceProvider.GlobalProvider.GetService(typeof(SVsSettingsPersistenceManager));
             Assumes.Present(settingsManager);
 
             var useLegacyEditor = settingsManager.GetValueOrDefault<bool>(UseLegacyASPNETCoreEditorSetting);
@@ -62,7 +62,7 @@ internal class VisualStudioWindowsLSPEditorFeatureDetector : LSPEditorFeatureDet
 
     [Obsolete("Test constructor")]
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-    internal VisualStudioWindowsLSPEditorFeatureDetector()
+    internal VisualStudioLSPEditorFeatureDetector()
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
     }

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioLanguageServerFeatureOptions.cs

@@ -7,10 +7,10 @@ using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.Internal.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell;
 
-namespace Microsoft.VisualStudio.Editor.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(LanguageServerFeatureOptions))]
-internal class VisualStudioWindowsLanguageServerFeatureOptions : LanguageServerFeatureOptions
+internal class VisualStudioLanguageServerFeatureOptions : LanguageServerFeatureOptions
 {
     private const string ShowAllCSharpCodeActionsFeatureFlag = "Razor.LSP.ShowAllCSharpCodeActions";
     private const string IncludeProjectKeyInGeneratedFilePathFeatureFlag = "Razor.LSP.IncludeProjectKeyInGeneratedFilePath";
@@ -28,7 +28,7 @@ internal class VisualStudioWindowsLanguageServerFeatureOptions : LanguageServerF
     private readonly Lazy<bool> _forceRuntimeCodeGeneration;
 
     [ImportingConstructor]
-    public VisualStudioWindowsLanguageServerFeatureOptions(LSPEditorFeatureDetector lspEditorFeatureDetector)
+    public VisualStudioLanguageServerFeatureOptions(LSPEditorFeatureDetector lspEditorFeatureDetector)
     {
         if (lspEditorFeatureDetector is null)
         {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioProjectCapabilityResolver.cs

@@ -4,19 +4,18 @@
 using System;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(ProjectCapabilityResolver))]
-internal class VisualStudioWindowsProjectCapabilityResolver : ProjectCapabilityResolver
+internal class VisualStudioProjectCapabilityResolver : ProjectCapabilityResolver
 {
     private readonly RazorLogger _razorLogger;
 
     [ImportingConstructor]
-    public VisualStudioWindowsProjectCapabilityResolver(RazorLogger razorLogger)
+    public VisualStudioProjectCapabilityResolver(RazorLogger razorLogger)
     {
         if (razorLogger is null)
         {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioProjectSnapshotManagerDispatcher.cs

@@ -4,7 +4,7 @@
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(ProjectSnapshotManagerDispatcher))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioSolutionCloseChangeTrigger.cs

@@ -11,7 +11,7 @@ using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(IRazorStartupService))]
 internal class VisualStudioSolutionCloseChangeTrigger : IRazorStartupService, IVsSolutionEvents3, IDisposable

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioWindowsHostServicesProvider.cs

@@ -4,9 +4,9 @@
 using System;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Host;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.LanguageServices;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(VisualStudioHostServicesProvider))]
 internal class VisualStudioWindowsHostServicesProvider : VisualStudioHostServicesProvider

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioWorkspaceProvider.cs

@@ -3,8 +3,9 @@
 
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
+using Microsoft.VisualStudio.LanguageServices;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(IWorkspaceProvider))]
 [method: ImportingConstructor]

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VsEnumBSTR.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TextManager.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal class VsEnumBSTR : IVsEnumBSTR
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VsSolutionUpdatesProjectSnapshotChangeTrigger.cs

@@ -9,13 +9,13 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(IRazorStartupService))]
 internal class VsSolutionUpdatesProjectSnapshotChangeTrigger : IRazorStartupService, IVsUpdateSolutionEvents2, IDisposable

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/WorkspaceProjectStateChangeDetector.Comparer.cs

@@ -6,7 +6,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 internal partial class WorkspaceProjectStateChangeDetector
 {

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/WorkspaceProjectStateChangeDetector.cs

@@ -17,7 +17,7 @@ using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Utilities;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor;
+namespace Microsoft.VisualStudio.Razor;
 
 [Export(typeof(IRazorStartupService))]
 internal partial class WorkspaceProjectStateChangeDetector : IRazorStartupService, IDisposable

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Completion/RazorDirectiveAttributeCommitManagerProvider.cs

@@ -5,8 +5,8 @@ using System;
 using System.ComponentModel.Composition;
 using System.Linq;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
 

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Completion/RazorDirectiveAttributeCompletionSourceProvider.cs

@@ -6,10 +6,10 @@ using System.ComponentModel.Composition;
 using System.Linq;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Completion;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.LegacyEditor.Razor.Parsing;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Threading;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Completion/RazorDirectiveCompletionSourceProvider.cs

@@ -6,9 +6,9 @@ using System.ComponentModel.Composition;
 using System.Linq;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Completion;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.LegacyEditor.Razor.Parsing;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Indentation/BraceSmartIndenter.cs

@@ -8,7 +8,7 @@ using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Operations;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Indentation/BraceSmartIndenterFactory.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Threading;
 

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/LegacyTextViewConnectionListener.cs

@@ -6,7 +6,8 @@ using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Parsing/VisualStudioRazorParser.cs

@@ -15,8 +15,8 @@ using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Settings;
 using Microsoft.Extensions.Internal;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;
 using static Microsoft.VisualStudio.LegacyEditor.Razor.Parsing.BackgroundParser;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Parsing/VisualStudioRazorParserFactory.cs

@@ -4,8 +4,8 @@
 using System.ComponentModel.Composition;
 using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Threading;
 
 namespace Microsoft.VisualStudio.LegacyEditor.Razor.Parsing;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/ProjectPathProvider.cs

@@ -4,7 +4,8 @@
 using System;
 using System.ComponentModel.Composition;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/TextBufferExtensions.cs

@@ -5,8 +5,8 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LegacyEditor.Razor.Parsing;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Text;
 
 namespace Microsoft.VisualStudio.LegacyEditor.Razor;

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/VisualStudioDocumentTracker.cs

@@ -11,8 +11,8 @@ using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Settings;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LegacyEditor.Razor.Settings;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Razor.Settings;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;

src/Razor/src/Microsoft.VisualStudio.RazorExtension/RazorPackage.cs

@@ -10,8 +10,7 @@ using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.Editor.Razor;
-using Microsoft.VisualStudio.LanguageServices.Razor;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Razor.Debugging;
 using Microsoft.VisualStudio.Razor.LanguageClient.Options;
 using Microsoft.VisualStudio.Razor.Logging;

src/Razor/src/Microsoft.VisualStudio.RazorExtension/Snippets/SnippetService.cs

@@ -11,8 +11,8 @@ using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis.Razor.Settings;
 using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.ProjectSystem.VS;
+using Microsoft.VisualStudio.Razor.Extensions;
 using Microsoft.VisualStudio.Razor.Settings;
 using Microsoft.VisualStudio.Razor.Snippets;
 using Microsoft.VisualStudio.Shell;

src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SourceMappingAdornmentTaggerProvider.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Razor.Documents;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;

src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SourceMappingTaggerProvider.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.ComponentModel.Composition;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Razor.Documents;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Tagging;

src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizer/SyntaxVisualizerControl.xaml.cs

@@ -7,7 +7,6 @@ using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage.Extensions;
 using Microsoft.VisualStudio.Shell;
@@ -19,6 +18,7 @@ using Microsoft.VisualStudio.Threading;
 using Microsoft.VisualStudio.Razor.LanguageClient;
 using Microsoft.VisualStudio.Razor.Documents;
 using Microsoft.VisualStudio.Razor.SyntaxVisualizer;
+using Microsoft.VisualStudio.Razor;
 
 namespace Microsoft.VisualStudio.RazorExtension.SyntaxVisualizer;
 

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/VisualStudio_NetFx/VisualStudioTestBase.cs

@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 using Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.LanguageServices.Razor;
+using Microsoft.VisualStudio.Razor;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Razor.Test.Common.VisualStudio;

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/VisualStudio_NetFx/VisualStudioWorkspaceTestBase.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.VisualStudio.LanguageServices.Razor;
+using Microsoft.VisualStudio.Razor;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Razor.Test.Common.VisualStudio;

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/VisualStudio_NetFx/VsMocks.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.Composition.Hosting;
 using System.ComponentModel.Composition.Primitives;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.VisualStudio.ComponentModelHost;
-using Microsoft.VisualStudio.Editor.Razor;
+using Microsoft.VisualStudio.Razor;
 using Microsoft.VisualStudio.Razor.LanguageClient;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Utilities;

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/HtmlVirtualDocumentFactoryTest.cs

@@ -6,7 +6,6 @@
 using System;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
-using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Utilities;