Skip to content

Commit ecfd5b1

Browse files
authored
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 8d81aa5. * Move GoToBaseService to Features * Remove unnecessray PackageRefs * Fixes
1 parent 709fde6 commit ecfd5b1

File tree

131 files changed

+835
-698
lines changed

Some content is hidden

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

131 files changed

+835
-698
lines changed

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.Services.StackTraceExplorer.RemoteStackTraceExplorerService+Factory" />
41+
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.StackTraceExplorer" ClassName="Microsoft.CodeAnalysis.Remote.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(EditorFeaturesResources.Cannot_navigate_to_the_symbol_under_the_caret);
113+
throw new NotSupportedException(FeaturesResources.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: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
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-
75
using System;
86
using System.Composition;
9-
using Microsoft.CodeAnalysis.Editor.FindUsages;
10-
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
7+
using Microsoft.CodeAnalysis.FindUsages;
118
using Microsoft.CodeAnalysis.Host.Mef;
129

1310
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.Editor.FindUsages;
7+
using Microsoft.CodeAnalysis.FindUsages;
88
using Microsoft.CodeAnalysis.Host.Mef;
99

1010
namespace Microsoft.CodeAnalysis.Editor.CSharp.FindUsages

src/EditorFeatures/CSharp/GoToBase/CSharpGoToBaseService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
using System;
88
using System.Composition;
9-
using Microsoft.CodeAnalysis.Editor.GoToBase;
9+
using Microsoft.CodeAnalysis.GoToBase;
1010
using Microsoft.CodeAnalysis.Host.Mef;
1111

12-
namespace Microsoft.CodeAnalysis.Editor.CSharp.GoToBase
12+
namespace Microsoft.CodeAnalysis.CSharp.GoToBase
1313
{
1414
[ExportLanguageService(typeof(IGoToBaseService), LanguageNames.CSharp), Shared]
1515
internal class CSharpGoToBaseService : AbstractGoToBaseService

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;
109
using Microsoft.CodeAnalysis.Editor.Host;
1110
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,7 +8,6 @@
88
using System.ComponentModel.Composition;
99
using System.Threading;
1010
using System.Threading.Tasks;
11-
using Microsoft.CodeAnalysis.Editor.FindUsages;
1211
using Microsoft.CodeAnalysis.Editor.Host;
1312
using Microsoft.CodeAnalysis.ErrorReporting;
1413
using Microsoft.CodeAnalysis.FindSymbols;
@@ -20,6 +19,7 @@
2019
using Roslyn.Utilities;
2120
using VSCommanding = Microsoft.VisualStudio.Commanding;
2221
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;
1312
using Microsoft.CodeAnalysis.Editor.Host;
1413
using Microsoft.CodeAnalysis.ErrorReporting;
1514
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using System.ComponentModel.Composition;
1010
using System.Threading;
1111
using System.Threading.Tasks;
12-
using Microsoft.CodeAnalysis.Editor.FindUsages;
1312
using Microsoft.CodeAnalysis.Editor.Host;
1413
using Microsoft.CodeAnalysis.ErrorReporting;
1514
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,7 +7,6 @@
77
using System.Collections.Generic;
88
using System.ComponentModel.Composition;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.Editor.FindUsages;
1110
using Microsoft.CodeAnalysis.Editor.Host;
1211
using Microsoft.CodeAnalysis.ErrorReporting;
1312
using Microsoft.CodeAnalysis.Internal.Log;
@@ -19,6 +18,7 @@
1918
using VSCommanding = Microsoft.VisualStudio.Commanding;
2019
using Microsoft.CodeAnalysis.Host.Mef;
2120
using System.Threading;
21+
using Microsoft.CodeAnalysis.FindUsages;
2222

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

0 commit comments

Comments
 (0)