From a36dcc38c25e6295cd7487d747b1a8ca18ab3390 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Tue, 8 Feb 2022 10:22:04 -0800
Subject: [PATCH] Fix

---
 .../FindReferences/FindReferencesCommandHandlerTests.vb  | 2 +-
 .../Test2/FindReferences/FindReferencesTests.vb          | 9 ++++++---
 .../Contexts/AbstractTableDataSourceFindUsagesContext.cs | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

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 24e81c54de8df..5a6fa64e6c50e 100644
--- a/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.vb
+++ b/src/EditorFeatures/Test2/FindReferences/FindReferencesTests.vb
@@ -72,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 =
@@ -224,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/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();