Skip to content

Commit 8d81aa5

Browse files
RikkiGibsonRikkiGibson
authored
Revert "Remove dependency on EditorFeatures from Remote.ServiceHub project - take 2 (#59147)" (#59242)
This reverts commit d5763e9.
1 parent d8862d6 commit 8d81aa5

121 files changed

Lines changed: 528 additions & 650 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎eng/targets/Services.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.UnusedReferenceAnalysis" ClassName="Microsoft.CodeAnalysis.Remote.RemoteUnusedReferenceAnalysisService+Factory" />
3939
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.ProcessTelemetry" ClassName="Microsoft.CodeAnalysis.Remote.RemoteProcessTelemetryService+Factory" />
4040
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.CompilationAvailable" ClassName="Microsoft.CodeAnalysis.Remote.RemoteCompilationAvailableService+Factory" />
41-
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.StackTraceExplorer" ClassName="Microsoft.CodeAnalysis.Remote.RemoteStackTraceExplorerService+Factory" />
41+
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.StackTraceExplorer" ClassName="Microsoft.CodeAnalysis.Remote.Services.StackTraceExplorer.RemoteStackTraceExplorerService+Factory" />
4242
</ItemGroup>
4343

4444
<!--

‎src/EditorFeatures/CSharp/DecompiledSource/CSharpDecompiledSourceService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private static Document PerformDecompilation(Document document, string fullName,
110110

111111
if (file is null && assemblyLocation is null)
112112
{
113-
throw new NotSupportedException(FeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret);
113+
throw new NotSupportedException(EditorFeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret);
114114
}
115115

116116
file ??= new PEFile(assemblyLocation, PEStreamOptions.PrefetchEntireImage);

‎src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesLSPService.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#nullable disable
6+
57
using System;
68
using System.Composition;
7-
using Microsoft.CodeAnalysis.FindUsages;
9+
using Microsoft.CodeAnalysis.Editor.FindUsages;
10+
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
811
using Microsoft.CodeAnalysis.Host.Mef;
912

1013
namespace Microsoft.CodeAnalysis.Editor.CSharp.FindUsages

‎src/EditorFeatures/CSharp/FindUsages/CSharpFindUsagesService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66
using System.Composition;
7-
using Microsoft.CodeAnalysis.FindUsages;
7+
using Microsoft.CodeAnalysis.Editor.FindUsages;
88
using Microsoft.CodeAnalysis.Host.Mef;
99

1010
namespace Microsoft.CodeAnalysis.Editor.CSharp.FindUsages

‎src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindBaseSymbolsCommandHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using System.Collections.Generic;
77
using System.ComponentModel.Composition;
88
using System.Threading.Tasks;
9+
using Microsoft.CodeAnalysis.Editor.FindUsages;
910
using Microsoft.CodeAnalysis.Editor.Host;
1011
using Microsoft.CodeAnalysis.ErrorReporting;
11-
using Microsoft.CodeAnalysis.FindUsages;
1212
using Microsoft.CodeAnalysis.Host.Mef;
1313
using Microsoft.CodeAnalysis.Internal.Log;
1414
using Microsoft.CodeAnalysis.Shared.Extensions;

‎src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.ComponentModel.Composition;
99
using System.Threading;
1010
using System.Threading.Tasks;
11+
using Microsoft.CodeAnalysis.Editor.FindUsages;
1112
using Microsoft.CodeAnalysis.Editor.Host;
1213
using Microsoft.CodeAnalysis.ErrorReporting;
1314
using Microsoft.CodeAnalysis.FindSymbols;
@@ -19,7 +20,6 @@
1920
using Roslyn.Utilities;
2021
using VSCommanding = Microsoft.VisualStudio.Commanding;
2122
using Microsoft.CodeAnalysis.Host.Mef;
22-
using Microsoft.CodeAnalysis.FindUsages;
2323

2424
namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers
2525
{

‎src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindExtensionMethodsCommandHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
using System.ComponentModel.Composition;
1010
using System.Linq;
1111
using System.Threading.Tasks;
12+
using Microsoft.CodeAnalysis.Editor.FindUsages;
1213
using Microsoft.CodeAnalysis.Editor.Host;
1314
using Microsoft.CodeAnalysis.ErrorReporting;
1415
using Microsoft.CodeAnalysis.FindSymbols;
15-
using Microsoft.CodeAnalysis.FindUsages;
1616
using Microsoft.CodeAnalysis.Host.Mef;
1717
using Microsoft.CodeAnalysis.Internal.Log;
1818
using Microsoft.CodeAnalysis.Shared.Extensions;

‎src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindImplementingMembersCommandHandler.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.ComponentModel.Composition;
1010
using System.Threading;
1111
using System.Threading.Tasks;
12+
using Microsoft.CodeAnalysis.Editor.FindUsages;
1213
using Microsoft.CodeAnalysis.Editor.Host;
1314
using Microsoft.CodeAnalysis.ErrorReporting;
1415
using Microsoft.CodeAnalysis.FindUsages;

‎src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Collections.Generic;
88
using System.ComponentModel.Composition;
99
using System.Threading.Tasks;
10+
using Microsoft.CodeAnalysis.Editor.FindUsages;
1011
using Microsoft.CodeAnalysis.Editor.Host;
1112
using Microsoft.CodeAnalysis.ErrorReporting;
1213
using Microsoft.CodeAnalysis.Internal.Log;
@@ -18,7 +19,6 @@
1819
using VSCommanding = Microsoft.VisualStudio.Commanding;
1920
using Microsoft.CodeAnalysis.Host.Mef;
2021
using System.Threading;
21-
using Microsoft.CodeAnalysis.FindUsages;
2222

2323
namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers
2424
{

‎src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindReferencesOfOverloadsCommandHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
using System.Linq;
1111
using System.Threading;
1212
using System.Threading.Tasks;
13+
using Microsoft.CodeAnalysis.Editor.FindUsages;
1314
using Microsoft.CodeAnalysis.Editor.Host;
1415
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
1516
using Microsoft.CodeAnalysis.ErrorReporting;
1617
using Microsoft.CodeAnalysis.FindSymbols;
17-
using Microsoft.CodeAnalysis.FindUsages;
1818
using Microsoft.CodeAnalysis.Host.Mef;
1919
using Microsoft.CodeAnalysis.Internal.Log;
2020
using Microsoft.CodeAnalysis.Shared.Extensions;

0 commit comments

Comments
 (0)