提交 501f7ee3 编写于 作者: D David Barbet

address more feedback

上级 39f62eb5
......@@ -72,8 +72,6 @@ protected virtual ExportProvider GetExportProvider()
typeof(IRequestHandler).Assembly, typeof(IRequestHandler));
var executeCommandHandlerTypes = DesktopTestHelpers.GetAllTypesImplementingGivenInterface(
typeof(IExecuteWorkspaceCommandHandler).Assembly, typeof(IExecuteWorkspaceCommandHandler));
var solutionProviderTypes = DesktopTestHelpers.GetAllTypesImplementingGivenInterface(
typeof(TestLspSolutionProvider).Assembly, typeof(ILspSolutionProvider));
var exportProviderFactory = ExportProviderCache.GetOrCreateExportProviderFactory(
TestExportProvider.EntireAssemblyCatalogWithCSharpAndVisualBasic
.WithPart(typeof(LanguageServerProtocol))
......
......@@ -40,7 +40,7 @@ public static ImmutableArray<Document> GetDocuments(this Solution solution, Uri
return documentIds.SelectAsArray(id => solution.GetRequiredDocument(id));
}
public static ImmutableArray<Document> GetDocumentsFromProvider(this ILspSolutionProvider solutionProvider, Uri uri, string? clientName = null)
public static ImmutableArray<Document> GetDocuments(this ILspSolutionProvider solutionProvider, Uri uri, string? clientName)
{
var documents = solutionProvider.GetDocuments(uri);
......@@ -65,7 +65,7 @@ public static ImmutableArray<Document> GetDocumentsFromProvider(this ILspSolutio
public static Document? GetDocument(this ILspSolutionProvider solutionProvider, TextDocumentIdentifier documentIdentifier, string? clientName = null)
{
var documents = solutionProvider.GetDocumentsFromProvider(documentIdentifier.Uri, clientName);
var documents = solutionProvider.GetDocuments(documentIdentifier.Uri, clientName);
if (documents.Length == 0)
{
......
......@@ -17,11 +17,11 @@
namespace Microsoft.CodeAnalysis.LanguageServer.Handler
{
internal abstract class AbstractGoToDefinitionHandlerBase<RequestType, ResponseType> : AbstractRequestHandler<RequestType, ResponseType>
internal abstract class AbstractGoToDefinitionHandler<RequestType, ResponseType> : AbstractRequestHandler<RequestType, ResponseType>
{
private readonly IMetadataAsSourceFileService _metadataAsSourceFileService;
public AbstractGoToDefinitionHandlerBase(IMetadataAsSourceFileService metadataAsSourceFileService, ILspSolutionProvider solutionProvider) : base(solutionProvider)
public AbstractGoToDefinitionHandler(IMetadataAsSourceFileService metadataAsSourceFileService, ILspSolutionProvider solutionProvider) : base(solutionProvider)
=> _metadataAsSourceFileService = metadataAsSourceFileService;
protected async Task<LSP.Location[]> GetDefinitionAsync(LSP.TextDocumentPositionParams request, bool typeOnly, string? clientName, CancellationToken cancellationToken)
......
......@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler
{
[Shared]
[ExportLspMethod(LSP.Methods.TextDocumentDefinitionName)]
internal class GoToDefinitionHandler : AbstractGoToDefinitionHandlerBase<LSP.TextDocumentPositionParams, LSP.Location[]>
internal class GoToDefinitionHandler : AbstractGoToDefinitionHandler<LSP.TextDocumentPositionParams, LSP.Location[]>
{
[ImportingConstructor]
[Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
......
......@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler
{
[Shared]
[ExportLspMethod(LSP.Methods.TextDocumentTypeDefinitionName)]
internal class GoToTypeDefinitionHandler : AbstractGoToDefinitionHandlerBase<LSP.TextDocumentPositionParams, LSP.Location[]>
internal class GoToTypeDefinitionHandler : AbstractGoToDefinitionHandler<LSP.TextDocumentPositionParams, LSP.Location[]>
{
[ImportingConstructor]
[Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
......
......@@ -32,7 +32,7 @@ public GetTextDocumentWithContextHandler(ILspSolutionProvider solutionProvider)
string? clientName,
CancellationToken cancellationToken)
{
var documents = SolutionProvider.GetDocumentsFromProvider(request.TextDocument.Uri, clientName);
var documents = SolutionProvider.GetDocuments(request.TextDocument.Uri, clientName);
if (!documents.Any())
{
......
......@@ -63,7 +63,11 @@ internal sealed partial class MiscellaneousFilesWorkspace : Workspace, IRunningD
_foregroundThreadAffinitization = new ForegroundThreadAffinitizedObject(threadingContext, assertIsForeground: false);
_fileTrackingMetadataAsSourceService = fileTrackingMetadataAsSourceService;
_lazyTextManager = new Lazy<IVsTextManager>(() => (IVsTextManager)serviceProvider.GetService(typeof(SVsTextManager)));
_lazyTextManager = new Lazy<IVsTextManager>(() =>
{
_foregroundThreadAffinitization.AssertIsForeground();
return (IVsTextManager)serviceProvider.GetService(typeof(SVsTextManager));
});
var runningDocumentTable = (IVsRunningDocumentTable)serviceProvider.GetService(typeof(SVsRunningDocumentTable));
_runningDocumentTableEventTracker = new RunningDocumentTableEventTracker(threadingContext, editorAdaptersFactoryService, runningDocumentTable, this);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册