From ecfd5b1300540f2aac99530536118ffa4affc83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Thu, 10 Feb 2022 19:55:35 -0800
Subject: [PATCH] Remove dependency on EditorFeatures from Remote.ServieHub
 project - take 3 (#59316)

* Revert "Revert "Remove dependency on EditorFeatures from Remote.ServiceHub project - take 2 (#59147)" (#59242)"

This reverts commit 8d81aa51ec316d6a545cbc1a0afebad320444d7b.

* Move GoToBaseService to Features

* Remove unnecessray PackageRefs

* Fixes
---
 eng/targets/Services.props                    |   2 +-
 .../CSharpDecompiledSourceService.cs          |   2 +-
 .../FindUsages/CSharpFindUsagesLSPService.cs  |   5 +-
 .../FindUsages/CSharpFindUsagesService.cs     |   2 +-
 .../CSharp/GoToBase/CSharpGoToBaseService.cs  |   4 +-
 .../FindBaseSymbolsCommandHandler.cs          |   2 +-
 .../FindDerivedSymbolsCommandHandler.cs       |   2 +-
 .../FindExtensionMethodsCommandHandler.cs     |   2 +-
 .../FindImplementingMembersCommandHandler.cs  |   1 -
 .../FindMemberOverloadsCommandHandler.cs      |   2 +-
 ...FindReferencesOfOverloadsCommandHandler.cs |   2 +-
 .../Core.Wpf/Peek/PeekableItemFactory.cs      |   3 +-
 .../Core/EditorFeaturesResources.resx         |  15 ---
 .../VSTypeScriptFindUsagesService.cs          |   1 -
 .../FindReferencesCommandHandler.cs           |   1 -
 .../FindUsages/SimpleFindUsagesContext.cs     |  10 +-
 .../Core/GoToBase/GoToBaseCommandHandler.cs   |   3 +-
 .../AbstractGoToDefinitionService.cs          |   1 -
 .../GoToDefinitionCommandHandler.cs           |   2 +-
 .../GoToDefinition/GoToDefinitionHelpers.cs   |   1 -
 .../GoToImplementationCommandHandler.cs       |   1 -
 ...lassificationTaggerProvider.TagComputer.cs |   2 +-
 .../DefinitionContextTracker.cs               |   2 +-
 .../References/FindAllReferencesHandler.cs    |   1 -
 .../References/FindImplementationsHandler.cs  |   1 -
 .../References/FindUsagesLSPContext.cs        |   6 +-
 .../NavigationBar/NavigationBarController.cs  |   4 +-
 ...crosoft.CodeAnalysis.EditorFeatures.csproj |   2 -
 .../Tagging/EventSources/TaggerConstants.cs   |  16 +--
 .../SymbolSearchUpdateEngineFactory.cs        | 114 ------------------
 .../CompilationAvailableTaggerEventSource.cs  |  11 +-
 .../Core/xlf/EditorFeaturesResources.cs.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.de.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.es.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.fr.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.it.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.ja.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.ko.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.pl.xlf   |  35 +-----
 .../xlf/EditorFeaturesResources.pt-BR.xlf     |  35 +-----
 .../Core/xlf/EditorFeaturesResources.ru.xlf   |  35 +-----
 .../Core/xlf/EditorFeaturesResources.tr.xlf   |  35 +-----
 .../xlf/EditorFeaturesResources.zh-Hans.xlf   |  35 +-----
 .../xlf/EditorFeaturesResources.zh-Hant.xlf   |  35 +-----
 .../FindReferencesCommandHandlerTests.cs      |   8 +-
 .../StackTraceExplorerTests.cs                |   2 +-
 .../FindReferencesCommandHandlerTests.vb      |   2 +-
 .../FindReferences/FindReferencesTests.vb     |  10 +-
 .../Test2/GoToBase/GoToBaseTestsBase.vb       |   4 +-
 .../Test2/GoToHelpers/GoToHelpers.vb          |   2 +-
 .../GoToImplementationTests.vb                |   2 +-
 .../MockNavigableItemsPresenter.vb            |   1 -
 .../VisualBasicFindUsagesLSPService.vb        |   3 +-
 .../VisualBasicFindUsagesService.vb           |   2 +-
 .../GoToBase/VisualBasicGoToBaseService.vb    |   4 +-
 .../Core/Portable/Common/DelayTimeSpan.cs     |  17 +++
 .../Core/Portable/FeaturesResources.resx      |  18 +++
 ...UsagesService.DefinitionTrackingContext.cs |   2 +-
 ...stractFindUsagesService.ProgressAdapter.cs |   2 +-
 .../FindUsages/AbstractFindUsagesService.cs   |   4 +-
 ...ctFindUsagesService_FindImplementations.cs |   8 +-
 ...bstractFindUsagesService_FindReferences.cs |   6 +-
 .../Core/Portable/FindUsages/ExternalScope.cs |   2 -
 .../Portable}/FindUsages/FindUsagesContext.cs |   8 +-
 .../Portable/FindUsages/FindUsagesHelpers.cs  |   2 +-
 .../Portable/FindUsages/FindUsagesOptions.cs  |  10 +-
 .../IDefinitionsAndReferencesFactory.cs       |   3 +-
 .../FindUsages/IFindUsagesLSPService.cs       |   2 +-
 .../FindUsages/IFindUsagesService.cs          |   2 +-
 .../GoToBase/AbstractGoToBaseService.cs       |   9 +-
 .../Portable}/GoToBase/FindBaseHelpers.cs     |   2 +-
 .../Portable}/GoToBase/IGoToBaseService.cs    |   2 +-
 .../AbstractFindDefinitionService.cs          |   2 +-
 .../InheritanceMarginServiceHelpers.cs        |   1 -
 .../Microsoft.CodeAnalysis.Features.csproj    |   8 +-
 .../AbstractStackTraceSymbolResolver.cs       |   5 +-
 .../StackFrameLocalMethodResolver.cs          |   2 +-
 .../StackFrameMethodSymbolResolver.cs         |   2 +-
 .../StackTraceExplorerOptions.cs              |  21 ----
 .../StackTraceExplorerService.cs              |   3 +-
 .../StackTraceExplorerUtilities.cs            |   4 +-
 .../SymbolSearchUpdateEngineFactory.cs        |  26 ++++
 .../SymbolSearchUpdateNoOpEngine.cs           |  28 +++++
 .../Windows}/IAddReferenceDatabaseWrapper.cs  |   0
 .../Windows}/IDatabaseFactoryService.cs       |   0
 .../SymbolSearch/Windows}/IDelayService.cs    |   0
 .../SymbolSearch/Windows}/IIOService.cs       |   0
 .../SymbolSearch/Windows}/IPatchService.cs    |   0
 .../Windows}/IRemoteControlService.cs         |   0
 .../SymbolSearch/Windows/NativePatching.cs}   |   6 +-
 ...archUpdateEngine.DatabaseFactoryService.cs |   0
 .../SymbolSearchUpdateEngine.DelayService.cs  |   0
 .../SymbolSearchUpdateEngine.IOService.cs     |   0
 .../SymbolSearchUpdateEngine.PatchService.cs  |   2 +-
 ...SearchUpdateEngine.RemoteControlService.cs |   0
 .../SymbolSearchUpdateEngine.Update.cs        |   0
 .../Windows}/SymbolSearchUpdateEngine.cs      |   0
 .../SymbolSearchUpdateEngineFactory.cs        |  49 ++++++++
 .../Windows/SymbolSearchUpdateEngineProxy.cs  |  61 ++++++++++
 .../Tagging/CompilationAvailableHelpers.cs    |  16 +++
 .../Portable/xlf/FeaturesResources.cs.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.de.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.es.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.fr.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.it.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.ja.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.ko.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.pl.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.pt-BR.xlf  |  30 +++++
 .../Portable/xlf/FeaturesResources.ru.xlf     |  30 +++++
 .../Portable/xlf/FeaturesResources.tr.xlf     |  30 +++++
 .../xlf/FeaturesResources.zh-Hans.xlf         |  30 +++++
 .../xlf/FeaturesResources.zh-Hant.xlf         |  30 +++++
 .../Debugger/DebuggerFindReferencesService.cs |   2 +-
 .../FindUsages/FSharpFindUsagesService.cs     |   1 -
 .../Options/AdvancedOptionPageControl.xaml.cs |   2 +-
 ...bstractTableDataSourceFindUsagesContext.cs |   6 +-
 ...alStudioDefinitionsAndReferencesFactory.cs |   1 -
 .../AbstractObjectBrowserLibraryManager.cs    |   4 +-
 .../VisualStudioSymbolNavigationService.cs    |   1 -
 .../PdbSourceDocumentOutputWindowLogger.cs    |   3 +-
 .../StackTraceExplorerCommandHandler.cs       |   9 +-
 .../StackTraceExplorerOptions.cs              |  35 ++++++
 .../Venus/DocumentService_IntegrationTests.vb |   2 +-
 .../Fakes/StubStreamingFindUsagesPresenter.cs |   1 -
 .../Remote/InProcRemostHostClient.cs          |   2 +-
 ...soft.CodeAnalysis.Remote.ServiceHub.csproj |   9 +-
 .../FindUsages/RemoteFindUsagesService.cs     |   1 -
 ...teSemanticClassificationService.Caching.cs |   3 +-
 .../RemoteStackTraceExplorerService.cs        |   4 +-
 ...RemoteTaggerCompilationAvailableService.cs |   4 +-
 131 files changed, 835 insertions(+), 698 deletions(-)
 delete mode 100644 src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngineFactory.cs
 create mode 100644 src/Features/Core/Portable/Common/DelayTimeSpan.cs
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/AbstractFindUsagesService.DefinitionTrackingContext.cs (98%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/AbstractFindUsagesService.ProgressAdapter.cs (99%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/AbstractFindUsagesService.cs (75%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/AbstractFindUsagesService_FindImplementations.cs (96%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/AbstractFindUsagesService_FindReferences.cs (98%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/FindUsagesContext.cs (79%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/IDefinitionsAndReferencesFactory.cs (99%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/IFindUsagesLSPService.cs (95%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/FindUsages/IFindUsagesService.cs (95%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/GoToBase/AbstractGoToBaseService.cs (87%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/GoToBase/FindBaseHelpers.cs (96%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/GoToBase/IGoToBaseService.cs (93%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/InheritanceMargin/InheritanceMarginServiceHelpers.cs (99%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/StackTraceExplorer/AbstractStackTraceSymbolResolver.cs (95%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/StackTraceExplorer/StackFrameLocalMethodResolver.cs (96%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/StackTraceExplorer/StackFrameMethodSymbolResolver.cs (95%)
 delete mode 100644 src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerOptions.cs
 rename src/{EditorFeatures/Core => Features/Core/Portable}/StackTraceExplorer/StackTraceExplorerService.cs (97%)
 rename src/{EditorFeatures/Core => Features/Core/Portable}/StackTraceExplorer/StackTraceExplorerUtilities.cs (97%)
 create mode 100644 src/Features/Core/Portable/SymbolSearch/SourceBuild/SymbolSearchUpdateEngineFactory.cs
 create mode 100644 src/Features/Core/Portable/SymbolSearch/SymbolSearchUpdateNoOpEngine.cs
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/IAddReferenceDatabaseWrapper.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/IDatabaseFactoryService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/IDelayService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/IIOService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/IPatchService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/IRemoteControlService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch/Patching/Delta.cs => Features/Core/Portable/SymbolSearch/Windows/NativePatching.cs} (94%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/SymbolSearchUpdateEngine.DatabaseFactoryService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/SymbolSearchUpdateEngine.DelayService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/SymbolSearchUpdateEngine.IOService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/SymbolSearchUpdateEngine.PatchService.cs (88%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/SymbolSearchUpdateEngine.RemoteControlService.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/SymbolSearchUpdateEngine.Update.cs (100%)
 rename src/{EditorFeatures/Core/SymbolSearch => Features/Core/Portable/SymbolSearch/Windows}/SymbolSearchUpdateEngine.cs (100%)
 create mode 100644 src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineFactory.cs
 create mode 100644 src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineProxy.cs
 create mode 100644 src/Features/Core/Portable/Tagging/CompilationAvailableHelpers.cs
 create mode 100644 src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerOptions.cs

diff --git a/eng/targets/Services.props b/eng/targets/Services.props
index c4421f0d7a042..316192a92ea15 100644
--- a/eng/targets/Services.props
+++ b/eng/targets/Services.props
@@ -38,7 +38,7 @@
     <ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.UnusedReferenceAnalysis" ClassName="Microsoft.CodeAnalysis.Remote.RemoteUnusedReferenceAnalysisService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.ProcessTelemetry" ClassName="Microsoft.CodeAnalysis.Remote.RemoteProcessTelemetryService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.CompilationAvailable" ClassName="Microsoft.CodeAnalysis.Remote.RemoteCompilationAvailableService+Factory" />
-    <ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.StackTraceExplorer" ClassName="Microsoft.CodeAnalysis.Remote.Services.StackTraceExplorer.RemoteStackTraceExplorerService+Factory" />
+    <ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.StackTraceExplorer" ClassName="Microsoft.CodeAnalysis.Remote.RemoteStackTraceExplorerService+Factory" />
   </ItemGroup>
 
   <!--
diff --git a/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs b/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs
index 8aa9d86ee763f..7aaa67d7c011f 100644
--- a/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs
+++ b/src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs
@@ -110,7 +110,7 @@ private static Document PerformDecompilation(Document document, string fullName,
 
             if (file is null && assemblyLocation is null)
             {
-                throw new NotSupportedException(EditorFeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret);
+                throw new NotSupportedException(FeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret);
             }
 
             file ??= new PEFile(assemblyLocation, PEStreamOptions.PrefetchEntireImage);
diff --git a/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesLSPService.cs b/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesLSPService.cs
index 65c94d977d0fa..4d0e18b085f6a 100644
--- a/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesLSPService.cs
+++ b/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesLSPService.cs
@@ -2,12 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Composition;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
-using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.FindUsages
diff --git a/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesService.cs b/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesService.cs
index 1fedd08ae3d7c..b4b4a85aa40a9 100644
--- a/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesService.cs
+++ b/src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesService.cs
@@ -4,7 +4,7 @@
 
 using System;
 using System.Composition;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.FindUsages
diff --git a/src/EditorFeatures/CSharp/GoToBase/CSharpGoToBaseService.cs b/src/EditorFeatures/CSharp/GoToBase/CSharpGoToBaseService.cs
index 18a2f218ea74f..2a27d699a995b 100644
--- a/src/EditorFeatures/CSharp/GoToBase/CSharpGoToBaseService.cs
+++ b/src/EditorFeatures/CSharp/GoToBase/CSharpGoToBaseService.cs
@@ -6,10 +6,10 @@
 
 using System;
 using System.Composition;
-using Microsoft.CodeAnalysis.Editor.GoToBase;
+using Microsoft.CodeAnalysis.GoToBase;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.GoToBase
+namespace Microsoft.CodeAnalysis.CSharp.GoToBase
 {
     [ExportLanguageService(typeof(IGoToBaseService), LanguageNames.CSharp), Shared]
     internal class CSharpGoToBaseService : AbstractGoToBaseService
diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindBaseSymbolsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindBaseSymbolsCommandHandler.cs
index 5e2185b61c07a..5e633f238c4c6 100644
--- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindBaseSymbolsCommandHandler.cs
+++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindBaseSymbolsCommandHandler.cs
@@ -6,9 +6,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Shared.Extensions;
diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs
index 6577d0200543a..a44978f3fc2ab 100644
--- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs
+++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs
@@ -8,7 +8,6 @@
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.FindSymbols;
@@ -20,6 +19,7 @@
 using Roslyn.Utilities;
 using VSCommanding = Microsoft.VisualStudio.Commanding;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.FindUsages;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers
 {
diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindExtensionMethodsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindExtensionMethodsCommandHandler.cs
index 843a5cecea69f..1a8ec8d3d0750 100644
--- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindExtensionMethodsCommandHandler.cs
+++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindExtensionMethodsCommandHandler.cs
@@ -9,10 +9,10 @@
 using System.ComponentModel.Composition;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Shared.Extensions;
diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindImplementingMembersCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindImplementingMembersCommandHandler.cs
index 7e8998cfff489..daa41f3df2dc6 100644
--- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindImplementingMembersCommandHandler.cs
+++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindImplementingMembersCommandHandler.cs
@@ -9,7 +9,6 @@
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.FindUsages;
diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs
index 2c6ac335cf584..79a8ce4b9885b 100644
--- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs
+++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Internal.Log;
@@ -19,6 +18,7 @@
 using VSCommanding = Microsoft.VisualStudio.Commanding;
 using Microsoft.CodeAnalysis.Host.Mef;
 using System.Threading;
+using Microsoft.CodeAnalysis.FindUsages;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers
 {
diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindReferencesOfOverloadsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindReferencesOfOverloadsCommandHandler.cs
index 5006710ae5adb..24e866d4ca58f 100644
--- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindReferencesOfOverloadsCommandHandler.cs
+++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindReferencesOfOverloadsCommandHandler.cs
@@ -10,11 +10,11 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Shared.Extensions;
diff --git a/src/EditorFeatures/Core.Wpf/Peek/PeekableItemFactory.cs b/src/EditorFeatures/Core.Wpf/Peek/PeekableItemFactory.cs
index 36fa4dc03229c..e08c1e75f5c1a 100644
--- a/src/EditorFeatures/Core.Wpf/Peek/PeekableItemFactory.cs
+++ b/src/EditorFeatures/Core.Wpf/Peek/PeekableItemFactory.cs
@@ -10,13 +10,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Peek;
 using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.MetadataAsSource;
 using Microsoft.CodeAnalysis.Navigation;
-using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Language.Intellisense;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.Peek
diff --git a/src/EditorFeatures/Core/EditorFeaturesResources.resx b/src/EditorFeatures/Core/EditorFeaturesResources.resx
index 8703e1b15dcdd..0b786ff8a7041 100644
--- a/src/EditorFeatures/Core/EditorFeaturesResources.resx
+++ b/src/EditorFeatures/Core/EditorFeaturesResources.resx
@@ -724,9 +724,6 @@ Do you want to proceed?</value>
   <data name="Go_To_Base" xml:space="preserve">
     <value>Go To Base</value>
   </data>
-  <data name="The_symbol_has_no_implementations" xml:space="preserve">
-    <value>The symbol has no implementations.</value>
-  </data>
   <data name="New_name_colon_0" xml:space="preserve">
     <value>New name: {0}</value>
   </data>
@@ -742,12 +739,6 @@ Do you want to proceed?</value>
   <data name="Suggestion_ellipses" xml:space="preserve">
     <value>Suggestion ellipses (…)</value>
   </data>
-  <data name="_0_references" xml:space="preserve">
-    <value>'{0}' references</value>
-  </data>
-  <data name="_0_implementations" xml:space="preserve">
-    <value>'{0}' implementations</value>
-  </data>
   <data name="_0_declarations" xml:space="preserve">
     <value>'{0}' declarations</value>
   </data>
@@ -886,12 +877,6 @@ Do you want to proceed?</value>
   <data name="Waiting_for_background_work_to_finish" xml:space="preserve">
     <value>Waiting for background work to finish...</value>
   </data>
-  <data name="The_symbol_has_no_base" xml:space="preserve">
-    <value>The symbol has no base.</value>
-  </data>
-  <data name="_0_bases" xml:space="preserve">
-    <value>'{0}' bases</value>
-  </data>
   <data name="Rename_symbols_file" xml:space="preserve">
     <value>Rename symbol's _file</value>
     <comment>Indicates that the file a symbol is defined in will also be renamed</comment>
diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFindUsagesService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFindUsagesService.cs
index 381a380998508..c20f19f925add 100644
--- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFindUsagesService.cs
+++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFindUsagesService.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
diff --git a/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs b/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs
index cde3b9d420cb1..95e74bf97c2a6 100644
--- a/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs
+++ b/src/EditorFeatures/Core/FindReferences/FindReferencesCommandHandler.cs
@@ -8,7 +8,6 @@
 using System.ComponentModel.Composition;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.ErrorReporting;
diff --git a/src/EditorFeatures/Core/FindUsages/SimpleFindUsagesContext.cs b/src/EditorFeatures/Core/FindUsages/SimpleFindUsagesContext.cs
index 3dd50d066c6b6..8be625c226bb8 100644
--- a/src/EditorFeatures/Core/FindUsages/SimpleFindUsagesContext.cs
+++ b/src/EditorFeatures/Core/FindUsages/SimpleFindUsagesContext.cs
@@ -9,8 +9,9 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Options;
+using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     /// <summary>
     /// Simple implementation of a <see cref="FindUsagesContext"/> that just aggregates the results
@@ -19,6 +20,8 @@ namespace Microsoft.CodeAnalysis.Editor.FindUsages
     internal sealed class SimpleFindUsagesContext : FindUsagesContext
     {
         private readonly object _gate = new();
+        private readonly IGlobalOptionService _globalOptions;
+
         private readonly ImmutableArray<DefinitionItem>.Builder _definitionItems =
             ImmutableArray.CreateBuilder<DefinitionItem>();
 
@@ -26,13 +29,16 @@ internal sealed class SimpleFindUsagesContext : FindUsagesContext
             ImmutableArray.CreateBuilder<SourceReferenceItem>();
 
         public SimpleFindUsagesContext(IGlobalOptionService globalOptions)
-            : base(globalOptions)
         {
+            _globalOptions = globalOptions;
         }
 
         public string Message { get; private set; }
         public string SearchTitle { get; private set; }
 
+        public override ValueTask<FindUsagesOptions> GetOptionsAsync(string language, CancellationToken cancellationToken)
+            => ValueTaskFactory.FromResult(_globalOptions.GetFindUsagesOptions(language));
+
         public override ValueTask ReportMessageAsync(string message, CancellationToken cancellationToken)
         {
             Message = message;
diff --git a/src/EditorFeatures/Core/GoToBase/GoToBaseCommandHandler.cs b/src/EditorFeatures/Core/GoToBase/GoToBaseCommandHandler.cs
index 91df40ed708e9..745de225fd56c 100644
--- a/src/EditorFeatures/Core/GoToBase/GoToBaseCommandHandler.cs
+++ b/src/EditorFeatures/Core/GoToBase/GoToBaseCommandHandler.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.CommandHandlers;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
@@ -19,7 +20,7 @@
 using Microsoft.VisualStudio.Utilities;
 using VSCommanding = Microsoft.VisualStudio.Commanding;
 
-namespace Microsoft.CodeAnalysis.Editor.GoToBase
+namespace Microsoft.CodeAnalysis.GoToBase
 {
     [Export(typeof(VSCommanding.ICommandHandler))]
     [ContentType(ContentTypeNames.RoslynContentType)]
diff --git a/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs
index 9e1b403d1edb0..bddab9ce32523 100644
--- a/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs
+++ b/src/EditorFeatures/Core/GoToDefinition/AbstractGoToDefinitionService.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.FindUsages;
diff --git a/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionCommandHandler.cs b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionCommandHandler.cs
index 10fe802eb69a2..c92177d100e08 100644
--- a/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionCommandHandler.cs
+++ b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionCommandHandler.cs
@@ -85,7 +85,7 @@ internal static bool TryExecuteCommand(Document document, int caretPosition, IGo
                     return true;
                 }
 
-                errorMessage = EditorFeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret;
+                errorMessage = FeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret;
             }
 
             if (errorMessage != null)
diff --git a/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs
index 2e05946920eab..f560bae5c506d 100644
--- a/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs
+++ b/src/EditorFeatures/Core/GoToDefinition/GoToDefinitionHelpers.cs
@@ -10,7 +10,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.FindSymbols;
diff --git a/src/EditorFeatures/Core/GoToImplementation/GoToImplementationCommandHandler.cs b/src/EditorFeatures/Core/GoToImplementation/GoToImplementationCommandHandler.cs
index af405810e8357..a14288e0c1c93 100644
--- a/src/EditorFeatures/Core/GoToImplementation/GoToImplementationCommandHandler.cs
+++ b/src/EditorFeatures/Core/GoToImplementation/GoToImplementationCommandHandler.cs
@@ -8,7 +8,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.CommandHandlers;
 using Microsoft.CodeAnalysis.Editor.Commanding.Commands;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.FindUsages;
diff --git a/src/EditorFeatures/Core/Implementation/Classification/SyntacticClassificationTaggerProvider.TagComputer.cs b/src/EditorFeatures/Core/Implementation/Classification/SyntacticClassificationTaggerProvider.TagComputer.cs
index b2e11e59f64d8..92fbec8040e6a 100644
--- a/src/EditorFeatures/Core/Implementation/Classification/SyntacticClassificationTaggerProvider.TagComputer.cs
+++ b/src/EditorFeatures/Core/Implementation/Classification/SyntacticClassificationTaggerProvider.TagComputer.cs
@@ -90,7 +90,7 @@ public TagComputer(
                 _typeMap = typeMap;
                 _diffTimeout = diffTimeout;
                 _workQueue = new AsyncBatchingWorkQueue<ITextSnapshot>(
-                    TimeSpan.FromMilliseconds(TaggerConstants.NearImmediateDelay),
+                    DelayTimeSpan.NearImmediate,
                     ProcessChangesAsync,
                     equalityComparer: null,
                     asyncListener,
diff --git a/src/EditorFeatures/Core/Implementation/CodeDefinitionWindow/DefinitionContextTracker.cs b/src/EditorFeatures/Core/Implementation/CodeDefinitionWindow/DefinitionContextTracker.cs
index 44a4f4fa7c36e..e1e1059e5944b 100644
--- a/src/EditorFeatures/Core/Implementation/CodeDefinitionWindow/DefinitionContextTracker.cs
+++ b/src/EditorFeatures/Core/Implementation/CodeDefinitionWindow/DefinitionContextTracker.cs
@@ -10,12 +10,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.GoToDefinition;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.MetadataAsSource;
 using Microsoft.CodeAnalysis.Navigation;
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindAllReferencesHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindAllReferencesHandler.cs
index 42a72ea4ee48e..858a994a40d2e 100644
--- a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindAllReferencesHandler.cs
+++ b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindAllReferencesHandler.cs
@@ -7,7 +7,6 @@
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServer.CustomProtocol;
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindImplementationsHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindImplementationsHandler.cs
index 88c0e3e83088a..f999ac967aa35 100644
--- a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindImplementationsHandler.cs
+++ b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindImplementationsHandler.cs
@@ -5,7 +5,6 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindUsagesLSPContext.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindUsagesLSPContext.cs
index e4a7218a913d1..3da4dac625de0 100644
--- a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindUsagesLSPContext.cs
+++ b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindUsagesLSPContext.cs
@@ -34,6 +34,7 @@ internal sealed class FindUsagesLSPContext : FindUsagesContext
         private readonly Document _document;
         private readonly int _position;
         private readonly IMetadataAsSourceFileService _metadataAsSourceFileService;
+        private readonly IGlobalOptionService _globalOptions;
 
         /// <summary>
         /// Methods in FindUsagesLSPContext can be called by multiple threads concurrently.
@@ -78,16 +79,19 @@ public FindUsagesLSPContext(
             IAsynchronousOperationListener asyncListener,
             IGlobalOptionService globalOptions,
             CancellationToken cancellationToken)
-            : base(globalOptions)
         {
             _progress = progress;
             _document = document;
             _position = position;
             _metadataAsSourceFileService = metadataAsSourceFileService;
+            _globalOptions = globalOptions;
             _workQueue = new AsyncBatchingWorkQueue<VSInternalReferenceItem>(
                 TimeSpan.FromMilliseconds(500), ReportReferencesAsync, asyncListener, cancellationToken);
         }
 
+        public override ValueTask<FindUsagesOptions> GetOptionsAsync(string language, CancellationToken cancellationToken)
+            => ValueTaskFactory.FromResult(_globalOptions.GetFindUsagesOptions(language));
+
         // After all definitions/references have been found, wait here until all results have been reported.
         public override async ValueTask OnCompletedAsync(CancellationToken cancellationToken)
             => await _workQueue.WaitUntilCurrentBatchCompletesAsync().ConfigureAwait(false);
diff --git a/src/EditorFeatures/Core/Implementation/NavigationBar/NavigationBarController.cs b/src/EditorFeatures/Core/Implementation/NavigationBar/NavigationBarController.cs
index 7d4858061767c..c9d7440fcc6e1 100644
--- a/src/EditorFeatures/Core/Implementation/NavigationBar/NavigationBarController.cs
+++ b/src/EditorFeatures/Core/Implementation/NavigationBar/NavigationBarController.cs
@@ -78,14 +78,14 @@ public NavigationBarController(
             _asyncListener = asyncListener;
 
             _computeModelQueue = new AsyncBatchingWorkQueue<bool, NavigationBarModel?>(
-                TimeSpan.FromMilliseconds(TaggerConstants.ShortDelay),
+                DelayTimeSpan.Short,
                 ComputeModelAndSelectItemAsync,
                 EqualityComparer<bool>.Default,
                 asyncListener,
                 _cancellationTokenSource.Token);
 
             _selectItemQueue = new AsyncBatchingWorkQueue(
-                TimeSpan.FromMilliseconds(TaggerConstants.NearImmediateDelay),
+                DelayTimeSpan.NearImmediate,
                 SelectItemAsync,
                 asyncListener,
                 _cancellationTokenSource.Token);
diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
index 3b99c30e08409..6a935b276cb16 100644
--- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -30,9 +30,7 @@
     <ProjectReference Include="..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" Aliases="Scripting,global" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Elfie" Version="$(MicrosoftCodeAnalysisElfieVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="$(MicrosoftVisualStudioLanguageStandardClassificationVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="$(MicrosoftVisualStudioRemoteControlVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="$(MicrosoftVisualStudioTextUIVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
     <!-- The ImageCatalog reference is only used at compile time, not at runtime, because it is not supported on Mac.
diff --git a/src/EditorFeatures/Core/Shared/Tagging/EventSources/TaggerConstants.cs b/src/EditorFeatures/Core/Shared/Tagging/EventSources/TaggerConstants.cs
index 8ace9eb3e26a0..66b0cbd887d79 100644
--- a/src/EditorFeatures/Core/Shared/Tagging/EventSources/TaggerConstants.cs
+++ b/src/EditorFeatures/Core/Shared/Tagging/EventSources/TaggerConstants.cs
@@ -10,12 +10,6 @@ namespace Microsoft.CodeAnalysis.Editor.Shared.Tagging
 {
     internal static class TaggerConstants
     {
-        internal const int NearImmediateDelay = 50;
-        internal const int ShortDelay = 250;
-        internal const int MediumDelay = 500;
-        internal const int IdleDelay = 1500;
-        internal const int NonFocusDelay = 3000;
-
         internal static TimeSpan ComputeTimeDelay(this TaggerDelay behavior, ITextBuffer textBufferOpt)
         {
             if (TextBufferAssociatedViewService.AnyAssociatedViewHasFocus(textBufferOpt))
@@ -25,16 +19,16 @@ internal static TimeSpan ComputeTimeDelay(this TaggerDelay behavior, ITextBuffer
                 return ComputeTimeDelay(behavior);
             }
 
-            return TimeSpan.FromMilliseconds(NonFocusDelay);
+            return DelayTimeSpan.NonFocus;
         }
 
         internal static TimeSpan ComputeTimeDelay(this TaggerDelay behavior)
             => behavior switch
             {
-                TaggerDelay.NearImmediate => TimeSpan.FromMilliseconds(NearImmediateDelay),
-                TaggerDelay.Short => TimeSpan.FromMilliseconds(ShortDelay),
-                TaggerDelay.Medium => TimeSpan.FromMilliseconds(MediumDelay),
-                _ => TimeSpan.FromMilliseconds(IdleDelay),
+                TaggerDelay.NearImmediate => DelayTimeSpan.NearImmediate,
+                TaggerDelay.Short => DelayTimeSpan.Short,
+                TaggerDelay.Medium => DelayTimeSpan.Medium,
+                _ => DelayTimeSpan.Idle,
             };
     }
 }
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngineFactory.cs b/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngineFactory.cs
deleted file mode 100644
index bc379cfbf7c7b..0000000000000
--- a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngineFactory.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Immutable;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Remote;
-using Roslyn.Utilities;
-
-namespace Microsoft.CodeAnalysis.SymbolSearch
-{
-    /// <summary>
-    /// Factory that will produce the <see cref="ISymbolSearchUpdateEngine"/>.  The default
-    /// implementation produces an engine that will run in-process.  Implementations at
-    /// other layers can behave differently (for example, running the engine out-of-process).
-    /// </summary>
-    /// <remarks>
-    /// This returns an No-op engine on non-Windows OS, because the backing storage depends on Windows APIs.
-    /// </remarks>
-    internal static partial class SymbolSearchUpdateEngineFactory
-    {
-        public static async Task<ISymbolSearchUpdateEngine> CreateEngineAsync(
-            Workspace workspace,
-            ISymbolSearchLogService logService,
-            CancellationToken cancellationToken)
-        {
-            var client = await RemoteHostClient.TryGetClientAsync(workspace, cancellationToken).ConfigureAwait(false);
-            if (client != null)
-            {
-                return new RemoteUpdateEngine(client, logService);
-            }
-
-            // Couldn't go out of proc.  Just do everything inside the current process.
-            return CreateEngineInProcess();
-        }
-
-        /// <summary>
-        /// This returns a No-op engine if called on non-Windows OS, because the backing storage depends on Windows APIs.
-        /// </summary>
-        public static ISymbolSearchUpdateEngine CreateEngineInProcess()
-        {
-            return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                ? new SymbolSearchUpdateEngine()
-                : new NoOpUpdateEngine();
-        }
-
-        private sealed class NoOpUpdateEngine : ISymbolSearchUpdateEngine
-        {
-            public ValueTask<ImmutableArray<PackageWithAssemblyResult>> FindPackagesWithAssemblyAsync(string source, string assemblyName, CancellationToken cancellationToken)
-                => ValueTaskFactory.FromResult(ImmutableArray<PackageWithAssemblyResult>.Empty);
-
-            public ValueTask<ImmutableArray<PackageWithTypeResult>> FindPackagesWithTypeAsync(string source, string name, int arity, CancellationToken cancellationToken)
-                => ValueTaskFactory.FromResult(ImmutableArray<PackageWithTypeResult>.Empty);
-
-            public ValueTask<ImmutableArray<ReferenceAssemblyWithTypeResult>> FindReferenceAssembliesWithTypeAsync(string name, int arity, CancellationToken cancellationToken)
-                => ValueTaskFactory.FromResult(ImmutableArray<ReferenceAssemblyWithTypeResult>.Empty);
-
-            public ValueTask UpdateContinuouslyAsync(string sourceName, string localSettingsDirectory, ISymbolSearchLogService logService, CancellationToken cancellationToken)
-                => default;
-        }
-
-        private sealed class RemoteUpdateEngine : ISymbolSearchUpdateEngine
-        {
-            private readonly RemoteServiceConnection<IRemoteSymbolSearchUpdateService> _connection;
-
-            public RemoteUpdateEngine(RemoteHostClient client, ISymbolSearchLogService logService)
-                => _connection = client.CreateConnection<IRemoteSymbolSearchUpdateService>(logService);
-
-            public void Dispose()
-                => _connection.Dispose();
-
-            public async ValueTask<ImmutableArray<PackageWithTypeResult>> FindPackagesWithTypeAsync(string source, string name, int arity, CancellationToken cancellationToken)
-            {
-                var result = await _connection.TryInvokeAsync<ImmutableArray<PackageWithTypeResult>>(
-                    (service, cancellationToken) => service.FindPackagesWithTypeAsync(source, name, arity, cancellationToken),
-                    cancellationToken).ConfigureAwait(false);
-
-                return result.HasValue ? result.Value : ImmutableArray<PackageWithTypeResult>.Empty;
-            }
-
-            public async ValueTask<ImmutableArray<PackageWithAssemblyResult>> FindPackagesWithAssemblyAsync(
-                string source, string assemblyName, CancellationToken cancellationToken)
-            {
-                var result = await _connection.TryInvokeAsync<ImmutableArray<PackageWithAssemblyResult>>(
-                    (service, cancellationToken) => service.FindPackagesWithAssemblyAsync(source, assemblyName, cancellationToken),
-                    cancellationToken).ConfigureAwait(false);
-
-                return result.HasValue ? result.Value : ImmutableArray<PackageWithAssemblyResult>.Empty;
-            }
-
-            public async ValueTask<ImmutableArray<ReferenceAssemblyWithTypeResult>> FindReferenceAssembliesWithTypeAsync(
-                string name, int arity, CancellationToken cancellationToken)
-            {
-                var result = await _connection.TryInvokeAsync<ImmutableArray<ReferenceAssemblyWithTypeResult>>(
-                    (service, cancellationToken) => service.FindReferenceAssembliesWithTypeAsync(name, arity, cancellationToken),
-                    cancellationToken).ConfigureAwait(false);
-
-                return result.HasValue ? result.Value : ImmutableArray<ReferenceAssemblyWithTypeResult>.Empty;
-            }
-
-            public async ValueTask UpdateContinuouslyAsync(string sourceName, string localSettingsDirectory, ISymbolSearchLogService logService, CancellationToken cancellationToken)
-            {
-                // logService parameter is ignored since it's already set on the connection as a callback
-                _ = logService;
-
-                _ = await _connection.TryInvokeAsync(
-                    (service, callbackId, cancellationToken) => service.UpdateContinuouslyAsync(callbackId, sourceName, localSettingsDirectory, cancellationToken),
-                    cancellationToken).ConfigureAwait(false);
-            }
-        }
-    }
-}
diff --git a/src/EditorFeatures/Core/Tagging/CompilationAvailableTaggerEventSource.cs b/src/EditorFeatures/Core/Tagging/CompilationAvailableTaggerEventSource.cs
index 128f35fb8dee5..392bf5f4dd095 100644
--- a/src/EditorFeatures/Core/Tagging/CompilationAvailableTaggerEventSource.cs
+++ b/src/EditorFeatures/Core/Tagging/CompilationAvailableTaggerEventSource.cs
@@ -3,12 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Shared.Tagging;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Remote;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
+using Microsoft.CodeAnalysis.Tagging;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;
@@ -16,7 +16,6 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Tagging
 {
-
     /// <summary>
     /// Tagger event that fires once the compilation is available in the remote OOP process for a particular project.
     /// Used to trigger things such as:
@@ -27,7 +26,7 @@ namespace Microsoft.CodeAnalysis.Editor.Tagging
     /// <item>recomputation of inheritance margin items due to frozen-partial compilations being used.</item>
     /// </list>
     /// </summary>
-    internal class CompilationAvailableTaggerEventSource : ITaggerEventSource
+    internal sealed class CompilationAvailableTaggerEventSource : ITaggerEventSource
     {
         private readonly ITextBuffer _subjectBuffer;
         private readonly IAsynchronousOperationListener _asyncListener;
@@ -114,7 +113,7 @@ private void OnEventSourceChanged(object? sender, TaggerEventArgs args)
                 else
                 {
                     // if we can't get the client, just compute the compilation locally and fire the event once we have it.
-                    await ComputeCompilationInCurrentProcessAsync(document.Project, cancellationToken).ConfigureAwait(false);
+                    await CompilationAvailableHelpers.ComputeCompilationInCurrentProcessAsync(document.Project, cancellationToken).ConfigureAwait(false);
                 }
 
                 // now that we know we have an full compilation, retrigger the tagger so it can show accurate results with the 
@@ -123,9 +122,5 @@ private void OnEventSourceChanged(object? sender, TaggerEventArgs args)
             }, cancellationToken);
             task.CompletesAsyncOperation(token);
         }
-
-        // this method is super basic.  but it ensures that the remote impl and the local impl always agree.
-        public static Task ComputeCompilationInCurrentProcessAsync(Project project, CancellationToken cancellationToken)
-            => project.GetCompilationAsync(cancellationToken);
     }
 }
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf
index 52a8495df8ade..d78ba0c316f51 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.cs.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Aplikují se změny.</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Změnit konfiguraci</target>
@@ -322,11 +327,6 @@
         <target state="translated">Výsledky mohou být neúplné, protože řešení stále načítá projekty.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">Tento symbol nemá žádný základ.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Přepnout komentář k bloku</target>
@@ -597,11 +597,6 @@
         <target state="translated">Tento element nejde přejmenovat, protože se nachází v umístění, na které nejde přejít.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">Základy {0}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">Vyřeší se tento počet konfliktů: {0}.</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Formátuje se aktuálně vybraný text...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Nejde navigovat k symbolu pod stříškou.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Přejít k definici</target>
@@ -1429,11 +1419,6 @@ Chcete pokračovat?</target>
         <target state="translated">Přejít na implementaci</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">Tento symbol nemá žádné implementace.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Nový název: {0}</target>
@@ -1459,16 +1444,6 @@ Chcete pokračovat?</target>
         <target state="translated">Výpustka návrhu (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'Reference symbolů {0}</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'Implementace symbolů {0}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'Deklarace symbolů {0}</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf
index 80811b9b21d5e..792feb55e79e9 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.de.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Änderungen werden übernommen</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Konfiguration ändern</target>
@@ -322,11 +327,6 @@
         <target state="translated">Die Ergebnisse sind möglicherweise unvollständig, da die Projektmappe noch Projekte lädt.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">Das Symbol verfügt über keine Basis.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Kommentarblock ein/aus</target>
@@ -597,11 +597,6 @@
         <target state="translated">Dieses Element kann nicht umbenannt werden, weil es sich an einem Speicherort befindet, zu dem nicht navigiert werden kann.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">Basiswerte: "{0}"</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">{0} Konflikt(e) werden gelöst</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Aktuell markierter Text wird formatiert...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Navigieren zu dem Symbol unter dem Caret nicht möglich.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Gehe zu Definition</target>
@@ -1429,11 +1419,6 @@ Möchten Sie fortfahren?</target>
         <target state="translated">Zur Implementierung wechseln</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">Das Symbol verfügt über keine Implementierungen.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Neuer Name: "{0}"</target>
@@ -1459,16 +1444,6 @@ Möchten Sie fortfahren?</target>
         <target state="translated">Auslassungspunkte für Vorschlag (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">"{0}"-Verweise</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">"{0}"-Implementierungen</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">"{0}"-Deklarationen</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf
index caeff60ff6c19..22caeb5f0c87e 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.es.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Aplicando cambios</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Configuración de cambio</target>
@@ -322,11 +327,6 @@
         <target state="translated">Los resultados pueden estar incompletos porque la solución aún está cargando proyectos.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">El símbolo no tiene base.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Alternar comentario de bloque</target>
@@ -597,11 +597,6 @@
         <target state="translated">No se puede cambiar el nombre de este elemento porque está en una ubicación a la que no se puede navegar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">Bases de "{0}"</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">Se va(n) a resolver {0} conflicto(s)</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Dando formato al texto seleccionado actualmente...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">No se puede navegar al símbolo que hay debajo del símbolo de intercalación.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Ir a definición</target>
@@ -1429,11 +1419,6 @@ Do you want to proceed?</source>
         <target state="translated">Ir a implementación</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">El símbolo no tiene implementaciones.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Nuevo nombre: {0}</target>
@@ -1459,16 +1444,6 @@ Do you want to proceed?</source>
         <target state="translated">Puntos suspensivos de sugerencia (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'Referencias de "{0}"</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'Implementaciones de "{0}"</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'Declaraciones de "{0}"</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf
index cc3e8fd3d9a07..a92842642571f 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.fr.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Application des changements</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Changer la configuration</target>
@@ -322,11 +327,6 @@
         <target state="translated">Les résultats sont peut-être incomplets, car la solution est toujours en train de charger des projets.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">Le symbole n'a pas de base.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Activer/désactiver le commentaire de bloc</target>
@@ -597,11 +597,6 @@
         <target state="translated">Vous ne pouvez pas renommer cet élément, car il se trouve dans un emplacement inaccessible.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">'{0}' bases</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">{0} conflit(s) seront résolus</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Mise en forme du texte actuellement sélectionné...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Impossible de naviguer jusqu'au symbole sous le caret.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Atteindre la définition</target>
@@ -1429,11 +1419,6 @@ Voulez-vous continuer ?</target>
         <target state="translated">Accéder à l'implémentation</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">Le symbole n'a pas d'implémentations.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Nouveau nom : {0}</target>
@@ -1459,16 +1444,6 @@ Voulez-vous continuer ?</target>
         <target state="translated">Bouton de sélection (…) de suggestion</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'Références '{0}'</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'Implémentations '{0}'</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'Déclarations '{0}'</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf
index 2529637ced4f8..45efa478d4b68 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.it.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Applicazione delle modifiche in corso</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Cambia la configurazione</target>
@@ -322,11 +327,6 @@
         <target state="translated">I risultati potrebbero essere incompleti perché la soluzione ancora carica i progetti.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">Non è presente alcuna base per il simbolo.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Attiva/Disattiva commento per il blocco</target>
@@ -597,11 +597,6 @@
         <target state="translated">Non è possibile rinominare questo elemento perché si trova in una posizione a cui non è possibile passare.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">Basi di '{0}'</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">Verranno risolti {0} conflitti</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Formattazione del testo attualmente selezionato...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Non è possibile passare al simbolo sotto il punto di inserimento.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Vai a definizione</target>
@@ -1429,11 +1419,6 @@ Continuare?</target>
         <target state="translated">Vai all'implementazione</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">Non sono presenti implementazioni per il simbolo.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Nuovo nome: {0}</target>
@@ -1459,16 +1444,6 @@ Continuare?</target>
         <target state="translated">Puntini di sospensione di suggerimento (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'Riferimenti di '{0}'</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'Implementazioni di '{0}'</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'Dichiarazioni di '{0}'</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf
index 9a39e63603782..8ff3dd81f82cc 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ja.xlf
@@ -12,6 +12,11 @@
         <target state="translated">変更の適用</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">構成の変更</target>
@@ -322,11 +327,6 @@
         <target state="translated">ソリューションでプロジェクトを読み込み中であるため、結果は不完全になる可能性があります。</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">シンボルにベースがありません。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">ブロック コメントの切り替え</target>
@@ -597,11 +597,6 @@
         <target state="translated">この要素は、移動できない場所にあるため、名前を変更できません。</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">'{0}' ベース</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">{0} 個の競合が解決されます</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">現在選択されているテキストを書式設定しています...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">カレットの下のシンボルに移動できません。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">定義へ移動</target>
@@ -1429,11 +1419,6 @@ Do you want to proceed?</source>
         <target state="translated">実装に移動</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">シンボルに実装がありません。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">新しい名前: {0}</target>
@@ -1459,16 +1444,6 @@ Do you want to proceed?</source>
         <target state="translated">提案事項の省略記号 (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'{0}' の参照</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'{0}' の実装</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'{0}' の宣言</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf
index ec4599726565d..deef104085218 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ko.xlf
@@ -12,6 +12,11 @@
         <target state="translated">변경 내용 적용</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">구성 변경</target>
@@ -322,11 +327,6 @@
         <target state="translated">솔루션이 아직 프로젝트를 로드하는 중이므로 결과가 불완전할 수 있습니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">기호에 베이스가 없습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">블록 주석 토글</target>
@@ -597,11 +597,6 @@
         <target state="translated">이 요소는 탐색할 수 없는 위치에 있으므로 이름을 바꿀 수 없습니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">'{0}' 기본</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">충돌 {0}개가 해결됩니다.</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">현재 선택한 텍스트의 서식을 지정하는 중...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">캐럿에서 기호를 탐색할 수 없습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">정의로 이동</target>
@@ -1429,11 +1419,6 @@ Do you want to proceed?</source>
         <target state="translated">구현으로 이동</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">기호에 구현이 없습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">새 이름: {0}</target>
@@ -1459,16 +1444,6 @@ Do you want to proceed?</source>
         <target state="translated">제안 줄임표(…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'{0}' 참조</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'{0}' 구현</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'{0}' 선언</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf
index 2dd83f04669f8..a1dbb17005f72 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pl.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Stosowanie zmian</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Zmień konfigurację</target>
@@ -322,11 +327,6 @@
         <target state="translated">Wyniki mogą być niekompletne, ponieważ rozwiązanie nadal ładuje projekty.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">Symbol nie ma wartości podstawowej.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Przełącz komentarz blokowy</target>
@@ -597,11 +597,6 @@
         <target state="translated">Nie możesz zmienić nazwy tego elementu, ponieważ znajduje się on w lokalizacji, do której nie można nawigować.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">Wartości podstawowe „{0}”</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">Następująca liczba konfliktów zostanie rozwiązana: {0}</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Trwa formatowanie aktualnie zaznaczonego tekstu...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Nie można przejść do symbolu pod karetką.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Przejdź do definicji</target>
@@ -1429,11 +1419,6 @@ Czy chcesz kontynuować?</target>
         <target state="translated">Przejdź do implementacji</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">Symbol nie ma implementacji.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Nowa nazwa: {0}</target>
@@ -1459,16 +1444,6 @@ Czy chcesz kontynuować?</target>
         <target state="translated">Wielokropki sugestii (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'Odwołania „{0}”</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'Implementacje „{0}”</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'Deklaracje „{0}”</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf
index ff83385d02eee..4d4bc9e938eaa 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.pt-BR.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Aplicando mudanças</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Alterar configuração</target>
@@ -322,11 +327,6 @@
         <target state="translated">Os resultados podem estar incompletos porque a solução ainda está carregando projetos.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">O símbolo não tem nenhuma base.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Ativar/Desativar Comentário de Bloco</target>
@@ -597,11 +597,6 @@
         <target state="translated">Você não pode renomear este elemento porque ele está em um local para o qual não é possível navegar.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">Bases '{0}'</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">{0} conflito(s) será(ão) resolvido(s)</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Formatando texto selecionado no momento...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Não é possível navegar para o símbolo sob o cursor.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Ir para Definição</target>
@@ -1429,11 +1419,6 @@ Deseja continuar?</target>
         <target state="translated">Ir Para Implementação</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">O símbolo não tem implementações.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Novo nome: {0}</target>
@@ -1459,16 +1444,6 @@ Deseja continuar?</target>
         <target state="translated">Reticências de sugestão (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'{0}' referências</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'Implementações de '{0}'</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'Declarações de '{0}'</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf
index 1b413fbbd6a38..d896d6adb11df 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.ru.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Применение изменений</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Изменить конфигурацию</target>
@@ -322,11 +327,6 @@
         <target state="translated">Результаты могут быть неполными, поскольку решение еще загружает проекты.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">У этого символа нет основания.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Переключить комментарий блока</target>
@@ -597,11 +597,6 @@
         <target state="translated">Невозможно переименовать этот элемент, так как он находится в расположении, к которому невозможно перейти.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">Основания: "{0}"</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">Конфликтов будет разрешено: {0}</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Идет форматирование выбранного текста...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Не удается перейти к символу, на котором находится курсор.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Перейти к определению</target>
@@ -1429,11 +1419,6 @@ Do you want to proceed?</source>
         <target state="translated">Перейти к реализации</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">Этот символ не имеет реализации.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Новое имя: {0}</target>
@@ -1459,16 +1444,6 @@ Do you want to proceed?</source>
         <target state="translated">Предложение с многоточием (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'Ссылки "{0}"</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'Реализации "{0}"</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'Объявления "{0}"</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf
index 27c4ca463db85..cd8b7832b9156 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.tr.xlf
@@ -12,6 +12,11 @@
         <target state="translated">Değişiklikler uygulanıyor</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">Değiştir yapılandırma</target>
@@ -322,11 +327,6 @@
         <target state="translated">Çözüm projeleri hala yüklemediğinden sonuçlar tamamlanmamış olabilir.</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">Sembolde taban yok.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">Blok Açıklamasını Aç/Kapat</target>
@@ -597,11 +597,6 @@
         <target state="translated">Gezintiyle ulaşılamayan bir konumda bulunduğundan bu öğeyi yeniden adlandıramazsınız.</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">'{0}' tabanları</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">{0} çakışmaları çözümlenecek</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">Seçilen metin biçimlendiriliyor...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">Giriş işareti altında sembole gidilemiyor.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">Tanıma Git</target>
@@ -1429,11 +1419,6 @@ Devam etmek istiyor musunuz?</target>
         <target state="translated">Uygulamaya Git</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">Sembolde hiç uygulama yok.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">Yeni ad: {0}</target>
@@ -1459,16 +1444,6 @@ Devam etmek istiyor musunuz?</target>
         <target state="translated">Öneri üç noktası (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'{0}' başvuruları</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'{0}' uygulamaları</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'{0}' bildirimleri</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf
index 8eaae5aff0679..c7686f6cf7967 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hans.xlf
@@ -12,6 +12,11 @@
         <target state="translated">应用更改</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">更改配置</target>
@@ -322,11 +327,6 @@
         <target state="translated">由于解决方案仍在加载项目，结果可能不完整。</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">符号没有基数。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">切换为块注释</target>
@@ -597,11 +597,6 @@
         <target state="translated">无法重命名此元素，因为它位于无法导航到的位置。</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">“{0}”基数</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">将解决 {0} 个冲突</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">正在设置当前所选文本的格式...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">无法导航到插入点下面的符号。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">转到定义</target>
@@ -1429,11 +1419,6 @@ Do you want to proceed?</source>
         <target state="translated">转到实现</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">符号没有实现。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">新名称: {0}</target>
@@ -1459,16 +1444,6 @@ Do you want to proceed?</source>
         <target state="translated">建议使用省略号(…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">“{0}”引用</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">“{0}”实现</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">“{0}”声明</target>
diff --git a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf
index 9430e54dc00d6..84fef01be95d5 100644
--- a/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf
+++ b/src/EditorFeatures/Core/xlf/EditorFeaturesResources.zh-Hant.xlf
@@ -12,6 +12,11 @@
         <target state="translated">正在套用變更</target>
         <note />
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Change_configuration">
         <source>Change configuration</source>
         <target state="translated">變更組態</target>
@@ -322,11 +327,6 @@
         <target state="translated">結果可能不完整，因為方案仍在載入專案。</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_base">
-        <source>The symbol has no base.</source>
-        <target state="translated">該符號沒有任何基底。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Toggle_Block_Comment">
         <source>Toggle Block Comment</source>
         <target state="translated">切換區塊註解</target>
@@ -597,11 +597,6 @@
         <target state="translated">因為無法瀏覽到此項目的所在位置，所以無法予以重新命名。</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_bases">
-        <source>'{0}' bases</source>
-        <target state="translated">'{0}' 個基底</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_conflict_s_will_be_resolved">
         <source>{0} conflict(s) will be resolved</source>
         <target state="translated">將解決 {0} 項衝突</target>
@@ -1017,11 +1012,6 @@
         <target state="translated">正在格式化目前選取的文字...</target>
         <note />
       </trans-unit>
-      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
-        <source>Cannot navigate to the symbol under the caret.</source>
-        <target state="translated">無法巡覽至插入號下的符號。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Go_to_Definition">
         <source>Go to Definition</source>
         <target state="translated">移至定義</target>
@@ -1429,11 +1419,6 @@ Do you want to proceed?</source>
         <target state="translated">前往實作</target>
         <note />
       </trans-unit>
-      <trans-unit id="The_symbol_has_no_implementations">
-        <source>The symbol has no implementations.</source>
-        <target state="translated">符號沒有任何實作。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="New_name_colon_0">
         <source>New name: {0}</source>
         <target state="translated">新名稱: {0}</target>
@@ -1459,16 +1444,6 @@ Do you want to proceed?</source>
         <target state="translated">建議省略符號 (…)</target>
         <note />
       </trans-unit>
-      <trans-unit id="_0_references">
-        <source>'{0}' references</source>
-        <target state="translated">'{0}' 參考</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="_0_implementations">
-        <source>'{0}' implementations</source>
-        <target state="translated">'{0}' 實作</target>
-        <note />
-      </trans-unit>
       <trans-unit id="_0_declarations">
         <source>'{0}' declarations</source>
         <target state="translated">'{0}' 宣告</target>
diff --git a/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs b/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs
index c995272eec89f..9843a1c315aa2 100644
--- a/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs
+++ b/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs
@@ -32,11 +32,13 @@ private class MockFindUsagesContext : FindUsagesContext
         {
             public readonly List<DefinitionItem> Result = new();
 
-            public MockFindUsagesContext(IGlobalOptionService globalOptions)
-                : base(globalOptions)
+            public MockFindUsagesContext()
             {
             }
 
+            public override ValueTask<FindUsagesOptions> GetOptionsAsync(string language, CancellationToken cancellationToken)
+                => ValueTaskFactory.FromResult(FindUsagesOptions.Default);
+
             public override ValueTask OnDefinitionFoundAsync(DefinitionItem definition, CancellationToken cancellationToken)
             {
                 lock (Result)
@@ -70,7 +72,7 @@ public void ClearAll()
         public async Task TestFindReferencesAsynchronousCall()
         {
             using var workspace = TestWorkspace.CreateCSharp("class C { C() { new C(); } }");
-            var context = new MockFindUsagesContext(workspace.GlobalOptions);
+            var context = new MockFindUsagesContext();
             var presenter = new MockStreamingFindUsagesPresenter(context);
 
             var listenerProvider = workspace.ExportProvider.GetExportedValue<IAsynchronousOperationListenerProvider>();
diff --git a/src/EditorFeatures/Test/StackTraceExplorer/StackTraceExplorerTests.cs b/src/EditorFeatures/Test/StackTraceExplorer/StackTraceExplorerTests.cs
index b34d85366d5c1..5988d9b7defe0 100644
--- a/src/EditorFeatures/Test/StackTraceExplorer/StackTraceExplorerTests.cs
+++ b/src/EditorFeatures/Test/StackTraceExplorer/StackTraceExplorerTests.cs
@@ -6,9 +6,9 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.StackTraceExplorer;
 using Microsoft.CodeAnalysis.Test.Utilities;
diff --git a/src/EditorFeatures/Test2/FindReferences/FindReferencesCommandHandlerTests.vb b/src/EditorFeatures/Test2/FindReferences/FindReferencesCommandHandlerTests.vb
index c2d968de81c59..9e1b933f67fa8 100644
--- a/src/EditorFeatures/Test2/FindReferences/FindReferencesCommandHandlerTests.vb
+++ b/src/EditorFeatures/Test2/FindReferences/FindReferencesCommandHandlerTests.vb
@@ -38,7 +38,7 @@ class C
 
                 Dim listenerProvider = workspace.ExportProvider.GetExportedValue(Of IAsynchronousOperationListenerProvider)
 
-                Dim context = New FindReferencesTests.TestContext(workspace.GlobalOptions)
+                Dim context = New FindReferencesTests.TestContext()
                 Dim commandHandler = New FindReferencesCommandHandler(
                     New MockStreamingFindReferencesPresenter(context),
                     workspace.GlobalOptions,
diff --git a/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.vb b/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.vb
index 0751309f7039d..5a6fa64e6c50e 100644
--- a/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.vb
+++ b/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.vb
@@ -5,7 +5,6 @@
 Imports System.Collections.Immutable
 Imports System.Threading
 Imports Microsoft.CodeAnalysis
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.FindSymbols
 Imports Microsoft.CodeAnalysis.FindUsages
@@ -73,7 +72,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
                     Assert.NotNull(startDocument)
 
                     Dim findRefsService = startDocument.GetLanguageService(Of IFindUsagesService)
-                    Dim context = New TestContext(workspace.GlobalOptions)
+                    Dim context = New TestContext()
                     Await findRefsService.FindReferencesAsync(context, startDocument, cursorPosition, CancellationToken.None)
 
                     Dim expectedDefinitions =
@@ -225,10 +224,13 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.FindReferences
             Public ReadOnly Definitions As List(Of DefinitionItem) = New List(Of DefinitionItem)()
             Public ReadOnly References As List(Of SourceReferenceItem) = New List(Of SourceReferenceItem)()
 
-            Public Sub New(globalOptions As IGlobalOptionService)
-                MyBase.New(globalOptions)
+            Public Sub New()
             End Sub
 
+            Public Overrides Function GetOptionsAsync(language As String, cancellationToken As CancellationToken) As ValueTask(Of FindUsagesOptions)
+                Return ValueTaskFactory.FromResult(FindUsagesOptions.Default)
+            End Function
+
             Public Function ShouldShow(definition As DefinitionItem) As Boolean
                 If References.Any(Function(r) r.Definition Is definition) Then
                     Return True
diff --git a/src/EditorFeatures/Test2/GoToBase/GoToBaseTestsBase.vb b/src/EditorFeatures/Test2/GoToBase/GoToBaseTestsBase.vb
index 368ec5ca44c0d..603229db9867c 100644
--- a/src/EditorFeatures/Test2/GoToBase/GoToBaseTestsBase.vb
+++ b/src/EditorFeatures/Test2/GoToBase/GoToBaseTestsBase.vb
@@ -3,8 +3,8 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Threading
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
-Imports Microsoft.CodeAnalysis.Editor.GoToBase
+Imports Microsoft.CodeAnalysis.FindUsages
+Imports Microsoft.CodeAnalysis.GoToBase
 Imports Microsoft.CodeAnalysis.Remote.Testing
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.GoToBase
diff --git a/src/EditorFeatures/Test2/GoToHelpers/GoToHelpers.vb b/src/EditorFeatures/Test2/GoToHelpers/GoToHelpers.vb
index e379ca10b31ea..71e4b548d3ad2 100644
--- a/src/EditorFeatures/Test2/GoToHelpers/GoToHelpers.vb
+++ b/src/EditorFeatures/Test2/GoToHelpers/GoToHelpers.vb
@@ -4,7 +4,7 @@
 
 Imports System.Threading
 Imports Microsoft.CodeAnalysis
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
+Imports Microsoft.CodeAnalysis.FindUsages
 Imports Microsoft.CodeAnalysis.Editor.UnitTests
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities.GoToHelpers
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
diff --git a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb
index 7a65a0658a255..8b48e6fc1831e 100644
--- a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb
+++ b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb
@@ -3,7 +3,7 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports Microsoft.CodeAnalysis.Remote.Testing
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
+Imports Microsoft.CodeAnalysis.FindUsages
 Imports System.Threading
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.GoToImplementation
diff --git a/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/MockNavigableItemsPresenter.vb b/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/MockNavigableItemsPresenter.vb
index f058d7ea376ee..4297c81ee498e 100644
--- a/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/MockNavigableItemsPresenter.vb
+++ b/src/EditorFeatures/TestUtilities2/Utilities/GoToHelpers/MockNavigableItemsPresenter.vb
@@ -3,7 +3,6 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Threading
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
 Imports Microsoft.CodeAnalysis.Editor.Host
 Imports Microsoft.CodeAnalysis.FindUsages
 Imports Microsoft.CodeAnalysis.Options
diff --git a/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesLSPService.vb b/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesLSPService.vb
index bd1bfaf985bae..40c58220e3c46 100644
--- a/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesLSPService.vb
+++ b/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesLSPService.vb
@@ -3,8 +3,7 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Composition
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
-Imports Microsoft.CodeAnalysis.Editor.Shared.Utilities
+Imports Microsoft.CodeAnalysis.FindUsages
 Imports Microsoft.CodeAnalysis.Host.Mef
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.FindUsages
diff --git a/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesService.vb b/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesService.vb
index 7d82719bb8af4..87faa5bd0305d 100644
--- a/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesService.vb
+++ b/src/EditorFeatures/VisualBasic/FindUsages/VisualBasicFindUsagesService.vb
@@ -3,7 +3,7 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Composition
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
+Imports Microsoft.CodeAnalysis.FindUsages
 Imports Microsoft.CodeAnalysis.Host.Mef
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.FindUsages
diff --git a/src/EditorFeatures/VisualBasic/GoToBase/VisualBasicGoToBaseService.vb b/src/EditorFeatures/VisualBasic/GoToBase/VisualBasicGoToBaseService.vb
index 68fbdc7e4b308..c69c2b91d5cbc 100644
--- a/src/EditorFeatures/VisualBasic/GoToBase/VisualBasicGoToBaseService.vb
+++ b/src/EditorFeatures/VisualBasic/GoToBase/VisualBasicGoToBaseService.vb
@@ -3,10 +3,10 @@
 ' See the LICENSE file in the project root for more information.
 
 Imports System.Composition
-Imports Microsoft.CodeAnalysis.Editor.GoToBase
+Imports Microsoft.CodeAnalysis.GoToBase
 Imports Microsoft.CodeAnalysis.Host.Mef
 
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GoToBase
+Namespace Microsoft.CodeAnalysis.VisualBasic.GoToBase
     <ExportLanguageService(GetType(IGoToBaseService), LanguageNames.VisualBasic), [Shared]>
     Friend Class VisualBasicGoToBaseService
         Inherits AbstractGoToBaseService
diff --git a/src/Features/Core/Portable/Common/DelayTimeSpan.cs b/src/Features/Core/Portable/Common/DelayTimeSpan.cs
new file mode 100644
index 0000000000000..59d9aa6100664
--- /dev/null
+++ b/src/Features/Core/Portable/Common/DelayTimeSpan.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.CodeAnalysis
+{
+    internal static class DelayTimeSpan
+    {
+        public static readonly TimeSpan NearImmediate = TimeSpan.FromMilliseconds(50);
+        public static readonly TimeSpan Short = TimeSpan.FromMilliseconds(250);
+        public static readonly TimeSpan Medium = TimeSpan.FromMilliseconds(500);
+        public static readonly TimeSpan Idle = TimeSpan.FromMilliseconds(1500);
+        public static readonly TimeSpan NonFocus = TimeSpan.FromMilliseconds(3000);
+    }
+}
diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index c32bc86818353..70984a455c7e7 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -3109,4 +3109,22 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
   <data name="Invalid_JSON_pattern" xml:space="preserve">
     <value>Invalid JSON pattern</value>
   </data>
+  <data name="Cannot_navigate_to_the_symbol_under_the_caret" xml:space="preserve">
+    <value>Cannot navigate to the symbol under the caret.</value>
+  </data>
+  <data name="_0_bases" xml:space="preserve">
+    <value>'{0}' bases</value>
+  </data>
+  <data name="_0_implementations" xml:space="preserve">
+    <value>'{0}' implementations</value>
+  </data>
+  <data name="_0_references" xml:space="preserve">
+    <value>'{0}' references</value>
+  </data>
+  <data name="The_symbol_has_no_base" xml:space="preserve">
+    <value>The symbol has no base.</value>
+  </data>
+  <data name="The_symbol_has_no_implementations" xml:space="preserve">
+    <value>The symbol has no implementations.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.DefinitionTrackingContext.cs b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.DefinitionTrackingContext.cs
similarity index 98%
rename from src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.DefinitionTrackingContext.cs
rename to src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.DefinitionTrackingContext.cs
index 029f5b98ae1e9..c842382b53dae 100644
--- a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.DefinitionTrackingContext.cs
+++ b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.DefinitionTrackingContext.cs
@@ -9,7 +9,7 @@
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal abstract partial class AbstractFindUsagesService
     {
diff --git a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.ProgressAdapter.cs b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.ProgressAdapter.cs
similarity index 99%
rename from src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.ProgressAdapter.cs
rename to src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.ProgressAdapter.cs
index 434457440b7cf..d5e481db581db 100644
--- a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.ProgressAdapter.cs
+++ b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.ProgressAdapter.cs
@@ -16,7 +16,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal abstract partial class AbstractFindUsagesService
     {
diff --git a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.cs b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.cs
similarity index 75%
rename from src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.cs
rename to src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.cs
index 7cf32892ba986..8e9bc8eb5ea90 100644
--- a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService.cs
+++ b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService.cs
@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
-
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal abstract partial class AbstractFindUsagesService : IFindUsagesService, IFindUsagesLSPService
     {
diff --git a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService_FindImplementations.cs b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService_FindImplementations.cs
similarity index 96%
rename from src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService_FindImplementations.cs
rename to src/Features/Core/Portable/FindUsages/AbstractFindUsagesService_FindImplementations.cs
index 740bf859c20c6..45a50f3e08c94 100644
--- a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService_FindImplementations.cs
+++ b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService_FindImplementations.cs
@@ -15,7 +15,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal abstract partial class AbstractFindUsagesService
     {
@@ -28,7 +28,7 @@ public async Task FindImplementationsAsync(
             if (symbolAndProjectOpt == null)
             {
                 await context.ReportMessageAsync(
-                    EditorFeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret, cancellationToken).ConfigureAwait(false);
+                    FeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret, cancellationToken).ConfigureAwait(false);
                 return;
             }
 
@@ -68,7 +68,7 @@ private static async Task FindImplementationsInCurrentProcessAsync(
             ISymbol symbol, Project project, IFindUsagesContext context, CancellationToken cancellationToken)
         {
             await context.SetSearchTitleAsync(
-                string.Format(EditorFeaturesResources._0_implementations,
+                string.Format(FeaturesResources._0_implementations,
                 FindUsagesHelpers.GetDisplayName(symbol)),
                 cancellationToken).ConfigureAwait(false);
 
@@ -77,7 +77,7 @@ await context.SetSearchTitleAsync(
 
             if (implementations.IsEmpty)
             {
-                await context.ReportMessageAsync(EditorFeaturesResources.The_symbol_has_no_implementations, cancellationToken).ConfigureAwait(false);
+                await context.ReportMessageAsync(FeaturesResources.The_symbol_has_no_implementations, cancellationToken).ConfigureAwait(false);
                 return;
             }
 
diff --git a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService_FindReferences.cs b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService_FindReferences.cs
similarity index 98%
rename from src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService_FindReferences.cs
rename to src/Features/Core/Portable/FindUsages/AbstractFindUsagesService_FindReferences.cs
index c95052500a3a3..7d67940e9cbc3 100644
--- a/src/EditorFeatures/Core/FindUsages/AbstractFindUsagesService_FindReferences.cs
+++ b/src/Features/Core/Portable/FindUsages/AbstractFindUsagesService_FindReferences.cs
@@ -17,7 +17,7 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal abstract partial class AbstractFindUsagesService
     {
@@ -109,7 +109,7 @@ public static async Task FindSymbolReferencesAsync(
             IFindUsagesContext context, ISymbol symbol, Project project, CancellationToken cancellationToken)
         {
             await context.SetSearchTitleAsync(
-                string.Format(EditorFeaturesResources._0_references,
+                string.Format(FeaturesResources._0_references,
                 FindUsagesHelpers.GetDisplayName(symbol)),
                 cancellationToken).ConfigureAwait(false);
 
@@ -213,7 +213,7 @@ private static async Task<bool> TryFindLiteralReferencesAsync(
                 title = title.Substring(0, 10) + "...";
             }
 
-            var searchTitle = string.Format(EditorFeaturesResources._0_references, title);
+            var searchTitle = string.Format(FeaturesResources._0_references, title);
             await context.SetSearchTitleAsync(searchTitle, cancellationToken).ConfigureAwait(false);
 
             var solution = document.Project.Solution;
diff --git a/src/Features/Core/Portable/FindUsages/ExternalScope.cs b/src/Features/Core/Portable/FindUsages/ExternalScope.cs
index 4f4e0416f90cb..55b3fb4e3944b 100644
--- a/src/Features/Core/Portable/FindUsages/ExternalScope.cs
+++ b/src/Features/Core/Portable/FindUsages/ExternalScope.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal enum ExternalScope
diff --git a/src/EditorFeatures/Core/FindUsages/FindUsagesContext.cs b/src/Features/Core/Portable/FindUsages/FindUsagesContext.cs
similarity index 79%
rename from src/EditorFeatures/Core/FindUsages/FindUsagesContext.cs
rename to src/Features/Core/Portable/FindUsages/FindUsagesContext.cs
index 0d4cd684c13e0..64ccc1393cef3 100644
--- a/src/EditorFeatures/Core/FindUsages/FindUsagesContext.cs
+++ b/src/Features/Core/Portable/FindUsages/FindUsagesContext.cs
@@ -12,18 +12,14 @@ namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal abstract class FindUsagesContext : IFindUsagesContext
     {
-        private readonly IGlobalOptionService _globalOptions;
-
         public IStreamingProgressTracker ProgressTracker { get; }
 
-        protected FindUsagesContext(IGlobalOptionService globalOptions)
+        protected FindUsagesContext()
         {
             ProgressTracker = new StreamingProgressTracker(ReportProgressAsync);
-            _globalOptions = globalOptions;
         }
 
-        public ValueTask<FindUsagesOptions> GetOptionsAsync(string language, CancellationToken cancellationToken)
-            => ValueTaskFactory.FromResult(_globalOptions.GetFindUsagesOptions(language));
+        public abstract ValueTask<FindUsagesOptions> GetOptionsAsync(string language, CancellationToken cancellationToken);
 
         public virtual ValueTask ReportMessageAsync(string message, CancellationToken cancellationToken) => default;
 
diff --git a/src/Features/Core/Portable/FindUsages/FindUsagesHelpers.cs b/src/Features/Core/Portable/FindUsages/FindUsagesHelpers.cs
index fb6da25c517b7..818f39973d2c7 100644
--- a/src/Features/Core/Portable/FindUsages/FindUsagesHelpers.cs
+++ b/src/Features/Core/Portable/FindUsages/FindUsagesHelpers.cs
@@ -11,7 +11,7 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.SymbolMapping;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal static class FindUsagesHelpers
     {
diff --git a/src/Features/Core/Portable/FindUsages/FindUsagesOptions.cs b/src/Features/Core/Portable/FindUsages/FindUsagesOptions.cs
index 806bcd52e26dd..99c48595a6e8b 100644
--- a/src/Features/Core/Portable/FindUsages/FindUsagesOptions.cs
+++ b/src/Features/Core/Portable/FindUsages/FindUsagesOptions.cs
@@ -9,5 +9,13 @@ namespace Microsoft.CodeAnalysis.FindUsages
 {
     [DataContract]
     internal readonly record struct FindUsagesOptions(
-        [property: DataMember(Order = 0)] ClassificationOptions ClassificationOptions);
+        [property: DataMember(Order = 0)] ClassificationOptions ClassificationOptions)
+    {
+        public FindUsagesOptions()
+            : this(ClassificationOptions.Default)
+        {
+        }
+
+        public static readonly FindUsagesOptions Default = new();
+    }
 }
diff --git a/src/EditorFeatures/Core/FindUsages/IDefinitionsAndReferencesFactory.cs b/src/Features/Core/Portable/FindUsages/IDefinitionsAndReferencesFactory.cs
similarity index 99%
rename from src/EditorFeatures/Core/FindUsages/IDefinitionsAndReferencesFactory.cs
rename to src/Features/Core/Portable/FindUsages/IDefinitionsAndReferencesFactory.cs
index 0fc9a7c74534b..3241ee68cbfac 100644
--- a/src/EditorFeatures/Core/FindUsages/IDefinitionsAndReferencesFactory.cs
+++ b/src/Features/Core/Portable/FindUsages/IDefinitionsAndReferencesFactory.cs
@@ -13,7 +13,6 @@
 using Microsoft.CodeAnalysis.Features.RQName;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.FindSymbols.Finders;
-using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
@@ -21,7 +20,7 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     using static FindUsagesHelpers;
 
diff --git a/src/EditorFeatures/Core/FindUsages/IFindUsagesLSPService.cs b/src/Features/Core/Portable/FindUsages/IFindUsagesLSPService.cs
similarity index 95%
rename from src/EditorFeatures/Core/FindUsages/IFindUsagesLSPService.cs
rename to src/Features/Core/Portable/FindUsages/IFindUsagesLSPService.cs
index 1752454221d46..ef79deb5307fa 100644
--- a/src/EditorFeatures/Core/FindUsages/IFindUsagesLSPService.cs
+++ b/src/Features/Core/Portable/FindUsages/IFindUsagesLSPService.cs
@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal interface IFindUsagesLSPService : ILanguageService
     {
diff --git a/src/EditorFeatures/Core/FindUsages/IFindUsagesService.cs b/src/Features/Core/Portable/FindUsages/IFindUsagesService.cs
similarity index 95%
rename from src/EditorFeatures/Core/FindUsages/IFindUsagesService.cs
rename to src/Features/Core/Portable/FindUsages/IFindUsagesService.cs
index 9f149647680f1..4a782b8a24378 100644
--- a/src/EditorFeatures/Core/FindUsages/IFindUsagesService.cs
+++ b/src/Features/Core/Portable/FindUsages/IFindUsagesService.cs
@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.CodeAnalysis.Editor.FindUsages
+namespace Microsoft.CodeAnalysis.FindUsages
 {
     internal interface IFindUsagesService : ILanguageService
     {
diff --git a/src/EditorFeatures/Core/GoToBase/AbstractGoToBaseService.cs b/src/Features/Core/Portable/GoToBase/AbstractGoToBaseService.cs
similarity index 87%
rename from src/EditorFeatures/Core/GoToBase/AbstractGoToBaseService.cs
rename to src/Features/Core/Portable/GoToBase/AbstractGoToBaseService.cs
index 7c92ddf623f30..e54e30b177fdb 100644
--- a/src/EditorFeatures/Core/GoToBase/AbstractGoToBaseService.cs
+++ b/src/Features/Core/Portable/GoToBase/AbstractGoToBaseService.cs
@@ -7,11 +7,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.FindUsages;
 
-namespace Microsoft.CodeAnalysis.Editor.GoToBase
+namespace Microsoft.CodeAnalysis.GoToBase
 {
     internal abstract partial class AbstractGoToBaseService : IGoToBaseService
     {
@@ -23,7 +22,7 @@ public async Task FindBasesAsync(IFindUsagesContext context, Document document,
             if (symbolAndProjectOpt == null)
             {
                 await context.ReportMessageAsync(
-                    EditorFeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret, cancellationToken).ConfigureAwait(false);
+                    FeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret, cancellationToken).ConfigureAwait(false);
                 return;
             }
 
@@ -33,7 +32,7 @@ await context.ReportMessageAsync(
             var bases = await FindBaseHelpers.FindBasesAsync(symbol, solution, cancellationToken).ConfigureAwait(false);
 
             await context.SetSearchTitleAsync(
-                string.Format(EditorFeaturesResources._0_bases,
+                string.Format(FeaturesResources._0_bases,
                 FindUsagesHelpers.GetDisplayName(symbol)),
                 cancellationToken).ConfigureAwait(false);
 
@@ -65,7 +64,7 @@ await context.SetSearchTitleAsync(
 
             if (!found)
             {
-                await context.ReportMessageAsync(EditorFeaturesResources.The_symbol_has_no_base, cancellationToken).ConfigureAwait(false);
+                await context.ReportMessageAsync(FeaturesResources.The_symbol_has_no_base, cancellationToken).ConfigureAwait(false);
             }
         }
     }
diff --git a/src/EditorFeatures/Core/GoToBase/FindBaseHelpers.cs b/src/Features/Core/Portable/GoToBase/FindBaseHelpers.cs
similarity index 96%
rename from src/EditorFeatures/Core/GoToBase/FindBaseHelpers.cs
rename to src/Features/Core/Portable/GoToBase/FindBaseHelpers.cs
index 472dbe07eabcd..6683edc969d74 100644
--- a/src/EditorFeatures/Core/GoToBase/FindBaseHelpers.cs
+++ b/src/Features/Core/Portable/GoToBase/FindBaseHelpers.cs
@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis.FindSymbols.FindReferences;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.GoToBase
+namespace Microsoft.CodeAnalysis.GoToBase
 {
     internal static class FindBaseHelpers
     {
diff --git a/src/EditorFeatures/Core/GoToBase/IGoToBaseService.cs b/src/Features/Core/Portable/GoToBase/IGoToBaseService.cs
similarity index 93%
rename from src/EditorFeatures/Core/GoToBase/IGoToBaseService.cs
rename to src/Features/Core/Portable/GoToBase/IGoToBaseService.cs
index 28023bf0be5b9..3572fea7b3ae7 100644
--- a/src/EditorFeatures/Core/GoToBase/IGoToBaseService.cs
+++ b/src/Features/Core/Portable/GoToBase/IGoToBaseService.cs
@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.CodeAnalysis.Editor.GoToBase
+namespace Microsoft.CodeAnalysis.GoToBase
 {
     internal interface IGoToBaseService : ILanguageService
     {
diff --git a/src/Features/Core/Portable/GoToDefinition/AbstractFindDefinitionService.cs b/src/Features/Core/Portable/GoToDefinition/AbstractFindDefinitionService.cs
index 6764b41ce3263..88c55975f02f1 100644
--- a/src/Features/Core/Portable/GoToDefinition/AbstractFindDefinitionService.cs
+++ b/src/Features/Core/Portable/GoToDefinition/AbstractFindDefinitionService.cs
@@ -5,8 +5,8 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Navigation;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
diff --git a/src/EditorFeatures/Core/InheritanceMargin/InheritanceMarginServiceHelpers.cs b/src/Features/Core/Portable/InheritanceMargin/InheritanceMarginServiceHelpers.cs
similarity index 99%
rename from src/EditorFeatures/Core/InheritanceMargin/InheritanceMarginServiceHelpers.cs
rename to src/Features/Core/Portable/InheritanceMargin/InheritanceMarginServiceHelpers.cs
index 50ab3ce9d4387..499d0d7f2c881 100644
--- a/src/EditorFeatures/Core/InheritanceMargin/InheritanceMarginServiceHelpers.cs
+++ b/src/Features/Core/Portable/InheritanceMargin/InheritanceMarginServiceHelpers.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.FindSymbols.FindReferences;
 using Microsoft.CodeAnalysis.FindUsages;
diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
index 6596e33cc5a8d..7cda913db91b8 100644
--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
+++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
@@ -56,6 +56,7 @@
     <InternalsVisibleTo Include="VBCSCompiler" />
     <InternalsVisibleTo Include="AnalyzerRunner" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures2.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Workspaces.Test.Utilities" />
     <!-- BEGIN MONODEVELOP
     These MonoDevelop dependencies don't ship with Visual Studio, so can't break our
     binary insertions and are exempted from the ExternalAccess adapter assembly policies.
@@ -115,6 +116,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Remove="SymbolSearch\Windows\**\*.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
     <Compile Include="..\..\..\CodeStyle\Core\Analyzers\FormattingAnalyzerHelper.cs" Link="Formatting\FormattingAnalyzerHelper.cs" />
     <Compile Include="..\..\..\CodeStyle\Core\CodeFixes\FormattingCodeFixHelper.cs" Link="Formatting\FormattingCodeFixHelper.cs" />
     <Compile Include="..\..\..\Compilers\Core\Portable\Text\TextUtilities.cs" Link="Shared\Utilities\TextUtilities.cs" />
@@ -128,10 +130,14 @@
     <PublicAPI Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
     <PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.AnalyzerUtilities" Version="$(MicrosoftCodeAnalysisAnalyzerUtilitiesVersion)" />
-    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
+    <PackageReference Include="Microsoft.CodeAnalysis.Elfie" Version="$(MicrosoftCodeAnalysisElfieVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="$(MicrosoftVisualStudioRemoteControlVersion)" />
   </ItemGroup>
   <Import Project="..\..\..\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems" Label="Shared" />
   <Import Project="..\..\..\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems" Label="Shared" />
diff --git a/src/EditorFeatures/Core/StackTraceExplorer/AbstractStackTraceSymbolResolver.cs b/src/Features/Core/Portable/StackTraceExplorer/AbstractStackTraceSymbolResolver.cs
similarity index 95%
rename from src/EditorFeatures/Core/StackTraceExplorer/AbstractStackTraceSymbolResolver.cs
rename to src/Features/Core/Portable/StackTraceExplorer/AbstractStackTraceSymbolResolver.cs
index f6559bbc1ff5b..eab0c63411f49 100644
--- a/src/EditorFeatures/Core/StackTraceExplorer/AbstractStackTraceSymbolResolver.cs
+++ b/src/Features/Core/Portable/StackTraceExplorer/AbstractStackTraceSymbolResolver.cs
@@ -6,12 +6,9 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.StackTraceExplorer;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.StackFrame;
-using Microsoft.CodeAnalysis.LanguageServices;
-using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.Editor.StackTraceExplorer
+namespace Microsoft.CodeAnalysis.StackTraceExplorer
 {
     internal abstract class AbstractStackTraceSymbolResolver
     {
diff --git a/src/EditorFeatures/Core/StackTraceExplorer/StackFrameLocalMethodResolver.cs b/src/Features/Core/Portable/StackTraceExplorer/StackFrameLocalMethodResolver.cs
similarity index 96%
rename from src/EditorFeatures/Core/StackTraceExplorer/StackFrameLocalMethodResolver.cs
rename to src/Features/Core/Portable/StackTraceExplorer/StackFrameLocalMethodResolver.cs
index 324939154040b..a91bf6bc5781a 100644
--- a/src/EditorFeatures/Core/StackTraceExplorer/StackFrameLocalMethodResolver.cs
+++ b/src/Features/Core/Portable/StackTraceExplorer/StackFrameLocalMethodResolver.cs
@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.Editor.StackTraceExplorer
+namespace Microsoft.CodeAnalysis.StackTraceExplorer
 {
     internal class StackFrameLocalMethodResolver : AbstractStackTraceSymbolResolver
     {
diff --git a/src/EditorFeatures/Core/StackTraceExplorer/StackFrameMethodSymbolResolver.cs b/src/Features/Core/Portable/StackTraceExplorer/StackFrameMethodSymbolResolver.cs
similarity index 95%
rename from src/EditorFeatures/Core/StackTraceExplorer/StackFrameMethodSymbolResolver.cs
rename to src/Features/Core/Portable/StackTraceExplorer/StackFrameMethodSymbolResolver.cs
index e21230f404fde..92602bbabf522 100644
--- a/src/EditorFeatures/Core/StackTraceExplorer/StackFrameMethodSymbolResolver.cs
+++ b/src/Features/Core/Portable/StackTraceExplorer/StackFrameMethodSymbolResolver.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.StackFrame;
 
-namespace Microsoft.CodeAnalysis.Editor.StackTraceExplorer
+namespace Microsoft.CodeAnalysis.StackTraceExplorer
 {
     internal class StackFrameMethodSymbolResolver : AbstractStackTraceSymbolResolver
     {
diff --git a/src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerOptions.cs b/src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerOptions.cs
deleted file mode 100644
index b359dcde6a8d3..0000000000000
--- a/src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerOptions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CodeAnalysis.Options;
-
-namespace Microsoft.CodeAnalysis.StackTraceExplorer
-{
-    internal static class StackTraceExplorerOptions
-    {
-        /// <summary>
-        /// Used to determine if a user focusing VS should look at the clipboard for a callstack and automatically
-        /// open the tool window with the callstack inserted
-        /// </summary>
-        public static readonly Option2<bool> OpenOnFocus = new(
-            nameof(StackTraceExplorerOptions),
-            nameof(OpenOnFocus),
-            true,
-            storageLocation: new RoamingProfileStorageLocation("StackTraceExplorer.Options.OpenOnFocus"));
-    }
-}
diff --git a/src/EditorFeatures/Core/StackTraceExplorer/StackTraceExplorerService.cs b/src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerService.cs
similarity index 97%
rename from src/EditorFeatures/Core/StackTraceExplorer/StackTraceExplorerService.cs
rename to src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerService.cs
index ec8b16abc5983..559595051f36a 100644
--- a/src/EditorFeatures/Core/StackTraceExplorer/StackTraceExplorerService.cs
+++ b/src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerService.cs
@@ -12,10 +12,9 @@
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Remote;
-using Microsoft.CodeAnalysis.StackTraceExplorer;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.StackTraceExplorer
+namespace Microsoft.CodeAnalysis.StackTraceExplorer
 {
     [ExportWorkspaceService(typeof(IStackTraceExplorerService)), Shared]
     internal class StackTraceExplorerService : IStackTraceExplorerService
diff --git a/src/EditorFeatures/Core/StackTraceExplorer/StackTraceExplorerUtilities.cs b/src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerUtilities.cs
similarity index 97%
rename from src/EditorFeatures/Core/StackTraceExplorer/StackTraceExplorerUtilities.cs
rename to src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerUtilities.cs
index 1c37bc50159ff..b1dd486a7cee2 100644
--- a/src/EditorFeatures/Core/StackTraceExplorer/StackTraceExplorerUtilities.cs
+++ b/src/Features/Core/Portable/StackTraceExplorer/StackTraceExplorerUtilities.cs
@@ -4,14 +4,12 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.StackFrame;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Shared.Extensions;
-using Microsoft.CodeAnalysis.StackTraceExplorer;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.StackTraceExplorer
+namespace Microsoft.CodeAnalysis.StackTraceExplorer
 {
     internal static class StackTraceExplorerUtilities
     {
diff --git a/src/Features/Core/Portable/SymbolSearch/SourceBuild/SymbolSearchUpdateEngineFactory.cs b/src/Features/Core/Portable/SymbolSearch/SourceBuild/SymbolSearchUpdateEngineFactory.cs
new file mode 100644
index 0000000000000..d7a441cfda083
--- /dev/null
+++ b/src/Features/Core/Portable/SymbolSearch/SourceBuild/SymbolSearchUpdateEngineFactory.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+#if DOTNET_BUILD_FROM_SOURCE
+
+#pragma warning disable IDE0060 // Remove unused parameter
+
+using System.Threading;
+using System.Threading.Tasks;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.SymbolSearch
+{
+    /// <remarks>
+    /// Returns an No-op engine on non-Windows OS, because the backing storage depends on Windows APIs.
+    /// </remarks>
+    internal static class SymbolSearchUpdateEngineFactory
+    {
+        public static ValueTask<ISymbolSearchUpdateEngine> CreateEngineAsync(
+            Workspace workspace,
+            ISymbolSearchLogService logService,
+            CancellationToken cancellationToken)
+            => ValueTaskFactory.FromResult<ISymbolSearchUpdateEngine>(SymbolSearchUpdateNoOpEngine.Instance);
+    }
+}
+#endif
diff --git a/src/Features/Core/Portable/SymbolSearch/SymbolSearchUpdateNoOpEngine.cs b/src/Features/Core/Portable/SymbolSearch/SymbolSearchUpdateNoOpEngine.cs
new file mode 100644
index 0000000000000..e5f7b191ebcaa
--- /dev/null
+++ b/src/Features/Core/Portable/SymbolSearch/SymbolSearchUpdateNoOpEngine.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.SymbolSearch
+{
+    internal sealed class SymbolSearchUpdateNoOpEngine : ISymbolSearchUpdateEngine
+    {
+        public static readonly SymbolSearchUpdateNoOpEngine Instance = new();
+
+        public ValueTask<ImmutableArray<PackageWithAssemblyResult>> FindPackagesWithAssemblyAsync(string source, string assemblyName, CancellationToken cancellationToken)
+            => ValueTaskFactory.FromResult(ImmutableArray<PackageWithAssemblyResult>.Empty);
+
+        public ValueTask<ImmutableArray<PackageWithTypeResult>> FindPackagesWithTypeAsync(string source, string name, int arity, CancellationToken cancellationToken)
+            => ValueTaskFactory.FromResult(ImmutableArray<PackageWithTypeResult>.Empty);
+
+        public ValueTask<ImmutableArray<ReferenceAssemblyWithTypeResult>> FindReferenceAssembliesWithTypeAsync(string name, int arity, CancellationToken cancellationToken)
+            => ValueTaskFactory.FromResult(ImmutableArray<ReferenceAssemblyWithTypeResult>.Empty);
+
+        public ValueTask UpdateContinuouslyAsync(string sourceName, string localSettingsDirectory, ISymbolSearchLogService logService, CancellationToken cancellationToken)
+            => default;
+    }
+}
diff --git a/src/EditorFeatures/Core/SymbolSearch/IAddReferenceDatabaseWrapper.cs b/src/Features/Core/Portable/SymbolSearch/Windows/IAddReferenceDatabaseWrapper.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/IAddReferenceDatabaseWrapper.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/IAddReferenceDatabaseWrapper.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/IDatabaseFactoryService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/IDatabaseFactoryService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/IDatabaseFactoryService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/IDatabaseFactoryService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/IDelayService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/IDelayService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/IDelayService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/IDelayService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/IIOService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/IIOService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/IIOService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/IIOService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/IPatchService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/IPatchService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/IPatchService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/IPatchService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/IRemoteControlService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/IRemoteControlService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/IRemoteControlService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/IRemoteControlService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/Patching/Delta.cs b/src/Features/Core/Portable/SymbolSearch/Windows/NativePatching.cs
similarity index 94%
rename from src/EditorFeatures/Core/SymbolSearch/Patching/Delta.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/NativePatching.cs
index ec804b7500f31..648aa309ec448 100644
--- a/src/EditorFeatures/Core/SymbolSearch/Patching/Delta.cs
+++ b/src/Features/Core/Portable/SymbolSearch/Windows/NativePatching.cs
@@ -5,20 +5,18 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 
-namespace Microsoft.CodeAnalysis.SymbolSearch.Patching
+namespace Microsoft.CodeAnalysis.SymbolSearch
 {
     /// <summary>
     /// Wrapper around the msdelta api so we can consume patches produced by the Elfie service.
     /// Pinvokes and code provided by Dan Thompson
     /// </summary>
-    internal static unsafe class Delta
+    internal static unsafe class NativePatching
     {
         [StructLayout(LayoutKind.Sequential)]
         private struct DeltaInput
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.DatabaseFactoryService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.DatabaseFactoryService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.DatabaseFactoryService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.DatabaseFactoryService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.DelayService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.DelayService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.DelayService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.DelayService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.IOService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.IOService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.IOService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.IOService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.PatchService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.PatchService.cs
similarity index 88%
rename from src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.PatchService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.PatchService.cs
index e059a6ff450ff..2047c46d84b92 100644
--- a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.PatchService.cs
+++ b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.PatchService.cs
@@ -11,7 +11,7 @@ internal partial class SymbolSearchUpdateEngine
         private class PatchService : IPatchService
         {
             public byte[] ApplyPatch(byte[] databaseBytes, byte[] patchBytes)
-                => Patching.Delta.ApplyPatch(databaseBytes, patchBytes);
+                => NativePatching.ApplyPatch(databaseBytes, patchBytes);
         }
     }
 }
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.RemoteControlService.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.RemoteControlService.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.RemoteControlService.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.RemoteControlService.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.Update.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.Update.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.Update.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.Update.cs
diff --git a/src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.cs
similarity index 100%
rename from src/EditorFeatures/Core/SymbolSearch/SymbolSearchUpdateEngine.cs
rename to src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngine.cs
diff --git a/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineFactory.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineFactory.cs
new file mode 100644
index 0000000000000..11d96e8c24dea
--- /dev/null
+++ b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineFactory.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Roslyn.Utilities;
+using System.Runtime.InteropServices;
+using Microsoft.CodeAnalysis.Remote;
+
+namespace Microsoft.CodeAnalysis.SymbolSearch
+{
+    /// <summary>
+    /// Factory that will produce the <see cref="ISymbolSearchUpdateEngine"/>.  The default
+    /// implementation produces an engine that will run in-process.  Implementations at
+    /// other layers can behave differently (for example, running the engine out-of-process).
+    /// </summary>
+    /// <remarks>
+    /// This returns an No-op engine on non-Windows OS, because the backing storage depends on Windows APIs.
+    /// </remarks>
+    internal static class SymbolSearchUpdateEngineFactory
+    {
+        public static async ValueTask<ISymbolSearchUpdateEngine> CreateEngineAsync(
+            Workspace workspace,
+            ISymbolSearchLogService logService,
+            CancellationToken cancellationToken)
+        {
+            var client = await RemoteHostClient.TryGetClientAsync(workspace, cancellationToken).ConfigureAwait(false);
+            if (client != null)
+            {
+                return new SymbolSearchUpdateEngineProxy(client, logService);
+            }
+
+            // Couldn't go out of proc.  Just do everything inside the current process.
+            return CreateEngineInProcess();
+        }
+
+        /// <summary>
+        /// This returns a No-op engine if called on non-Windows OS, because the backing storage depends on Windows APIs.
+        /// </summary>
+        public static ISymbolSearchUpdateEngine CreateEngineInProcess()
+        {
+            return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+                new SymbolSearchUpdateEngine() :
+                SymbolSearchUpdateNoOpEngine.Instance;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineProxy.cs b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineProxy.cs
new file mode 100644
index 0000000000000..ccd19fe3a0841
--- /dev/null
+++ b/src/Features/Core/Portable/SymbolSearch/Windows/SymbolSearchUpdateEngineProxy.cs
@@ -0,0 +1,61 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Remote;
+
+namespace Microsoft.CodeAnalysis.SymbolSearch
+{
+    internal sealed class SymbolSearchUpdateEngineProxy : ISymbolSearchUpdateEngine
+    {
+        private readonly RemoteServiceConnection<IRemoteSymbolSearchUpdateService> _connection;
+
+        public SymbolSearchUpdateEngineProxy(RemoteHostClient client, ISymbolSearchLogService logService)
+            => _connection = client.CreateConnection<IRemoteSymbolSearchUpdateService>(logService);
+
+        public void Dispose()
+            => _connection.Dispose();
+
+        public async ValueTask<ImmutableArray<PackageWithTypeResult>> FindPackagesWithTypeAsync(string source, string name, int arity, CancellationToken cancellationToken)
+        {
+            var result = await _connection.TryInvokeAsync<ImmutableArray<PackageWithTypeResult>>(
+                (service, cancellationToken) => service.FindPackagesWithTypeAsync(source, name, arity, cancellationToken),
+                cancellationToken).ConfigureAwait(false);
+
+            return result.HasValue ? result.Value : ImmutableArray<PackageWithTypeResult>.Empty;
+        }
+
+        public async ValueTask<ImmutableArray<PackageWithAssemblyResult>> FindPackagesWithAssemblyAsync(
+            string source, string assemblyName, CancellationToken cancellationToken)
+        {
+            var result = await _connection.TryInvokeAsync<ImmutableArray<PackageWithAssemblyResult>>(
+                (service, cancellationToken) => service.FindPackagesWithAssemblyAsync(source, assemblyName, cancellationToken),
+                cancellationToken).ConfigureAwait(false);
+
+            return result.HasValue ? result.Value : ImmutableArray<PackageWithAssemblyResult>.Empty;
+        }
+
+        public async ValueTask<ImmutableArray<ReferenceAssemblyWithTypeResult>> FindReferenceAssembliesWithTypeAsync(
+            string name, int arity, CancellationToken cancellationToken)
+        {
+            var result = await _connection.TryInvokeAsync<ImmutableArray<ReferenceAssemblyWithTypeResult>>(
+                (service, cancellationToken) => service.FindReferenceAssembliesWithTypeAsync(name, arity, cancellationToken),
+                cancellationToken).ConfigureAwait(false);
+
+            return result.HasValue ? result.Value : ImmutableArray<ReferenceAssemblyWithTypeResult>.Empty;
+        }
+
+        public async ValueTask UpdateContinuouslyAsync(string sourceName, string localSettingsDirectory, ISymbolSearchLogService logService, CancellationToken cancellationToken)
+        {
+            // logService parameter is ignored since it's already set on the connection as a callback
+            _ = logService;
+
+            _ = await _connection.TryInvokeAsync(
+                (service, callbackId, cancellationToken) => service.UpdateContinuouslyAsync(callbackId, sourceName, localSettingsDirectory, cancellationToken),
+                cancellationToken).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/Tagging/CompilationAvailableHelpers.cs b/src/Features/Core/Portable/Tagging/CompilationAvailableHelpers.cs
new file mode 100644
index 0000000000000..214246573b057
--- /dev/null
+++ b/src/Features/Core/Portable/Tagging/CompilationAvailableHelpers.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.CodeAnalysis.Tagging
+{
+    internal static class CompilationAvailableHelpers
+    {
+        // this method is super basic.  but it ensures that the remote impl and the local impl always agree.
+        public static Task ComputeCompilationInCurrentProcessAsync(Project project, CancellationToken cancellationToken)
+            => project.GetCompilationAsync(cancellationToken);
+    }
+}
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
index 25bc7c4a57e9a..6d37c9654b365 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
@@ -275,6 +275,11 @@ Ujistěte se, že specifikátor tt použijete pro jazyky, pro které je nezbytn
         <target state="translated">Do rozsahu znaků nejde zahrnout třídu \{0}.</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">Čísla skupin digitalizace musí být menší nebo rovny hodnotě Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Pozitivní kontrolní výrazy zpětného vyhledávání s nulovou délkou se obv
         <target state="translated">Výběr obsahuje volání lokální funkce, aniž by byla deklarovaná.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Při pokusu o stažení zdrojového kódu ze zdrojového odkazu vypršel časový limit. Následné žádosti můžou být úspěšné.</target>
@@ -2850,6 +2865,11 @@ Pozitivní kontrolní výrazy zpětného vyhledávání s nulovou délkou se obv
         <target state="translated">Pro přepínání kontextů můžete použít navigační panel.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">Hodnota {0} nemůže být nulová a toto pole nemůže být prázdné.</target>
@@ -2910,6 +2930,11 @@ Pozitivní kontrolní výrazy zpětného vyhledávání s nulovou délkou se obv
         <target state="translated">{0} se našel přes SourceLink, ale nepovedlo se přečíst dočasný soubor.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">{0} tady není null.</target>
@@ -2925,6 +2950,11 @@ Pozitivní kontrolní výrazy zpětného vyhledávání s nulovou délkou se obv
         <target state="translated">{0} tady může být null.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
index 01dec4bbb4985..c48953aa8e63a 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
@@ -275,6 +275,11 @@ Stellen Sie sicher, dass Sie den Bezeichner "tt" für Sprachen verwenden, für d
         <target state="translated">Die Klasse \{0} kann nicht in den Zeichenbereich aufgenommen werden.</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">Erfassungsgruppennummern müssen kleiner oder gleich Int32.MaxValue sein.</target>
@@ -2535,6 +2540,16 @@ Positive Lookbehindassertionen mit Nullbreite werden normalerweise am Anfang reg
         <target state="translated">Die Auswahl enthält einen lokalen Funktionsaufruf ohne Deklaration.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Timeout beim Herunterladen von Quellcode aus SourceLink. Nachfolgende Anforderungen sind möglicherweise erfolgreich.</target>
@@ -2850,6 +2865,11 @@ Positive Lookbehindassertionen mit Nullbreite werden normalerweise am Anfang reg
         <target state="translated">Sie können die Navigationsleiste verwenden, um den Kontext zu wechseln.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">"{0}" kann nicht NULL oder leer sein.</target>
@@ -2910,6 +2930,11 @@ Positive Lookbehindassertionen mit Nullbreite werden normalerweise am Anfang reg
         <target state="translated">„{0}“ wurde über SourceLink gefunden, aber die temporäre Datei konnte nicht gelesen werden.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">"{0}" ist hier nicht NULL.</target>
@@ -2925,6 +2950,11 @@ Positive Lookbehindassertionen mit Nullbreite werden normalerweise am Anfang reg
         <target state="translated">"{0}" darf hier NULL sein.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
index a0b768dd9e2b2..6126dce792404 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
@@ -275,6 +275,11 @@ Asegúrese de usar el especificador "tt" para los idiomas para los que es necesa
         <target state="translated">No se incluye la clase \{0} en el intervalo de caracteres</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">La captura de números de grupo deben ser menor o igual a Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Las aserciones de búsqueda retrasada (lookbehind) positivas de ancho cero se us
         <target state="translated">La selección contiene una llamada a una función local sin la declaración correspondiente.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Se agotó el tiempo de espera al intentar descargar el código fuente de SourceLink. Es posible que las solicitudes siguientes se realicen correctamente.</target>
@@ -2850,6 +2865,11 @@ Las aserciones de búsqueda retrasada (lookbehind) positivas de ancho cero se us
         <target state="translated">Puede usar la barra de navegación para cambiar contextos.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">'{0}' no puede ser nulo ni estar vacío.</target>
@@ -2910,6 +2930,11 @@ Las aserciones de búsqueda retrasada (lookbehind) positivas de ancho cero se us
         <target state="translated">'{0}' encontró a través de SourceLink pero no pudo leer el archivo temporal.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">"{0}" no es NULL aquí.</target>
@@ -2925,6 +2950,11 @@ Las aserciones de búsqueda retrasada (lookbehind) positivas de ancho cero se us
         <target state="translated">"{0}" puede ser NULL aquí.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
index 21fcc0352a534..c2f723886ae19 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
@@ -275,6 +275,11 @@ Veillez à utiliser le spécificateur "tt" pour les langues où il est nécessai
         <target state="translated">Impossible d'inclure la classe \{0} dans la plage de caractères</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">Les nombres de groupe de capture doivent être inférieurs ou égaux à Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Les assertions arrière positives de largeur nulle sont généralement utilisée
         <target state="translated">La sélection contient un appel de fonction locale sans sa déclaration.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Expiration du délai d’attente lors de la tentative de téléchargement du code source à partir de SourceLink. Les demandes suivantes peuvent réussir.</target>
@@ -2850,6 +2865,11 @@ Les assertions arrière positives de largeur nulle sont généralement utilisée
         <target state="translated">Vous pouvez utiliser la barre de navigation pour changer de contexte.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">« {0} » ne peut pas être vide ou avoir la valeur Null.</target>
@@ -2910,6 +2930,11 @@ Les assertions arrière positives de largeur nulle sont généralement utilisée
         <target state="translated">'{0}' trouvé via SourceLink mais n’a pas pu lire le fichier temporaire.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">'{0}' n'a pas une valeur null ici.</target>
@@ -2925,6 +2950,11 @@ Les assertions arrière positives de largeur nulle sont généralement utilisée
         <target state="translated">'{0}' a peut-être une valeur null ici.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
index 30b1ed5f61d37..5e4c3902c7eb7 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
@@ -275,6 +275,11 @@ Assicurarsi di usare l'identificatore "tt" per le lingue per le quali è necessa
         <target state="translated">Non è possibile includere la classe \{0} nell'intervallo di caratteri</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">I numeri del gruppo Capture devono essere minori o uguali a Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Le asserzioni lookbehind positive di larghezza zero vengono usate in genere all'
         <target state="translated">La selezione contiene una chiamata di funzione locale senza la relativa dichiarazione.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Timeout durante il tentativo di scaricare il codice sorgente da SourceLink. Le richieste successive potrebbero avere esito positivo.</target>
@@ -2850,6 +2865,11 @@ Le asserzioni lookbehind positive di larghezza zero vengono usate in genere all'
         <target state="translated">Per cambiare contesto, si può usare la barra di spostamento.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">'{0}' non può essere null o vuoto.</target>
@@ -2910,6 +2930,11 @@ Le asserzioni lookbehind positive di larghezza zero vengono usate in genere all'
         <target state="translated">'{0}' trovato tramite SourceLink ma non è stato possibile leggere il file temporaneo.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">'{0}' non è Null in questo punto.</target>
@@ -2925,6 +2950,11 @@ Le asserzioni lookbehind positive di larghezza zero vengono usate in genere all'
         <target state="translated">'{0}' può essere Null in questo punto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
index deab122cb4686..660d1150ae71c 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
@@ -275,6 +275,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">文字範囲にクラス \{0} を含めることはできません</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">キャプチャ グループ番号は Int32.MaxValue 以下でなければなりません</target>
@@ -2535,6 +2540,16 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">選択範囲に、宣言のないローカル関数呼び出しが含まれています。</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">SourceLink からソース コードをダウンロードしようとしてタイムアウトしました。後続の要求は成功する可能性があります。</target>
@@ -2850,6 +2865,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">ナビゲーション バーを使用してコンテキストを切り替えることができます。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">'{0}' を NULL または空にすることはできません。</target>
@@ -2910,6 +2930,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">'{0}' が SourceLink を通じて見つかりましたが、一時ファイルを読み取ることができませんでした。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">ここでは、'{0}' は null ではありません。</target>
@@ -2925,6 +2950,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">ここでは、'{0}' は null である可能性があります。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
index 0a911cdbdf3ed..70a3c31f708fa 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
@@ -275,6 +275,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">문자 범위에 \{0} 클래스를 포함할 수 없습니다.</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">캡처 그룹 번호는 Int32.MaxValue보다 작거나 같아야 합니다.</target>
@@ -2535,6 +2540,16 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">선언이 없는 로컬 함수 호출이 선택 영역에 있습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">SourceLink에서 원본 코드를 다운로드하는 동안 시간이 초과되었습니다. 후속 요청이 성공할 수 있습니다.</target>
@@ -2850,6 +2865,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">탐색 모음을 사용하여 컨텍스트를 전환할 수 있습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">'{0}'은(는) Null이거나 비워 둘 수 없습니다.</target>
@@ -2910,6 +2930,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">SourceLink를 통해 '{0}'을(를) 찾았지만 임시 파일을 읽을 수 없습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">'{0}'은(는) 여기에서 null이 아닙니다.</target>
@@ -2925,6 +2950,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">'{0}'은(는) 여기에서 null일 수 있습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
index b31a5b09065fa..4f57a0159c74a 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
@@ -275,6 +275,11 @@ Pamiętaj, aby nie używać specyfikatora „tt” dla wszystkich języków, w k
         <target state="translated">Nie można uwzględnić klasy \{0} w zakresie znaków</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">Wartość przechwytywania numerów grup musi być mniejsza lub równa wartości Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Pozytywne asercje wsteczne o zerowej szerokości są zwykle używane na początk
         <target state="translated">Zaznaczenie zawiera wywołanie funkcji lokalnej bez jego deklaracji.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Przekroczono limit czasu podczas próby pobrania kodu źródłowego z elementu SourceLink. Kolejne żądania mogą zakończyć się pomyślnie.</target>
@@ -2850,6 +2865,11 @@ Pozytywne asercje wsteczne o zerowej szerokości są zwykle używane na początk
         <target state="translated">Za pomocą paska nawigacyjnego można przełączać konteksty.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">Element „{0}” nie może mieć wartości null ani być pusty.</target>
@@ -2910,6 +2930,11 @@ Pozytywne asercje wsteczne o zerowej szerokości są zwykle używane na początk
         <target state="translated">Znaleziono „{0}” za pośrednictwem elementu SourceLink, ale nie można było odczytać pliku tymczasowego.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">Element „{0}” nie ma wartości null w tym miejscu.</target>
@@ -2925,6 +2950,11 @@ Pozytywne asercje wsteczne o zerowej szerokości są zwykle używane na początk
         <target state="translated">Element „{0}” może mieć wartość null w tym miejscu.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
index 6e882c62c4cb0..90541b3fb8771 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
@@ -275,6 +275,11 @@ Verifique se o especificador "tt" foi usado para idiomas para os quais é necess
         <target state="translated">Não é possível incluir a classe \{0} no intervalo de caracteres</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">Os números do grupo de captura devem ser menores ou iguais a Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ As declarações de lookbehind positivas de largura zero normalmente são usadas
         <target state="translated">A seleção contém uma chamada de função local sem sua declaração.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Tempo limite esgotado ao tentar baixar o código-fonte do SourceLink. As solicitações subsequentes podem ser bem-sucedidas.</target>
@@ -2850,6 +2865,11 @@ As declarações de lookbehind positivas de largura zero normalmente são usadas
         <target state="translated">Você pode usar a barra de navegação para mudar de contexto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">'{0}' não pode ser nulo nem vazio.</target>
@@ -2910,6 +2930,11 @@ As declarações de lookbehind positivas de largura zero normalmente são usadas
         <target state="translated">'{0}' encontrado via SourceLink, mas não pôde ler o arquivo temporário.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">'{0}' não é nulo aqui.</target>
@@ -2925,6 +2950,11 @@ As declarações de lookbehind positivas de largura zero normalmente são usadas
         <target state="translated">'{0}' pode ser nulo aqui.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
index 537120b95f80b..c7cbe0c675fa7 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
@@ -275,6 +275,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">Невозможно включить класс \{0} в диапазон символов</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">Номера групп записи должны быть меньше или равны Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">Выделенный фрагмент содержит вызов локальной функции без ее объявления.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">Истекло время ожидания при попытке скачать исходный код из SourceLink. Последующие запросы могут быть успешными.</target>
@@ -2850,6 +2865,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">Для переключения контекстов можно использовать панель навигации.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">"{0}" не может быть неопределенным или пустым.</target>
@@ -2910,6 +2930,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">Найдено "{0}" с помощью SourceLink, но не удалось прочитать временный файл.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">Здесь "{0}" имеет значение, отличное от NULL.</target>
@@ -2925,6 +2950,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">Здесь "{0}" может иметь значение NULL.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
index 4408e9c5aa8bc..21ecc9808aaa4 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
@@ -275,6 +275,11 @@ AM ve PM arasındaki farkın korunmasının gerekli olduğu diller için "tt" be
         <target state="translated">Sınıf \{0} içeremez karakter aralığı</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">Yakalama grup numaraları Int32.MaxValue eşit veya daha az olmalıdır</target>
@@ -2535,6 +2540,16 @@ Sıfır genişlikli pozitif geri yönlü onaylamalar genellikle normal ifadeleri
         <target state="translated">Seçim, bildirimi olmadan bir yerel işlev çağrısı içeriyor.</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">SourceLink'ten kaynak kodu indirmeye çalışırken zaman aşımına uğradı. Sonraki istekler başarılı olabilir.</target>
@@ -2850,6 +2865,11 @@ Sıfır genişlikli pozitif geri yönlü onaylamalar genellikle normal ifadeleri
         <target state="translated">Bağlamlarda geçiş yapmak için gezinti çubuğunu kullanabilirsiniz.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">'{0}' null veya boş olamaz.</target>
@@ -2910,6 +2930,11 @@ Sıfır genişlikli pozitif geri yönlü onaylamalar genellikle normal ifadeleri
         <target state="translated">“{0}” SourceLink aracılığıyla bulundu ancak geçici dosyayı okuyamadı.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">'{0}' burada null değil.</target>
@@ -2925,6 +2950,11 @@ Sıfır genişlikli pozitif geri yönlü onaylamalar genellikle normal ifadeleri
         <target state="translated">'{0}' burada null olabilir.</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
index 12b03fbdd9618..69ea27fd57bb9 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
@@ -275,6 +275,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">不能在字符范围内包含类 \{0}</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">捕获组编号必须小于等于 Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">所选内容包含不带声明的本地函数调用。</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">尝试从 SourceLink 下载源代码时超时。如果继续尝试进行请求，有可能会成功。</target>
@@ -2850,6 +2865,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">可使用导航栏切换上下文。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">“{0}”不能为 null 或空。</target>
@@ -2910,6 +2930,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">通过 SourceLink 找到“{0}”，但无法读取临时文件。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">“{0}”在此处不为 null。</target>
@@ -2925,6 +2950,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">“{0}”可能在此处为 null。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
index e6e8ede4e889e..bcd678fc4fa9f 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
@@ -275,6 +275,11 @@ Make sure to use the "tt" specifier for languages for which it's necessary to ma
         <target state="translated">無法在字元範圍內包含類別 \{0}</target>
         <note>This is an error message shown to the user when they write an invalid Regular Expression. Example: [a-\w]. {0} is the invalid class (\w here)</note>
       </trans-unit>
+      <trans-unit id="Cannot_navigate_to_the_symbol_under_the_caret">
+        <source>Cannot navigate to the symbol under the caret.</source>
+        <target state="new">Cannot navigate to the symbol under the caret.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Capture_group_numbers_must_be_less_than_or_equal_to_Int32_MaxValue">
         <source>Capture group numbers must be less than or equal to Int32.MaxValue</source>
         <target state="translated">擷取群組號碼必須小於或等於 Int32.MaxValue</target>
@@ -2535,6 +2540,16 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">選取範圍包含區域函式呼叫，但不含其宣告。</target>
         <note />
       </trans-unit>
+      <trans-unit id="The_symbol_has_no_base">
+        <source>The symbol has no base.</source>
+        <target state="new">The symbol has no base.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="The_symbol_has_no_implementations">
+        <source>The symbol has no implementations.</source>
+        <target state="new">The symbol has no implementations.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Timeout_SourceLink">
         <source>Timed out trying to download source code from SourceLink. Subsequent requests may succeed.</source>
         <target state="translated">嘗試從 SourceLink 下載原始程式碼時發生逾時。後續的要求可能會成功。</target>
@@ -2850,6 +2865,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">您可以使用導覽列切換內容。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_bases">
+        <source>'{0}' bases</source>
+        <target state="new">'{0}' bases</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_cannot_be_null_or_empty">
         <source>'{0}' cannot be null or empty.</source>
         <target state="translated">'{0}' 不可為 Null 或空白。</target>
@@ -2910,6 +2930,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">透過 SourceLink 找到 '{0}'，但無法讀取暫存檔案。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_implementations">
+        <source>'{0}' implementations</source>
+        <target state="new">'{0}' implementations</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_is_not_null_here">
         <source>'{0}' is not null here.</source>
         <target state="translated">'{0}' 在此不是 null。</target>
@@ -2925,6 +2950,11 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
         <target state="translated">'{0}' 在此可能為 null。</target>
         <note />
       </trans-unit>
+      <trans-unit id="_0_references">
+        <source>'{0}' references</source>
+        <target state="new">'{0}' references</target>
+        <note />
+      </trans-unit>
       <trans-unit id="_0_unexpected">
         <source>'{0}' unexpected</source>
         <target state="new">'{0}' unexpected</target>
diff --git a/src/Tools/ExternalAccess/Debugger/DebuggerFindReferencesService.cs b/src/Tools/ExternalAccess/Debugger/DebuggerFindReferencesService.cs
index c7526f1d34bc8..7dd11892a818f 100644
--- a/src/Tools/ExternalAccess/Debugger/DebuggerFindReferencesService.cs
+++ b/src/Tools/ExternalAccess/Debugger/DebuggerFindReferencesService.cs
@@ -7,9 +7,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.Debugger
diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FindUsages/FSharpFindUsagesService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FindUsages/FSharpFindUsagesService.cs
index d009295d3245f..a742ec2c7facd 100644
--- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FindUsages/FSharpFindUsagesService.cs
+++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FindUsages/FSharpFindUsagesService.cs
@@ -6,7 +6,6 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
index 76b5e344bf7b7..016306b63d84c 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
@@ -158,7 +158,7 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
             BindToOption(ShowInheritanceMargin, FeatureOnOffOptions.ShowInheritanceMargin, LanguageNames.CSharp, () => true);
             BindToOption(InheritanceMarginCombinedWithIndicatorMargin, FeatureOnOffOptions.InheritanceMarginCombinedWithIndicatorMargin);
 
-            BindToOption(AutomaticallyOpenStackTraceExplorer, StackTraceExplorerOptions.OpenOnFocus);
+            BindToOption(AutomaticallyOpenStackTraceExplorer, StackTraceExplorerOptionsMetadata.OpenOnFocus);
         }
 
         // Since this dialog is constructed once for the lifetime of the application and VS Theme can be changed after the application has started,
diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs
index 64691856f8c5a..0accad77828d9 100644
--- a/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs
+++ b/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs
@@ -55,6 +55,7 @@ private abstract class AbstractTableDataSourceFindUsagesContext :
 
             public readonly StreamingFindUsagesPresenter Presenter;
             private readonly IFindAllReferencesWindow _findReferencesWindow;
+            private readonly IGlobalOptionService _globalOptions;
             protected readonly IWpfTableControl2 TableControl;
 
             private readonly AsyncBatchingWorkQueue<(int current, int maximum)> _progressQueue;
@@ -117,12 +118,12 @@ protected AbstractTableDataSourceFindUsagesContext(
                  IGlobalOptionService globalOptions,
                  bool includeContainingTypeAndMemberColumns,
                  bool includeKindColumn)
-                : base(globalOptions)
             {
                 presenter.AssertIsForeground();
 
                 Presenter = presenter;
                 _findReferencesWindow = findReferencesWindow;
+                _globalOptions = globalOptions;
                 TableControl = (IWpfTableControl2)findReferencesWindow.TableControl;
                 TableControl.GroupingsChanged += OnTableControlGroupingsChanged;
 
@@ -157,6 +158,9 @@ protected AbstractTableDataSourceFindUsagesContext(
                     CancellationTokenSource.Token);
             }
 
+            public override ValueTask<FindUsagesOptions> GetOptionsAsync(string language, CancellationToken cancellationToken)
+                => ValueTaskFactory.FromResult(_globalOptions.GetFindUsagesOptions(language));
+
             private static ImmutableArray<string> SelectCustomColumnsToInclude(ImmutableArray<ITableColumnDefinition> customColumns, bool includeContainingTypeAndMemberColumns, bool includeKindColumn)
             {
                 var customColumnsToInclude = ArrayBuilder<string>.GetInstance();
diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/VisualStudioDefinitionsAndReferencesFactory.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/VisualStudioDefinitionsAndReferencesFactory.cs
index 7e23760ddafb3..948e00dfea6da 100644
--- a/src/VisualStudio/Core/Def/Implementation/FindReferences/VisualStudioDefinitionsAndReferencesFactory.cs
+++ b/src/VisualStudio/Core/Def/Implementation/FindReferences/VisualStudioDefinitionsAndReferencesFactory.cs
@@ -9,7 +9,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.FindSymbols.FindReferences;
 using Microsoft.CodeAnalysis.FindUsages;
diff --git a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs
index e21c364bc9cff..659e083cdb093 100644
--- a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractObjectBrowserLibraryManager.cs
@@ -10,9 +10,9 @@
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser.Lists;
@@ -545,7 +545,7 @@ await Task.Run(
 
         private static async Task FindReferencesAsync(
             SymbolListItem symbolListItem, Project project,
-            CodeAnalysis.FindUsages.FindUsagesContext context, CancellationToken cancellationToken)
+            FindUsagesContext context, CancellationToken cancellationToken)
         {
             var compilation = await project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
             var symbol = symbolListItem.ResolveSymbol(compilation);
diff --git a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioSymbolNavigationService.cs b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioSymbolNavigationService.cs
index b5702ec77ad5c..b04af05ba9dd7 100644
--- a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioSymbolNavigationService.cs
+++ b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioSymbolNavigationService.cs
@@ -10,7 +10,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.DecompiledSource;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.FindUsages;
diff --git a/src/VisualStudio/Core/Def/PdbSourceDocument/PdbSourceDocumentOutputWindowLogger.cs b/src/VisualStudio/Core/Def/PdbSourceDocument/PdbSourceDocumentOutputWindowLogger.cs
index 9a677e60834d1..b5e020e435942 100644
--- a/src/VisualStudio/Core/Def/PdbSourceDocument/PdbSourceDocumentOutputWindowLogger.cs
+++ b/src/VisualStudio/Core/Def/PdbSourceDocument/PdbSourceDocumentOutputWindowLogger.cs
@@ -7,6 +7,7 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Tagging;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
@@ -41,7 +42,7 @@ public PdbSourceDocumentOutputWindowLogger(SVsServiceProvider serviceProvider, I
             var asyncListener = listenerProvider.GetListener(nameof(PdbSourceDocumentOutputWindowLogger));
 
             _logItemsQueue = new AsyncBatchingWorkQueue<string>(
-                TimeSpan.FromMilliseconds(TaggerConstants.NearImmediateDelay),
+                DelayTimeSpan.NearImmediate,
                 ProcessLogMessagesAsync,
                 asyncListener,
                 _cancellationTokenSource.Token);
diff --git a/src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerCommandHandler.cs b/src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerCommandHandler.cs
index b077db9185a0a..6de18e2a99025 100644
--- a/src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerCommandHandler.cs
+++ b/src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerCommandHandler.cs
@@ -26,12 +26,11 @@ private StackTraceExplorerCommandHandler(RoslynPackage package)
         {
             _package = package;
             _threadingContext = package.ComponentModel.GetService<IThreadingContext>();
+            var globalOptions = package.ComponentModel.GetService<IGlobalOptionService>();
 
-            var workspace = package.ComponentModel.GetService<VisualStudioWorkspace>();
-            var optionService = workspace.Services.GetRequiredService<IOptionService>();
-            optionService.OptionChanged += OptionService_OptionChanged;
+            globalOptions.OptionChanged += OptionService_OptionChanged;
 
-            var enabled = workspace.CurrentSolution.Options.GetOption(StackTraceExplorerOptions.OpenOnFocus);
+            var enabled = globalOptions.GetOption(StackTraceExplorerOptionsMetadata.OpenOnFocus);
             if (enabled)
             {
                 AdviseBroadcastMessages();
@@ -112,7 +111,7 @@ private void UnadviseBroadcastMessages()
 
         private void OptionService_OptionChanged(object sender, OptionChangedEventArgs e)
         {
-            if (e.Option == StackTraceExplorerOptions.OpenOnFocus && e.Value is not null)
+            if (e.Option == StackTraceExplorerOptionsMetadata.OpenOnFocus && e.Value is not null)
             {
                 var enabled = (bool)e.Value;
                 if (enabled)
diff --git a/src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerOptions.cs b/src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerOptions.cs
new file mode 100644
index 0000000000000..8e716e5fed878
--- /dev/null
+++ b/src/VisualStudio/Core/Def/StackTraceExplorer/StackTraceExplorerOptions.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Composition;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Options.Providers;
+
+namespace Microsoft.CodeAnalysis.StackTraceExplorer
+{
+    [ExportGlobalOptionProvider, Shared]
+    internal sealed class StackTraceExplorerOptionsMetadata : IOptionProvider
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public StackTraceExplorerOptionsMetadata()
+        {
+        }
+
+        public ImmutableArray<IOption> Options { get; } = ImmutableArray.Create<IOption>(
+            OpenOnFocus);
+
+        private const string FeatureName = "StackTraceExplorerOptions";
+
+        /// <summary>
+        /// Used to determine if a user focusing VS should look at the clipboard for a callstack and automatically
+        /// open the tool window with the callstack inserted
+        /// </summary>
+        public static readonly Option2<bool> OpenOnFocus = new(FeatureName, "OpenOnFocus", defaultValue: true,
+            storageLocation: new RoamingProfileStorageLocation("StackTraceExplorer.Options.OpenOnFocus"));
+    }
+}
diff --git a/src/VisualStudio/Core/Test/Venus/DocumentService_IntegrationTests.vb b/src/VisualStudio/Core/Test/Venus/DocumentService_IntegrationTests.vb
index 4ea06cc73e520..a018f172cbfe7 100644
--- a/src/VisualStudio/Core/Test/Venus/DocumentService_IntegrationTests.vb
+++ b/src/VisualStudio/Core/Test/Venus/DocumentService_IntegrationTests.vb
@@ -12,7 +12,7 @@ Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.Classification
 Imports Microsoft.CodeAnalysis.CSharp.Syntax
 Imports Microsoft.CodeAnalysis.Diagnostics
-Imports Microsoft.CodeAnalysis.Editor.FindUsages
+Imports Microsoft.CodeAnalysis.FindUsages
 Imports Microsoft.CodeAnalysis.Editor.UnitTests
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
diff --git a/src/Workspaces/CoreTestUtilities/Fakes/StubStreamingFindUsagesPresenter.cs b/src/Workspaces/CoreTestUtilities/Fakes/StubStreamingFindUsagesPresenter.cs
index 0e60d70b17174..5c06e271f96b4 100644
--- a/src/Workspaces/CoreTestUtilities/Fakes/StubStreamingFindUsagesPresenter.cs
+++ b/src/Workspaces/CoreTestUtilities/Fakes/StubStreamingFindUsagesPresenter.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Composition;
 using System.Threading;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
diff --git a/src/Workspaces/CoreTestUtilities/Remote/InProcRemostHostClient.cs b/src/Workspaces/CoreTestUtilities/Remote/InProcRemostHostClient.cs
index 240d73168bc28..d9ffbca4b7003 100644
--- a/src/Workspaces/CoreTestUtilities/Remote/InProcRemostHostClient.cs
+++ b/src/Workspaces/CoreTestUtilities/Remote/InProcRemostHostClient.cs
@@ -14,7 +14,7 @@
 using Microsoft.CodeAnalysis.EditAndContinue;
 using Microsoft.CodeAnalysis.Extensions;
 using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Remote.Services.StackTraceExplorer;
+using Microsoft.CodeAnalysis.StackTraceExplorer;
 using Microsoft.CodeAnalysis.Serialization;
 using Microsoft.ServiceHub.Framework;
 using Nerdbank.Streams;
diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
index a4eb593a8dc97..fd6572b5bc1a5 100644
--- a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
+++ b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
@@ -14,20 +14,13 @@
     </PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
-    <ProjectReference Include="..\..\..\Features\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
-    <ProjectReference Include="..\..\..\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj" />
-    <ProjectReference Include="..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
+    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
     <ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" />
     <ProjectReference Include="..\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="$(MicrosoftVisualStudioCoreUtilityVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="$(MicrosoftVisualStudioTextDataVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="$(MicrosoftVisualStudioTextLogicVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="$(MicrosoftVisualStudioTextUIVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
     <PackageReference Include="Microsoft.ServiceHub.Framework" Version="$(MicrosoftServiceHubFrameworkVersion)" />
diff --git a/src/Workspaces/Remote/ServiceHub/Services/FindUsages/RemoteFindUsagesService.cs b/src/Workspaces/Remote/ServiceHub/Services/FindUsages/RemoteFindUsagesService.cs
index 476265f8143fb..1b3ceda223c1a 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/FindUsages/RemoteFindUsagesService.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/FindUsages/RemoteFindUsagesService.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.Shared.Utilities;
diff --git a/src/Workspaces/Remote/ServiceHub/Services/SemanticClassification/RemoteSemanticClassificationService.Caching.cs b/src/Workspaces/Remote/ServiceHub/Services/SemanticClassification/RemoteSemanticClassificationService.Caching.cs
index c27597453dc1c..87bcd1e06cf5f 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/SemanticClassification/RemoteSemanticClassificationService.Caching.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/SemanticClassification/RemoteSemanticClassificationService.Caching.cs
@@ -9,7 +9,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Classification;
-using Microsoft.CodeAnalysis.Editor.Shared.Tagging;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.PooledObjects;
@@ -58,7 +57,7 @@ public RemoteSemanticClassificationService(in ServiceConstructionArguments argum
             : base(arguments)
         {
             _workQueue = new AsyncBatchingWorkQueue<(Document, ClassificationOptions, StorageDatabase)>(
-                TimeSpan.FromMilliseconds(TaggerConstants.ShortDelay),
+                DelayTimeSpan.Short,
                 CacheSemanticClassificationsAsync,
                 EqualityComparer<(Document, ClassificationOptions, StorageDatabase)>.Default,
                 AsynchronousOperationListenerProvider.NullListener,
diff --git a/src/Workspaces/Remote/ServiceHub/Services/StackTraceExplorer/RemoteStackTraceExplorerService.cs b/src/Workspaces/Remote/ServiceHub/Services/StackTraceExplorer/RemoteStackTraceExplorerService.cs
index c1947a37c9bfb..a193ca3875f2e 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/StackTraceExplorer/RemoteStackTraceExplorerService.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/StackTraceExplorer/RemoteStackTraceExplorerService.cs
@@ -5,12 +5,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.StackTraceExplorer;
-using Microsoft.CodeAnalysis.EmbeddedLanguages.StackFrame;
 using Microsoft.CodeAnalysis.FindUsages;
 using Microsoft.CodeAnalysis.StackTraceExplorer;
 
-namespace Microsoft.CodeAnalysis.Remote.Services.StackTraceExplorer
+namespace Microsoft.CodeAnalysis.Remote
 {
     internal sealed class RemoteStackTraceExplorerService : BrokeredServiceBase, IRemoteStackTraceExplorerService
     {
diff --git a/src/Workspaces/Remote/ServiceHub/Services/Tagging/RemoteTaggerCompilationAvailableService.cs b/src/Workspaces/Remote/ServiceHub/Services/Tagging/RemoteTaggerCompilationAvailableService.cs
index 911e7a8423dd9..f023385c8f0a8 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/Tagging/RemoteTaggerCompilationAvailableService.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/Tagging/RemoteTaggerCompilationAvailableService.cs
@@ -4,9 +4,9 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.Tagging;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Tagging;
 
 namespace Microsoft.CodeAnalysis.Remote
 {
@@ -33,7 +33,7 @@ public ValueTask ComputeCompilationAsync(
                 var solution = await GetSolutionAsync(solutionInfo, cancellationToken).ConfigureAwait(false);
                 var project = solution.GetRequiredProject(projectId);
 
-                await CompilationAvailableTaggerEventSource.ComputeCompilationInCurrentProcessAsync(project, cancellationToken).ConfigureAwait(false);
+                await CompilationAvailableHelpers.ComputeCompilationInCurrentProcessAsync(project, cancellationToken).ConfigureAwait(false);
             }, cancellationToken);
         }
     }